Improve URL resolution

src/client.py

@@ -6,6 +6,7 @@
 from urlparse import urljoin
 from xml.etree import ElementTree
 
+import requests
 from elementum.provider import log
 from requests_toolbelt import sessions
 
@@ -259,6 +260,23 @@ def _parse_item(self, item):
 
                 result[json] = val
 
+        # if we didn't get a magnet uri, attempt to resolve the magnet uri.
+        # todo for some reason Elementum cannot resolve the link that gets proxied through Jackett.
+        #  So we will resolve it manually for Elementum for now.
+        #  In actuality, this should be fixed within Elementum
+        if result["uri"] is None:
+            link = item.find('link')
+            jackett_uri = ""
+            if link is not None:
+                jackett_uri = link.text
+            else:
+                enclosure = item.find('enclosure')
+                if enclosure is not None:
+                    jackett_uri = enclosure.attrib['url']
+
+            if jackett_uri != "":
+                result["uri"] = get_magnet_from_jackett(jackett_uri)
+
         if result["name"] is None or result["uri"] is None:
             log.warning("Could not parse item; name = %s; uri = %s", result["name"], result["uri"])
             log.debug("Failed item is: %s", ElementTree.tostring(item, encoding='utf8'))
@@ -277,3 +295,19 @@ def _parse_item(self, item):
             result["size"] = human_size(result["_size_bytes"])
 
         return result
+
+
+def get_magnet_from_jackett(uri):
+    magnet_prefix = 'magnet:'
+    original_uri = uri
+    while True:
+        response = requests.get(uri, allow_redirects=False)
+        if response.status_code >= httplib.MULTIPLE_CHOICES and response.status_code < httplib.BAD_REQUEST:
+            uri = response.headers['Location']
+            if len(uri) >= len(magnet_prefix) and uri[0:7] == magnet_prefix:
+                return uri
+        else:
+            log.warning("Could not get final redirect location for URI %s", original_uri)
+            break
+
+    return None

src/jackett.py

@@ -55,7 +55,7 @@ def validate_client():
 def search(payload, method="general"):
     payload = parse_payload(method, payload)
 
-    log.debug("Searching with payload (%s): %s" % (method, repr(payload)))
+    log.debug("Searching with payload (%s): %s", method, repr(payload))
 
     p_dialog = xbmcgui.DialogProgressBG()
     p_dialog.create('Elementum [COLOR FFFF6B00]Jackett[/COLOR]', utils.translation(32602))
@@ -68,7 +68,7 @@ def search(payload, method="general"):
 
         log.debug("All results: %s" % repr(results))
 
-        log.info("Jackett returned %d results in %s seconds" % (len(results), request_time))
+        log.info("Jackett returned %d results in %s seconds", len(results), request_time)
     finally:
         p_dialog.close()
         del p_dialog