mirror of https://github.com/evilhero/mylar
FIX:(#1379) Unable to mark annual as Failed with series-annual integration enabled, FIX:(#1377) Partial fix - direct link to CV for series on pullist where the ComicID is known (using alt_pull 2 method)
This commit is contained in:
evilhero
parent
cff37bc6a7
commit
9a30a74193
|
|
@ -581,7 +581,7 @@
|
|||
<a href="#" onclick="doAjaxCall('retryit?ComicName=${annual['ComicName'] |u}&ComicID=${annual['ComicID']}&IssueID=${annual['IssueID']}&IssueNumber=${annual['Issue_Number']}&ComicYear=${annual['IssueDate']}&ReleaseComicID=${annual['ReleaseComicID']}', $(this),'table')" data-success="Retrying the same version of '${annual['ComicName']}' '${annual['Issue_Number']}'" title="Retry the same download again"><img src="interfaces/default/images/retry_icon.png" height="25" width="25" class="highqual" /></a>
|
||||
<a href="#" title="Mark annual as Skipped" onclick="doAjaxCall('unqueueissue?IssueID=${annual['IssueID']}&ComicID=${annual['ComicID']}&ReleaseComicID=${annual['ReleaseComicID']}',$(this),'table')" data-success="'${annual['Issue_Number']}' has been marked as skipped"><img src="interfaces/default/images/skipped_icon.png" height="25" width="25" class="highqual" /></a>
|
||||
%if mylar.FAILED_DOWNLOAD_HANDLING:
|
||||
<a href="#" title="Mark annual as Failed" onclick="doAjaxCall('unqueueissue?IssueID=${issue['IssueID']}&ComicID=${issue['ComicID']}&mode="failed"',$(this),'table')" data-success="'${issue['Issue_Number']}' has been marked as Failed"><img src="interfaces/default/images/failed.png" height="25" width="25" class="highqual" /></a>
|
||||
<a href="#" title="Mark annual as Failed" onclick="doAjaxCall('unqueueissue?IssueID=${annual['IssueID']}&ComicID=${annual['ComicID']}&ReleaseComicID=${annual['ReleaseComicID']}&mode=failed',$(this),'table')" data-success="'${annual['Issue_Number']}' has been marked as Failed"><img src="interfaces/default/images/failed.png" height="25" width="25" class="highqual" /></a>
|
||||
%endif
|
||||
%elif (annual['Status'] == 'Downloaded'):
|
||||
<%
|
||||
|
|
|
|||
|
|
@ -85,7 +85,11 @@
|
|||
<td class="publisher">${weekly['PUBLISHER']}</td>
|
||||
<td class="comicname">
|
||||
%if weekly['HAVEIT'] == 'No':
|
||||
${weekly['COMIC']}
|
||||
%if weekly['COMICID'] != '' and weekly['COMICID'] is not None:
|
||||
<a href="${weekly['LINK']}" target="_blank">${weekly['COMIC']}</a>
|
||||
%else:
|
||||
${weekly['COMIC']}
|
||||
%endif
|
||||
%else:
|
||||
<a href="comicDetails?ComicID=${weekly['COMICID']}">${weekly['COMIC']}</a>
|
||||
%endif
|
||||
|
|
|
|||
|
|
@ -1008,7 +1008,7 @@ def GCDimport(gcomicid, pullupd=None, imported=None, ogcname=None):
|
|||
if mylar.CVINFO:
|
||||
if not os.path.exists(comlocation + "/cvinfo"):
|
||||
with open(comlocation + "/cvinfo", "w") as text_file:
|
||||
text_file.write("http://www.comicvine.com/volume/49-" + str(comicid))
|
||||
text_file.write("http://comicvine.gamespot.com/volume/49-" + str(comicid))
|
||||
|
||||
logger.info(u"Updating complete for: " + ComicName)
|
||||
|
||||
|
|
|
|||
|
|
@ -1406,16 +1406,19 @@ class WebInterface(object):
|
|||
logger.info(u"Marking " + ComicName + " issue # " + IssueNumber + " as Failed...")
|
||||
newValueDict = {"Status": "Failed"}
|
||||
myDB.upsert("failed", newValueDict, controlValueDict)
|
||||
if annchk == 'yes':
|
||||
myDB.upsert("annuals", newValueDict, controlValueDict)
|
||||
else:
|
||||
myDB.upsert("issues", newValueDict, controlValueDict)
|
||||
yield cherrypy.HTTPRedirect("comicDetails?ComicID=%s" % ComicID)
|
||||
self.failed_handling(ComicID=ComicID, IssueID=IssueID)
|
||||
else:
|
||||
logger.info(u"Marking " + ComicName + " issue # " + IssueNumber + " as Skipped...")
|
||||
newValueDict = {"Status": "Skipped"}
|
||||
|
||||
if annchk == 'yes':
|
||||
myDB.upsert("annuals", newValueDict, controlValueDict)
|
||||
else:
|
||||
myDB.upsert("issues", newValueDict, controlValueDict)
|
||||
if annchk == 'yes':
|
||||
myDB.upsert("annuals", newValueDict, controlValueDict)
|
||||
else:
|
||||
myDB.upsert("issues", newValueDict, controlValueDict)
|
||||
raise cherrypy.HTTPRedirect("comicDetails?ComicID=%s" % ComicID)
|
||||
else:
|
||||
#if ComicName is not None, then it's from the FuturePull list that we're 'unwanting' an issue.
|
||||
|
|
@ -1559,6 +1562,10 @@ class WebInterface(object):
|
|||
else:
|
||||
haveit = "No"
|
||||
|
||||
linkit = None
|
||||
if all([weekly['ComicID'] is not None, weekly['ComicID'] != '']) and haveit == 'No':
|
||||
linkit = 'http://comicvine.gamespot.com/volume/4050-' + str(weekly['ComicID'])
|
||||
|
||||
x = None
|
||||
try:
|
||||
x = float(weekly['ISSUE'])
|
||||
|
|
@ -1576,6 +1583,7 @@ class WebInterface(object):
|
|||
"COMICID": weekly['ComicID'],
|
||||
"ISSUEID": weekly['IssueID'],
|
||||
"HAVEIT": haveit,
|
||||
"LINK": linkit,
|
||||
"AUTOWANT": False
|
||||
})
|
||||
else:
|
||||
|
|
@ -1588,6 +1596,7 @@ class WebInterface(object):
|
|||
"COMICID": weekly['ComicID'],
|
||||
"ISSUEID": weekly['IssueID'],
|
||||
"HAVEIT": haveit,
|
||||
"LINK": linkit,
|
||||
"AUTOWANT": True
|
||||
})
|
||||
else:
|
||||
|
|
@ -1599,6 +1608,7 @@ class WebInterface(object):
|
|||
"COMICID": weekly['ComicID'],
|
||||
"ISSUEID": weekly['IssueID'],
|
||||
"HAVEIT": haveit,
|
||||
"LINK": linkit,
|
||||
"AUTOWANT": False
|
||||
})
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue