mirror/mylar
1
0
Fork 0
mirror of https://github.com/evilhero/mylar synced 2024-12-23 16:22:45 +00:00
Code Issues Releases Wiki Activity

FIX: Updater failing to update status on snatches, FIX: Removed extra Archive Icon from Annuals table, FIX: Annuals not matching on search results.

Browse source
This commit is contained in:
evilhero 2013-07-30 01:28:09 -04:00
parent f364a72c83
commit 2e5e403de3
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/interfaces/default/comicdetails.html
View file

@ -301,6 +301,7 @@
<option value="Skipped">Skipped</option> <option value="Skipped">Skipped</option>
<option value="Downloaded">Downloaded</option> <option value="Downloaded">Downloaded</option>
<option value="Archived">Archived</option> <option value="Archived">Archived</option>
<option value="Ignored">Ignored</option>
</select> </select>
selected issues selected issues
<input type="hidden" value="Go"> <input type="hidden" value="Go">
@ -402,6 +403,7 @@
<option value="Skipped">Skipped</option> <option value="Skipped">Skipped</option>
<option value="Downloaded">Downloaded</option> <option value="Downloaded">Downloaded</option>
<option value="Archived">Archived</option> <option value="Archived">Archived</option>
<option value="Ignored">Ignored</option>
</select> </select>
selected annuals selected annuals
<input type="hidden" value="Go"> <input type="hidden" value="Go">
@ -473,7 +475,7 @@
<a href="#" title="Mark issue as Skipped" onclick="doAjaxCall('unqueueissue?IssueID=${annual['IssueID']}&ComicID=${annual['ComicID']}',$(this),'table')" data-success="'${annual['Issue_Number']}' has been marked as skipped"><img src="interfaces/default/images/skipped_icon.png" height="25" width="25" /></a> <a href="#" title="Mark issue as Skipped" onclick="doAjaxCall('unqueueissue?IssueID=${annual['IssueID']}&ComicID=${annual['ComicID']}',$(this),'table')" data-success="'${annual['Issue_Number']}' has been marked as skipped"><img src="interfaces/default/images/skipped_icon.png" height="25" width="25" /></a>
<a href="#" title="Add to Reading List"><img src="interfaces/default/images/glasses-icon.png" height="25" width="25" /></a> <a href="#" title="Add to Reading List"><img src="interfaces/default/images/glasses-icon.png" height="25" width="25" /></a>
<a href="#" title="Retry" onclick="doAjaxCall('queueissue?ComicID=${annual['ComicID']}&IssueID=${annual['IssueID']}&ComicIssue=${annual['Issue_Number']}&mode=${amode}', $(this),'table')" data-success="Retrying the same version of '${issue['ComicName']}'"><img src="interfaces/default/images/retry_icon.png" height="25" width="25" /></a> <a href="#" title="Retry" onclick="doAjaxCall('queueissue?ComicID=${annual['ComicID']}&IssueID=${annual['IssueID']}&ComicIssue=${annual['Issue_Number']}&mode=${amode}', $(this),'table')" data-success="Retrying the same version of '${issue['ComicName']}'"><img src="interfaces/default/images/retry_icon.png" height="25" width="25" /></a>
<a href="#" title="Archive" onclick="doAjaxCall('archiveissue?IssueID=${annual['IssueID']}',$(this),'table')"><img src="interfaces/default/images/archive_icon.png" height="25" width="25" title="Mark issue as Archived" ><img src="interfaces/default/images/archive_icon.png" height="25" width="25" title="Mark issue as Archived"/></a> <a href="#" title="Archive" onclick="doAjaxCall('archiveissue?IssueID=${annual['IssueID']}',$(this),'table')"><img src="interfaces/default/images/archive_icon.png" height="25" width="25" title="Mark issue as Archived" /></a>
</td> </td>
</tr> </tr>

4
mylar/search.py
View file

@ -772,7 +772,7 @@ def NZB_SEARCH(ComicName, IssueNumber, ComicYear, SeriesYear, nzbprov, nzbpr, Is
if 'annual' in ComicName.lower(): if 'annual' in ComicName.lower():
logger.fdebug("IssueID of : " + str(IssueID) + " - This is an annual...let's adjust.") logger.fdebug("IssueID of : " + str(IssueID) + " - This is an annual...let's adjust.")
annualize = "true" annualize = "true"
splitst = splitst - 1 #splitst = splitst - 1
for tstsplit in splitit: for tstsplit in splitit:
if 'v' in tstsplit.lower() and tstsplit[1:].isdigit(): if 'v' in tstsplit.lower() and tstsplit[1:].isdigit():
logger.fdebug("this has a version #...let's adjust") logger.fdebug("this has a version #...let's adjust")
@ -808,6 +808,8 @@ def NZB_SEARCH(ComicName, IssueNumber, ComicYear, SeriesYear, nzbprov, nzbpr, Is
else: else:
initialchk = 'ok' initialchk = 'ok'
logger.fdebug("splitst : " + str(splitst))
logger.fdebug("len-watchcomic : " + str(len(watchcomic_split)))
if (splitst) != len(watchcomic_split) and initialchk == 'no': if (splitst) != len(watchcomic_split) and initialchk == 'no':
logger.fdebug("incorrect comic lengths after removal...not a match.") logger.fdebug("incorrect comic lengths after removal...not a match.")
else: else:

8
mylar/webserve.py
View file

@ -572,7 +572,7 @@ class WebInterface(object):
controlValueDict = {"IssueArcID": IssueArcID} controlValueDict = {"IssueArcID": IssueArcID}
newStatus = {"Status": "Wanted"} newStatus = {"Status": "Wanted"}
myDB.upsert("readinglist", newStatus, controlValueDict) 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": if foundcom == "yes":
logger.info(u"Downloaded " + ComicName + " #" + ComicIssue + " (" + str(ComicYear) + ")") logger.info(u"Downloaded " + ComicName + " #" + ComicIssue + " (" + str(ComicYear) + ")")
#raise cherrypy.HTTPRedirect("readlist") #raise cherrypy.HTTPRedirect("readlist")
@ -586,7 +586,7 @@ class WebInterface(object):
ComicYear = str(cyear['SHIPDATE'])[:4] ComicYear = str(cyear['SHIPDATE'])[:4]
if ComicYear == '': ComicYear = now.year if ComicYear == '': ComicYear = now.year
logger.info(u"Marking " + ComicName + " " + ComicIssue + " as wanted...") 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": if foundcom == "yes":
logger.info(u"Downloaded " + ComicName + " " + ComicIssue ) logger.info(u"Downloaded " + ComicName + " " + ComicIssue )
raise cherrypy.HTTPRedirect("pullist") raise cherrypy.HTTPRedirect("pullist")
@ -620,12 +620,12 @@ class WebInterface(object):
AlternateSearch = miy['AlternateSearch'] AlternateSearch = miy['AlternateSearch']
UseAFuzzy = miy['UseFuzzy'] UseAFuzzy = miy['UseFuzzy']
ComicVersion = miy['ComicVersion'] 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": if foundcom == "yes":
# file check to see if issue exists and update 'have' count # file check to see if issue exists and update 'have' count
if IssueID is not None: if IssueID is not None:
logger.info("passing to updater.") logger.info("passing to updater.")
return updater.foundsearch(ComicID, IssueID, mode) return updater.foundsearch(ComicID, IssueID, mode=mode, provider=prov)
if ComicID: if ComicID:
raise cherrypy.HTTPRedirect("comicDetails?ComicID=%s" % ComicID) raise cherrypy.HTTPRedirect("comicDetails?ComicID=%s" % ComicID)
else: else: