Merge remote-tracking branch 'origin/master'

2 files changed, 16 insertions, 11 deletions

diff --git a/krebs/5pkgs/simple/Reaktor/plugins.nix b/krebs/5pkgs/simple/Reaktor/plugins.nix
index 96e0af2d7..db578c457 100644
--- a/krebs/5pkgs/simple/Reaktor/plugins.nix
+++ b/krebs/5pkgs/simple/Reaktor/plugins.nix
@@ -121,21 +121,26 @@ rec {
     pattern = "^.*(?P<args>http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+).*$$";
     path = with pkgs; [ curl perl ];
     script = pkgs.writePython3 "url-title" [ "beautifulsoup4" "lxml" ] ''
+      import cgi
       import sys
       import urllib.request
       from bs4 import BeautifulSoup
 
       try:
-          soup = BeautifulSoup(urllib.request.urlopen(sys.argv[1]), "lxml")
-          title = soup.find('title').string
-
-          if title:
-              if len(title) > 512:
-                  print('message to long, skipped')
-              elif len(title.split('\n')) > 5:
-                  print('to many lines, skipped')
-              else:
-                  print(title)
+          req = urllib.request.Request(sys.argv[1])
+          req.add_header('user-agent', 'Reaktor-url-title')
+          resp = urllib.request.urlopen(req)
+          if resp.headers['content-type'].find('text/html') >= 0:
+              soup = BeautifulSoup(resp.read(16000), "lxml")
+              title = soup.find('title').string
+
+              if len(title.split('\n')) > 5:
+                  title = '\n'.join(title.split('\n')[:5])
+
+              print(title[:450])
+          else:
+              cd_header = resp.headers['content-disposition']
+              print(cgi.parse_header(cd_header)[1]['filename'])
       except:  # noqa: E722
           pass
     '';
diff --git a/krebs/krops.nix b/krebs/krops.nix
index 6a8a05726..861f2d323 100644
--- a/krebs/krops.nix
+++ b/krebs/krops.nix
@@ -12,7 +12,7 @@
 
   krebs-source = {
     nixpkgs.git = {
-      ref = "91b286c8935b8c5df4a99302715200d3bd561977";
+      ref = "56fad146a12a6f934d1d5ef875eb729be1b19129";
       url = https://github.com/NixOS/nixpkgs;
     };
     stockholm.file = toString ../.;