mirror of https://github.com/evilhero/mylar
FIX: When manual post-processing (or Folder Monitor), and items were matched via name, but failed in another aspect - in some cases, it would remove a previous successful match from the list to be actually post-processed resulting in fewer items post-processing, FIX: Modified logging lines when marking an issue as wanted to indicate that the item is being queued for a search, not an immediate search in some instances
This commit is contained in:
evilhero
parent
e1a1d3fea8
commit
90022b6013
|
|
@ -778,19 +778,20 @@ class PostProcessor(object):
|
|||
logger.fdebug(module + '[NON-MATCH: ' + cs['ComicName'] + '-' + cs['ComicID'] + '] Incorrect series - not populating..continuing post-processing')
|
||||
continue
|
||||
|
||||
xmld = filechecker.FileChecker()
|
||||
xmld1 = xmld.dynamic_replace(helpers.conversion(cs['ComicName']))
|
||||
xseries = xmld1['mod_seriesname'].lower()
|
||||
xmld2 = xmld.dynamic_replace(helpers.conversion(watchmatch['series_name']))
|
||||
xfile = xmld2['mod_seriesname'].lower()
|
||||
if datematch == 'True':
|
||||
xmld = filechecker.FileChecker()
|
||||
xmld1 = xmld.dynamic_replace(helpers.conversion(cs['ComicName']))
|
||||
xseries = xmld1['mod_seriesname'].lower()
|
||||
xmld2 = xmld.dynamic_replace(helpers.conversion(watchmatch['series_name']))
|
||||
xfile = xmld2['mod_seriesname'].lower()
|
||||
|
||||
if re.sub('\|', '', xseries) == re.sub('\|', '', xfile):
|
||||
logger.fdebug('%s[DEFINITIVE-NAME MATCH] Definitive name match exactly to : %s [%s]' % (module, watchmatch['series_name'], cs['ComicID']))
|
||||
if len(manual_list) > 1:
|
||||
manual_list = [item for item in manual_list if all([item['IssueID'] == isc['IssueID'], item['AnnualType'] is not None]) or all([item['IssueID'] == isc['IssueID'], item['ComicLocation'] == clocation]) or all([item['IssueID'] != isc['IssueID'], item['ComicLocation'] != clocation])]
|
||||
self.matched = True
|
||||
else:
|
||||
continue #break
|
||||
if re.sub('\|', '', xseries) == re.sub('\|', '', xfile):
|
||||
logger.fdebug('%s[DEFINITIVE-NAME MATCH] Definitive name match exactly to : %s [%s]' % (module, watchmatch['series_name'], cs['ComicID']))
|
||||
if len(manual_list) > 1:
|
||||
manual_list = [item for item in manual_list if all([item['IssueID'] == isc['IssueID'], item['AnnualType'] is not None]) or all([item['IssueID'] == isc['IssueID'], item['ComicLocation'] == clocation]) or all([item['IssueID'] != isc['IssueID'], item['ComicLocation'] != clocation])]
|
||||
self.matched = True
|
||||
else:
|
||||
continue #break
|
||||
|
||||
if datematch == 'True':
|
||||
logger.fdebug(module + '[SUCCESSFUL MATCH: ' + cs['ComicName'] + '-' + cs['ComicID'] + '] Match verified for ' + helpers.conversion(fl['comicfilename']))
|
||||
|
|
@ -1020,7 +1021,7 @@ class PostProcessor(object):
|
|||
oneofflist = myDB.select("select s.Issue_Number, s.ComicName, s.IssueID, s.ComicID, s.Provider, w.PUBLISHER, w.weeknumber, w.year from snatched as s inner join nzblog as n on s.IssueID = n.IssueID inner join weekly as w on s.IssueID = w.IssueID WHERE n.OneOff = 1;") #(s.Provider ='32P' or s.Provider='WWT' or s.Provider='DEM') AND n.OneOff = 1;")
|
||||
#oneofflist = myDB.select("select s.Issue_Number, s.ComicName, s.IssueID, s.ComicID, s.Provider, w.PUBLISHER, w.weeknumber, w.year from snatched as s inner join nzblog as n on s.IssueID = n.IssueID and s.Hash is not NULL inner join weekly as w on s.IssueID = w.IssueID WHERE n.OneOff = 1;") #(s.Provider ='32P' or s.Provider='WWT' or s.Provider='DEM') AND n.OneOff = 1;")
|
||||
if not oneofflist:
|
||||
continue
|
||||
pass #continue
|
||||
else:
|
||||
logger.fdebug(module + '[ONEOFF-SELECTION][self.nzb_name: %s]' % self.nzb_name)
|
||||
oneoffvals = []
|
||||
|
|
@ -1090,7 +1091,6 @@ class PostProcessor(object):
|
|||
self.matched = True
|
||||
break
|
||||
|
||||
|
||||
logger.fdebug('%s There are %s files found that match on your watchlist, %s files are considered one-off\'s, and %s files do not match anything' % (module, len(manual_list), len(oneoff_issuelist), int(filelist['comiccount']) - len(manual_list)))
|
||||
|
||||
delete_arc = []
|
||||
|
|
|
|||
|
|
@ -1305,7 +1305,7 @@ class FileChecker(object):
|
|||
tcrc = helpers.crc(os.path.join(dirname, fname).decode(mylar.SYS_ENCODING))
|
||||
crcchk = [x for x in pp_crclist if tcrc == x['crc']]
|
||||
if crcchk:
|
||||
#logger.fdebug('%s Already post-processed this item %s - Ignoring' % fname)
|
||||
#logger.fdebug('[FILECHECKEER] Already post-processed this item %s - Ignoring' % fname)
|
||||
continue
|
||||
|
||||
if os.path.splitext(fname)[1].lower().endswith(comic_ext):
|
||||
|
|
|
|||
|
|
@ -1379,6 +1379,7 @@ class WebInterface(object):
|
|||
controlValueDict = {"IssueArcID": IssueArcID}
|
||||
newStatus = {"Status": "Wanted"}
|
||||
myDB.upsert("storyarcs", newStatus, controlValueDict)
|
||||
logger.info('[STORY-ARCS] Now Queuing %s (%s) #%s for search' % (ComicName, ComicYear, ComicIssue))
|
||||
s = mylar.SEARCH_QUEUE.put({'issueid': IssueArcID, 'comicname': ComicName, 'seriesyear': ComicYear, 'comicid': ComicID, 'issuenumber': ComicIssue})
|
||||
#foundcom, prov = search.search_init(ComicName=ComicName, IssueNumber=ComicIssue, ComicYear=ComicYear, SeriesYear=None, Publisher=Publisher, IssueDate=IssueDate, StoreDate=ReleaseDate, IssueID=None, AlternateSearch=None, UseFuzzy=None, ComicVersion=dateload['Volume'], SARC=SARC, IssueArcID=IssueArcID)
|
||||
#if foundcom['status'] is True:
|
||||
|
|
@ -1399,7 +1400,7 @@ class WebInterface(object):
|
|||
except:
|
||||
ComicYear == now.year
|
||||
if Publisher == 'COMICS': Publisher = None
|
||||
logger.info(u"Marking " + ComicName + " " + ComicIssue + " as wanted...")
|
||||
logger.info('Now Queuing %s %s for search' % (ComicName, ComicIssue))
|
||||
s = mylar.SEARCH_QUEUE.put({'issueid': IssueID, 'comicname': ComicName, 'seriesyear': ComicYear, 'comicid': ComicID, 'issuenumber': ComicIssue})
|
||||
#foundcom, prov = search.search_init(ComicName=ComicName, IssueNumber=ComicIssue, ComicYear=ComicYear, SeriesYear=None, Publisher=Publisher, IssueDate=IssueDate, StoreDate=IssueDate, IssueID=IssueID, ComicID=ComicID, AlternateSearch=None, mode=mode, UseFuzzy=None, ComicVersion=ComicVersion, allow_packs=False, manual=manual)
|
||||
if manual is True:
|
||||
|
|
@ -1466,6 +1467,12 @@ class WebInterface(object):
|
|||
#Publisher = miy['ComicPublisher']
|
||||
#UseAFuzzy = miy['UseFuzzy']
|
||||
#ComicVersion = miy['ComicVersion']
|
||||
if BookType == 'TPB':
|
||||
logger.info('[%s] Now Queueing %s (%s) for search' % (BookType, ComicName, SeriesYear))
|
||||
elif ComicIssue is None:
|
||||
logger.info('Now Queueing %s (%s) for search' % (ComicName, SeriesYear))
|
||||
else:
|
||||
logger.info('Now Queueing %s (%s) #%s for search' % (ComicName, SeriesYear, ComicIssue))
|
||||
s = mylar.SEARCH_QUEUE.put({'issueid': IssueID, 'comicname': ComicName, 'seriesyear': SeriesYear, 'comicid': ComicID, 'issuenumber': ComicIssue, 'booktype': BookType})
|
||||
# foundcom, prov = search.search_init(ComicName, ComicIssue, ComicYear, SeriesYear, Publisher, issues['IssueDate'], storedate, IssueID, AlternateSearch, UseAFuzzy, ComicVersion, mode=mode, ComicID=ComicID, manualsearch=manualsearch, filesafe=ComicName_Filesafe, allow_packs=AllowPacks, torrentid_32p=TorrentID_32p)
|
||||
# if foundcom['status'] is True:
|
||||
|
|
@ -2407,7 +2414,7 @@ class WebInterface(object):
|
|||
logger.info('[%s] Now force submitting job for jobid %s' % (jb, jobid))
|
||||
if any([jobid == 'rss', jobid == 'weekly', jobid =='search', jobid == 'version', jobid == 'updater', jobid == 'monitor']):
|
||||
jb.modify(next_run_time=datetime.datetime.utcnow())
|
||||
break
|
||||
break
|
||||
schedulerForceCheck.exposed = True
|
||||
|
||||
def manageComics(self):
|
||||
|
|
|
|||
Loading…
Reference in New Issue