mirror of
https://github.com/evilhero/mylar
synced 2025-03-09 13:24:53 +00:00
FIX: When manual post-processing, would not compare against the Alternate Search Names list, FIX: If a series started with the word 'the' (or similar type of common word), would fail to match during post-processing
This commit is contained in:
parent
77500d16b9
commit
fef65da981
2 changed files with 23 additions and 3 deletions
|
@ -252,15 +252,35 @@ class PostProcessor(object):
|
|||
logger.info(filelist)
|
||||
logger.info('I have located ' + str(filelist['comiccount']) + ' files that I should be able to post-process. Continuing...')
|
||||
|
||||
#preload the entire ALT list in here.
|
||||
alt_list = []
|
||||
alt_db = myDB.select("SELECT * FROM Comics WHERE AlternateSearch != 'None'")
|
||||
if alt_db is not None:
|
||||
for aldb in alt_db:
|
||||
as_d = filechecker.FileChecker(AlternateSearch=aldb['AlternateSearch'].decode('utf-8'))
|
||||
as_dinfo = as_d.altcheck()
|
||||
alt_list.append({'AS_Alt': as_dinfo['AS_Alt'],
|
||||
'AS_Tuple': as_dinfo['AS_Tuple']})
|
||||
|
||||
manual_list = []
|
||||
|
||||
for fl in filelist['comiclist']:
|
||||
#mod_seriesname = '%' + re.sub(' ', '%', fl['series_name']).strip() + '%'
|
||||
as_d = filechecker.FileChecker(watchcomic=fl['series_name'].decode('utf-8'))
|
||||
as_dinfo = as_d.dynamic_replace(fl['series_name'])
|
||||
mod_seriesname = as_dinfo['mod_seriesname']
|
||||
logger.fdebug('Dynamic-ComicName: ' + mod_seriesname)
|
||||
comicseries = myDB.select('SELECT * FROM comics Where DynamicComicName=? COLLATE NOCASE', [mod_seriesname])
|
||||
loopchk = []
|
||||
for x in alt_list:
|
||||
if mod_seriesname in x['AS_Alt']:
|
||||
for ab in x['AS_Alt']:
|
||||
loopchk.append('%' + re.sub('\|', '%', ab) + '%')
|
||||
|
||||
#make sure we add back in the original parsed filename here.
|
||||
loopchk.append('%' + re.sub('\|', '%', mod_seriesname) + '%')
|
||||
|
||||
tmpsql = "SELECT * FROM comics WHERE DynamicComicName LIKE ({seq}) COLLATE NOCASE".format(seq=','.join(['?'] *(len(loopchk))))
|
||||
comicseries = myDB.select(tmpsql, loopchk)
|
||||
|
||||
if comicseries is None:
|
||||
logger.error(module + ' No Series in Watchlist - checking against Story Arcs (just in case). If I do not find anything, maybe you should be running Import?')
|
||||
break
|
||||
|
|
|
@ -953,7 +953,7 @@ class FileChecker(object):
|
|||
if chkthealt == 0:
|
||||
altsearchcomic = self.watchcomic
|
||||
for calt in chkthealt:
|
||||
logger.info('calt: ' + calt)
|
||||
#logger.info('calt: ' + calt)
|
||||
AS_tupled = False
|
||||
AS_Alternate = re.sub('##', '', calt)
|
||||
if '!!' in AS_Alternate:
|
||||
|
|
Loading…
Add table
Reference in a new issue