From eace56d92ea9d0ebaaf4c3b868dde14c57b41d7b Mon Sep 17 00:00:00 2001
From: evilhero <evilhero@gmail.com>
Date: Thu, 31 Oct 2013 14:54:19 -0400
Subject: [PATCH] IMP: Added non-default Newznzb category to Newznab UID GUI
 field. Type in '#8020' or whatever category comics is on newznab installation
 (not required for normal newznabs), IMP: When issue was found via torrents by
 RSS, it would continue to look via db/api searches'

---
 mylar/rsscheck.py | 11 +++++++++--
 mylar/search.py   | 12 +++++++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/mylar/rsscheck.py b/mylar/rsscheck.py
index b2d47d4a..dffc31d5 100755
--- a/mylar/rsscheck.py
+++ b/mylar/rsscheck.py
@@ -238,9 +238,16 @@ def nzbs(provider=None):
                 for newznab_host in newznab_hosts:
                     if newznab_host[3] is None:
                         newznabuid = '1'
+                        newznabcat = '7030'
                     else:
-                        newznabuid = newznab_host[3]
-                    feed = newznab_host[1].rstrip() + '/rss?t=7030&dl=1&i=' + str(newznabuid) + '&r=' + newznab_host[2].rstrip()
+                        if '#' not in newznab_host[3]:
+                            newznabuid = newznab_host[3]
+                            newznabcat = '7030'
+                        else:
+                            newzst = newznab_host[3].find('#')
+                            newznabuid = newznab_host[3][:newzst]
+                            newznabcat = newznab_host[3][newzst+1:]
+                    feed = newznab_host[1].rstrip() + '/rss?t=' + str(newznabcat) + '&dl=1&i=' + str(newznabuid) + '&r=' + newznab_host[2].rstrip()
                     feedme = feedparser.parse(feed)
                     site = newznab_host[0].rstrip()
                     feedthis.append({"feed":     feedme,
diff --git a/mylar/search.py b/mylar/search.py
index 644fa1c9..ffc74955 100755
--- a/mylar/search.py
+++ b/mylar/search.py
@@ -155,6 +155,10 @@ def search_init(ComicName, IssueNumber, ComicYear, SeriesYear, IssueDate, IssueI
         if i == 1: searchmode = 'rss'  #order of ops - this will be used first.
         elif i == 2: searchmode = 'api'
 
+        if findit == 'yes': 
+            logger.fdebug('Found result on first run, exiting search module now.')
+            break
+
         logger.fdebug("Initiating Search via : " + str(searchmode))
 
         torprtmp = torpr
@@ -365,6 +369,12 @@ def NZB_SEARCH(ComicName, IssueNumber, ComicYear, SeriesYear, nzbprov, nzbpr, Is
         name_newznab = newznab_host[0].rstrip()
         host_newznab = newznab_host[1].rstrip()
         apikey = newznab_host[2].rstrip()
+        if '#' in newznab_host[3].rstrip():
+            catstart = newznab_host[3].find('#')
+            category_newznab = newznab_host[3][catstart+1:]
+            logger.fdebug('non-default Newznab category set to :' + str(category_newznab))
+        else:
+            category_newznab = '7030'
         logger.fdebug("using Newznab host of : " + str(name_newznab))
 
     if RSS == "yes":
@@ -566,7 +576,7 @@ def NZB_SEARCH(ComicName, IssueNumber, ComicYear, SeriesYear, nzbprov, nzbpr, Is
                         if host_newznab[len(host_newznab)-1:len(host_newznab)] != '/':
                             host_newznab_fix = str(host_newznab) + "/"
                         else: host_newznab_fix = host_newznab
-                        findurl = str(host_newznab_fix) + "api?t=search&q=" + str(comsearch) + "&o=xml&cat=7030"
+                        findurl = str(host_newznab_fix) + "api?t=search&q=" + str(comsearch) + "&o=xml&cat=" + str(category_newznab)
                     elif nzbprov == 'nzbx':
                         bb = prov_nzbx.searchit(comsearch)
                     if nzbprov != 'nzbx':