From b4bcf2b0a4dd5fbc69a4b539b32f82fb3eccc4a2 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 2 Jul 2017 23:06:36 +0200
Subject: ma urlwatch: use hook for json api

---
 makefu/2configs/urlwatch.nix         | 27 ---------------------------
 makefu/2configs/urlwatch/default.nix | 35 +++++++++++++++++++++++++++++++++++
 makefu/2configs/urlwatch/hook.py     | 12 ++++++++++++
 3 files changed, 47 insertions(+), 27 deletions(-)
 delete mode 100644 makefu/2configs/urlwatch.nix
 create mode 100644 makefu/2configs/urlwatch/default.nix
 create mode 100644 makefu/2configs/urlwatch/hook.py

(limited to 'makefu')

diff --git a/makefu/2configs/urlwatch.nix b/makefu/2configs/urlwatch.nix
deleted file mode 100644
index 9493b2b7b..000000000
--- a/makefu/2configs/urlwatch.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ config, lib, ... }:
-
-{
-  krebs.urlwatch = {
-    enable = true;
-    mailto = config.krebs.users.makefu.mail;
-    onCalendar = "*-*-* 05:00:00";
-    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
-      https://pypi.python.org/simple/bepasty/
-      https://pypi.python.org/simple/xstatic/
-      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
-    ];
-  };
-}
-
diff --git a/makefu/2configs/urlwatch/default.nix b/makefu/2configs/urlwatch/default.nix
new file mode 100644
index 000000000..54c8ee924
--- /dev/null
+++ b/makefu/2configs/urlwatch/default.nix
@@ -0,0 +1,35 @@
+{ config, lib, ... }:
+
+{
+  krebs.urlwatch = {
+    enable = true;
+    mailto = config.krebs.users.makefu.mail;
+    onCalendar = "*-*-* 05:00:00";
+    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
+      https://pypi.python.org/simple/bepasty/
+      https://pypi.python.org/simple/xstatic/
+      https://pypi.python.org/simple/devpi-client/
+      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
+
+    ];
+  };
+}
+
diff --git a/makefu/2configs/urlwatch/hook.py b/makefu/2configs/urlwatch/hook.py
new file mode 100644
index 000000000..fc598423f
--- /dev/null
+++ b/makefu/2configs/urlwatch/hook.py
@@ -0,0 +1,12 @@
+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
-- 
cgit v1.2.3