diff --git a/data/interfaces/default/comicdetails.html b/data/interfaces/default/comicdetails.html
index 7d3930ef..e5eec9e7 100644
--- a/data/interfaces/default/comicdetails.html
+++ b/data/interfaces/default/comicdetails.html
@@ -301,6 +301,7 @@
+
selected issues
@@ -402,6 +403,7 @@
+
selected annuals
@@ -473,7 +475,7 @@
-
+
diff --git a/mylar/search.py b/mylar/search.py
index e6f4d731..c8a19098 100755
--- a/mylar/search.py
+++ b/mylar/search.py
@@ -772,7 +772,7 @@ def NZB_SEARCH(ComicName, IssueNumber, ComicYear, SeriesYear, nzbprov, nzbpr, Is
if 'annual' in ComicName.lower():
logger.fdebug("IssueID of : " + str(IssueID) + " - This is an annual...let's adjust.")
annualize = "true"
- splitst = splitst - 1
+ #splitst = splitst - 1
for tstsplit in splitit:
if 'v' in tstsplit.lower() and tstsplit[1:].isdigit():
logger.fdebug("this has a version #...let's adjust")
@@ -808,6 +808,8 @@ def NZB_SEARCH(ComicName, IssueNumber, ComicYear, SeriesYear, nzbprov, nzbpr, Is
else:
initialchk = 'ok'
+ logger.fdebug("splitst : " + str(splitst))
+ logger.fdebug("len-watchcomic : " + str(len(watchcomic_split)))
if (splitst) != len(watchcomic_split) and initialchk == 'no':
logger.fdebug("incorrect comic lengths after removal...not a match.")
else:
diff --git a/mylar/webserve.py b/mylar/webserve.py
index 4d4f7d35..e9ade28e 100755
--- a/mylar/webserve.py
+++ b/mylar/webserve.py
@@ -572,7 +572,7 @@ class WebInterface(object):
controlValueDict = {"IssueArcID": IssueArcID}
newStatus = {"Status": "Wanted"}
myDB.upsert("readinglist", newStatus, controlValueDict)
- foundcom = search.search_init(ComicName=ComicName, IssueNumber=ComicIssue, ComicYear=ComicYear, SeriesYear=None, IssueDate=None, IssueID=None, AlternateSearch=None, UseFuzzy=None, ComicVersion=None, SARC=SARC, IssueArcID=IssueArcID)
+ foundcom, prov = search.search_init(ComicName=ComicName, IssueNumber=ComicIssue, ComicYear=ComicYear, SeriesYear=None, IssueDate=None, IssueID=None, AlternateSearch=None, UseFuzzy=None, ComicVersion=None, SARC=SARC, IssueArcID=IssueArcID)
if foundcom == "yes":
logger.info(u"Downloaded " + ComicName + " #" + ComicIssue + " (" + str(ComicYear) + ")")
#raise cherrypy.HTTPRedirect("readlist")
@@ -586,7 +586,7 @@ class WebInterface(object):
ComicYear = str(cyear['SHIPDATE'])[:4]
if ComicYear == '': ComicYear = now.year
logger.info(u"Marking " + ComicName + " " + ComicIssue + " as wanted...")
- foundcom = search.search_init(ComicName=ComicName, IssueNumber=ComicIssue, ComicYear=ComicYear, SeriesYear=None, IssueDate=cyear['SHIPDATE'], IssueID=None, AlternateSearch=None, UseFuzzy=None, ComicVersion=None)
+ foundcom, prov = search.search_init(ComicName=ComicName, IssueNumber=ComicIssue, ComicYear=ComicYear, SeriesYear=None, IssueDate=cyear['SHIPDATE'], IssueID=None, AlternateSearch=None, UseFuzzy=None, ComicVersion=None)
if foundcom == "yes":
logger.info(u"Downloaded " + ComicName + " " + ComicIssue )
raise cherrypy.HTTPRedirect("pullist")
@@ -620,12 +620,12 @@ class WebInterface(object):
AlternateSearch = miy['AlternateSearch']
UseAFuzzy = miy['UseFuzzy']
ComicVersion = miy['ComicVersion']
- foundcom, nzb_pr = search.search_init(ComicName, ComicIssue, ComicYear, SeriesYear, issues['IssueDate'], IssueID, AlternateSearch, UseAFuzzy, ComicVersion, mode=mode)
+ foundcom, prov = search.search_init(ComicName, ComicIssue, ComicYear, SeriesYear, issues['IssueDate'], IssueID, AlternateSearch, UseAFuzzy, ComicVersion, mode=mode)
if foundcom == "yes":
# file check to see if issue exists and update 'have' count
if IssueID is not None:
logger.info("passing to updater.")
- return updater.foundsearch(ComicID, IssueID, mode)
+ return updater.foundsearch(ComicID, IssueID, mode=mode, provider=prov)
if ComicID:
raise cherrypy.HTTPRedirect("comicDetails?ComicID=%s" % ComicID)
else: