mirror
/
mylar
mirror of https://github.com/evilhero/mylar
1
0
Fork 0
Code Issues Releases Wiki Activity

FIX: fix for ForceCheck on Upcoming page not working after most recent push

This commit is contained in:
evilhero 2018-06-14 14:46:17 -04:00
parent 10e341b644
commit 60f69c0e28
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mylar/search.py
View File

@ -1877,7 +1877,6 @@ def searchforissue(issueid=None, new=False, rsscheck=None, manual=False):
logger.info('A search is currently in progress....queueing this up again to try in a bit.')
return {'status': 'IN PROGRESS'}
mylar.SEARCHLOCK = True
myDB = db.DBConnection()
ens = [x for x in mylar.CONFIG.EXTRA_NEWZNABS if x[5] == '1']
@ -1887,8 +1886,9 @@ def searchforissue(issueid=None, new=False, rsscheck=None, manual=False):
if rsscheck:
logger.info(u"Initiating RSS Search Scan at the scheduled interval of " + str(mylar.CONFIG.RSS_CHECKINTERVAL) + " minutes.")
mylar.SEARCHLOCK = True
else:
logger.info(u"Initiating Search scan at the scheduled interval of " + str(mylar.CONFIG.SEARCH_INTERVAL) + " minutes.")
logger.info(u"Initiating check to add Wanted items to Search Queue....")
myDB = db.DBConnection()
@ -1967,10 +1967,6 @@ def searchforissue(issueid=None, new=False, rsscheck=None, manual=False):
logger.fdebug('Issue is already in a Downloaded / Snatched status.')
continue
if rsscheck is None:
mylar.SEARCH_QUEUE.put({'issueid': result['IssueID'], 'comicid': result['ComicID']})
continue
OneOff = False
storyarc_watchlist = False
comic = myDB.selectone("SELECT * from comics WHERE ComicID=? AND ComicName != 'None'", [result['ComicID']]).fetchone()
@ -1991,7 +1987,6 @@ def searchforissue(issueid=None, new=False, rsscheck=None, manual=False):
logger.fdebug('ComicID: ' + str(result['ComicID']) + ' has invalid Date data. Skipping searching for this series.')
continue
foundNZB = "none"
AllowPacks = False
if all([result['mode'] == 'story_arc', storyarc_watchlist is False]):
@ -2021,6 +2016,12 @@ def searchforissue(issueid=None, new=False, rsscheck=None, manual=False):
else:
ComicYear = str(result['IssueDate'])[:4]
if rsscheck is None:
logger.info('adding: ComicID:%s IssueiD: %s' % (result['ComicID'], result['IssueID']))
mylar.SEARCH_QUEUE.put({'comicname': comic['ComicName'], 'seriesyear': SeriesYear, 'issuenumber': result['Issue_Number'], 'issueid': result['IssueID'], 'comicid': result['ComicID']})
continue
mode = result['mode']
foundNZB, prov = search_init(comic['ComicName'], result['Issue_Number'], str(ComicYear), SeriesYear, Publisher, IssueDate, StoreDate, result['IssueID'], AlternateSearch, UseFuzzy, ComicVersion, SARC=result['SARC'], IssueArcID=result['IssueArcID'], mode=mode, rsscheck=rsscheck, ComicID=result['ComicID'], filesafe=Comicname_filesafe, allow_packs=AllowPacks, oneoff=OneOff, torrentid_32p=TorrentID_32p)
if foundNZB['status'] is True:
@ -2031,7 +2032,7 @@ def searchforissue(issueid=None, new=False, rsscheck=None, manual=False):
if mylar.SEARCHLOCK is True:
mylar.SEARCHLOCK = False
else:
logger.info('Completed API Search scan')
logger.info('Completed Queueing API Search scan')
else: