From 53dc8dae1d95247bc16cf8f5d2dabe36f5957f7a Mon Sep 17 00:00:00 2001
From: kev <vimagick@gmail.com>
Date: Mon, 25 Oct 2021 12:08:10 +0800
Subject: [PATCH] update urlwatch

---
 urlwatch/Dockerfile         | 50 +++++++++++++++++++------------------
 urlwatch/README.md          | 37 ++++++++++++++++-----------
 urlwatch/docker-compose.yml |  4 +--
 3 files changed, 50 insertions(+), 41 deletions(-)

diff --git a/urlwatch/Dockerfile b/urlwatch/Dockerfile
index 334b645..f2a83f1 100644
--- a/urlwatch/Dockerfile
+++ b/urlwatch/Dockerfile
@@ -3,32 +3,34 @@
 #
 
 FROM alpine:3
-LABEL maintainer="EasyPi Software Foundation"
+MAINTAINER EasyPi Software Foundation
+
+ENV CRYPTOGRAPHY_DONT_BUILD_RUST=1
 
 RUN set -xe \
-    && apk add --no-cache ca-certificates  \
-                          build-base       \
-                          libffi-dev       \
-                          libxml2          \
-                          libxml2-dev      \
-                          libxslt          \
-                          libxslt-dev      \
-                          openssl-dev      \
-                          py3-cryptography \
-                          py3-pip          \
-                          python3          \
-                          python3-dev      \
-    && pip3 install --no-cache-dir appdirs        \
-                    cssselect      \
-                    keyring        \
-                    lxml           \
-                    minidb         \
-                    pyyaml         \
-                    requests       \
-                    chump          \
-                    beautifulsoup4 \
-                    pushbullet.py  \
-                    urlwatch       \
+    && apk add --no-cache ca-certificates \
+                          bash            \
+                          build-base      \
+                          curl            \
+                          jq              \
+                          libffi-dev      \
+                          libxml2         \
+                          libxml2-dev     \
+                          libxslt         \
+                          libxslt-dev     \
+                          openssl-dev     \
+                          python3         \
+                          python3-dev     \
+    && curl -sSL https://bootstrap.pypa.io/get-pip.py | python3 \
+    && pip3 install appdirs   \
+                    cssselect \
+                    keyring   \
+                    lxml      \
+                    minidb    \
+                    pyyaml    \
+                    requests  \
+                    chump     \
+                    urlwatch  \
     && apk del build-base  \
                libffi-dev  \
                libxml2-dev \
diff --git a/urlwatch/README.md b/urlwatch/README.md
index af3352b..d6b3868 100644
--- a/urlwatch/README.md
+++ b/urlwatch/README.md
@@ -6,11 +6,13 @@ urlwatch
 ## docker-compose.yml
 
 ```yaml
-urlwatch:
-  image: vimagick/urlwatch
-  volumes:
-    - ./data:/root/.urlwatch
-  restart: unless-stopped
+version: "3.8"
+services:
+  urlwatch:
+    image: vimagick/urlwatch
+    volumes:
+      - ./data:/root/.urlwatch
+    restart: unless-stopped
 ```
 
 ## urls.yaml
@@ -18,16 +20,19 @@ urlwatch:
 ```yaml
 ---
 
-url: "https://github.com/thp/urlwatch/releases/latest"
+name: urlwatch
+url: "https://github.com/thp/urlwatch/tags"
 filter:
-- xpath: '(//div[contains(@class,"release-timeline-tags")]//h4)[1]/a'
+- xpath: '(//h4[@data-test-selector="tag-title"]/a)[1]'
 - html2text: re
+- strip:
 
 ---
 
+name: shadowsocks-libev
 url: "https://github.com/shadowsocks/shadowsocks-libev/releases/latest"
 filter:
-- css: 'div.f1>a'
+- css: "div.flex-1>h1"
 - html2text: re
 
 ...
@@ -44,7 +49,7 @@ Successfully sent message to Slack
 1: https://github.com/thp/urlwatch/releases/latest
 2: https://github.com/shadowsocks/shadowsocks-libev/releases/latest
 >>> urlwatch --test-filter 2
-v3.2.5
+v3.3.5
 >>> exit
 ```
 
@@ -64,10 +69,12 @@ See the [crontab manpage for details on format](https://man7.org/linux/man-pages
 ### Mount the crontab file as a docker volume
 
 ```yaml
-urlwatch:
-  image: vimagick/urlwatch
-  volumes:
-    - ./data:/root/.urlwatch
-    - ./data/crontab:/etc/crontabs/root
-  restart: unless-stopped
+version: "3.8"
+services:
+  urlwatch:
+    image: vimagick/urlwatch
+    volumes:
+      - ./data:/root/.urlwatch
+      - ./data/crontab:/etc/crontabs/root
+    restart: unless-stopped
 ```
diff --git a/urlwatch/docker-compose.yml b/urlwatch/docker-compose.yml
index 9893fe6..6f620c1 100644
--- a/urlwatch/docker-compose.yml
+++ b/urlwatch/docker-compose.yml
@@ -1,7 +1,7 @@
+version: "3.8"
 services:
   urlwatch:
     image: vimagick/urlwatch
     volumes:
       - ./data:/root/.urlwatch
-      - ./data/crontab:/etc/crontabs/root
-    restart: unless-stopped
\ No newline at end of file
+    restart: unless-stopped