summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-07-02 23:09:12 +0200
committermakefu <github@syntax-fehler.de>2017-07-02 23:09:12 +0200
commit2eb910183a92bd6e8d3796d821c783d878ae956b (patch)
treecfcf48823b00b4f81b3d47924a849df4eb76e24d
parent5c26d65ae48aa73c8a738e4ef22dcb3ad6daa00d (diff)
ma urlwatch: refactor
-rw-r--r--makefu/2configs/urlwatch/default.nix36
-rw-r--r--makefu/2configs/urlwatch/hook.py22
2 files changed, 36 insertions, 22 deletions
diff --git a/makefu/2configs/urlwatch/default.nix b/makefu/2configs/urlwatch/default.nix
index 54c8ee924..f17bcdc3a 100644
--- a/makefu/2configs/urlwatch/default.nix
+++ b/makefu/2configs/urlwatch/default.nix
@@ -8,27 +8,37 @@
hooksFile = ./hook.py;
urls = [
## nixpkgs maintenance
- https://api.github.com/repos/ovh/python-ovh/tags
- https://api.github.com/repos/embray/d2to1/tags
- https://api.github.com/repos/Mic92/vicious/tags
+ # github
+ ## No rate limit
+ https://github.com/amadvance/snapraid/releases.atom
+ https://github.com/radare/radare2/releases.atom
+ https://github.com/ovh/python-ovh/releases.atom
+ https://github.com/embray/d2to1/releases.atom
+ https://github.com/Mic92/vicious/releases.atom
+ https://github.com/embray/d2to1/releases.atom
+ https://github.com/dorimanx/exfat-nofuse/releases.atom
+ https://github.com/rapid7/metasploit-framework/releases.atom
+ ## rate limited
+ # https://api.github.com/repos/dorimanx/exfat-nofuse/commits
+ # https://api.github.com/repos/mcepl/gen-oath-safe/commits
+ https://api.github.com/repos/naim94a/udpt/commits
+ https://api.github.com/repos/dirkvdb/ps3netsrv--/commits
+
+ # pypi
https://pypi.python.org/simple/bepasty/
https://pypi.python.org/simple/xstatic/
https://pypi.python.org/simple/devpi-client/
+ # weird shit
http://guest:derpi@cvs2svn.tigris.org/svn/cvs2svn/tags/
http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/
- https://github.com/amadvance/snapraid/releases.atom
https://erdgeist.org/gitweb/opentracker/info/refs?service=git-upload-pack
- https://api.github.com/repos/embray/d2to1/tags
- https://api.github.com/repos/dorimanx/exfat-nofuse/commits
- https://api.github.com/repos/dorimanx/exfat-nofuse/tags
- https://api.github.com/repos/radare/radare2/tags
- https://api.github.com/repos/rapid7/metasploit-framework/tags
- https://api.github.com/repos/mcepl/gen-oath-safe/commits
- https://api.github.com/repos/naim94a/udpt/commits
https://git.tasktools.org/TM/taskd/info/refs?service=git-upload-pack
- https://api.github.com/repos/dirkvdb/ps3netsrv--/commits
- # TODO: dymo cups
+ {
+ url = https://newellrubbermaid.secure.force.com/dymopkb/articles/en_US/FAQ/Dymo-Drivers-and-Downloads/?l=en_US&c=Segment:Dymo&fs=Search&pn=1 ;
+ filter = "grep:Software/Linux/dymo-cups-drivers";
+ }
+ # TODO: dymo cups
];
};
}
diff --git a/makefu/2configs/urlwatch/hook.py b/makefu/2configs/urlwatch/hook.py
index fc598423f..7d9282c7e 100644
--- a/makefu/2configs/urlwatch/hook.py
+++ b/makefu/2configs/urlwatch/hook.py
@@ -1,12 +1,16 @@
import logging
logging.basicConfig(level=logging.INFO)
log = logging.getLogger()
-# log.setLevel(level=logging.INFO)
-def filter(url, data):
- log.info("handling url '{}'".format(url))
- if "api.github.com" in url:
- import json
- log.info("url is a github api link, assuming json")
- return json.dumps(json.loads(data),indent=2)
-
- return data
+log.setLevel(level=logging.INFO)
+
+import re
+import json
+
+from urlwatch import filters
+
+
+class JsonFilter(filters.RegexMatchFilter):
+ MATCH = {'url': re.compile('https?://api.github.com/.*')}
+
+ def filter(self, data):
+ return json.dumps(json.loads(data),indent=2,sort_keys=True)