Radiotechniman · Oct 18, 2014
Showing with 71 additions and 7 deletions.

+8 −5 anorak/downloader.py

+61 −0 anorak/newznab.py

+2 −2 anorak/notify.py
diff --git a/anorak/downloader.py b/anorak/downloader.py
@@ -1,5 +1,5 @@
 import re
-from anorak import fanzub, regex, sabnzbd
+from anorak import fanzub, regex, sabnzbd, newznab
 
 class Downloader:
 
@@ -12,19 +12,22 @@ def download(self):
         # reset matched
         self.matched = []
         # Strip symbols from anime name making it easier to get more relevant search results
-        symbols = '[.!,;?]'
+        symbols = '[.!,;?\-]'
         # check for x-jat title override
         if self.anime.alternativeTitle != None and len(self.anime.alternativeTitle) > 0:
             friendlyName = re.sub(symbols, '', self.anime.alternativeTitle)
         else:
             friendlyName = re.sub(symbols, '', self.anime.title)
 
-        search = fanzub.search(self.anime.subber, friendlyName, self.episode)
+        #search = fanzub.search(self.anime.subber, friendlyName, self.episode)
+        search = newznab.search(self.anime.subber, friendlyName, self.episode, self.anime.quality)
 
         for item in search:
             #print "%s, %s" % (item.name, item.url)
             regexParser = self.regexParser.parse(item.name)
             # match the series name case insensitively
+            #print "1 s: [%s] db:[%s]" % (regexParser.series_name.lower(), self.anime.title.lower())
+            #print "2 s: [%s] db:[%s]" % (regexParser.series_name.lower(), self.anime.alternativeTitle.lower())
             if regexParser.series_name.lower() != self.anime.title.lower() and regexParser.series_name.lower() != self.anime.alternativeTitle.lower():
                 continue
             # match the episode number & convert to int first because we might have left hand zeroes
@@ -34,7 +37,7 @@ def download(self):
             if self.anime.quality == 0:
                 self.matched.append(item)
                 continue
-            # match the quality
+            # match the quality - need a None match fix
             if str(self.anime.quality) in regexParser.extra_info:
                 self.matched.append(item)
 
@@ -45,4 +48,4 @@ def download(self):
             name = self.matched[0].name
             return sabnzbd.SABnzbd(name, url)
         except IndexError:
-            return False
+            return False
diff --git a/anorak/newznab.py b/anorak/newznab.py
@@ -0,0 +1,61 @@
+# This plugin is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This plugin is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see http://www.gnu.org/licenses/.
+
+import lib.anidb.requests as requests
+import re
+import xml.etree.ElementTree as ET
+
+class Download:
+    def __init__(self):
+        self.url = None
+        self.name = None
+        self.size = None
+        self.external_id = None
+
+def search(group, anime, episode, quality):
+    payload = {
+	"cat": "5070",
+	"apikey": "_API_KEY_",
+	"t": "tvsearch",
+	"max": 100
+    }
+    downloads = []
+    if quality != 0:
+        payload['q'] = "%s %s %s %sp" % (group, anime, episode, quality)
+    else:
+        payload['q'] = "%s %s %s" % (group, anime, episode)
+
+    r = requests.get("http://_HOST_/api", params=payload)
+    print("newznab final search for term %s url %s" % (payload['q'], r.url))
+    try:
+        xml = ET.fromstring(r.text)
+        items = xml.findall("channel/item")
+    except Exception:
+        print("Error trying to load newznab feed")
+
+    for item in items:
+        title = item.find("title").text
+        if "- {:>02}".format(episode) not in title:
+		continue
+        url = item.find("link").text
+        ex_id = 0
+        curSize = int(item.find("enclosure").attrib["length"])
+        print("Found on newznab; name:[%s] size:[%s] id:[%s] url:[%s]" % (title, curSize, ex_id, url))
+        d = Download()
+        d.url = url
+        d.name = title
+        d.size = curSize
+        d.external_id = ex_id
+        downloads.append(d)
+
+    return downloads
diff --git a/anorak/notify.py b/anorak/notify.py
@@ -32,12 +32,12 @@ def update_plex():
         return False
 
     for s in sections:
-        if s.getAttribute('type') == "show":
+        if s.getAttribute('type') == "show" and s.getAttribute('title') == "Anime":
             url = "%slibrary/sections/%s/refresh" % (host, s.getAttribute('key'))
             try:
                 urllib.urlopen(url)
             except Exception, e:
                 print("Error updating library section for Plex Media Server: " + ex(e))
                 return False
 
-    return True
+    return True