mirror/mylar
1
0
Fork 0
mirror of https://github.com/evilhero/mylar synced 2025-03-10 14:02:50 +00:00
Code Issues Releases Wiki Activity

FIX:(#319) Issues not detected when checking for files if 'au' present in another form within filename (ie. 'August, 2012')

Browse source
This commit is contained in:
evilhero 2013-04-10 11:50:09 -04:00
parent a3e60b24a3
commit 3b891174e6
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
mylar/updater.py
View file

@ -386,10 +386,10 @@ def forceRescan(ComicID,archive=None):
#fcdigit = str(int(fcnew[som])) #fcdigit = str(int(fcnew[som]))
fcdigit = int(fcnew[som]) * 1000 fcdigit = int(fcnew[som]) * 1000
if som+1 < len(fcnew) and 'au' in fcnew[som+1].lower(): if som+1 < len(fcnew) and 'au' in fcnew[som+1].lower():
#print ("AU detected") if len(fcnew[som+1]) == 2:
#if the 'AU' is in 005AU vs 005 AU it will yield different results. #if the 'AU' is in 005AU vs 005 AU it will yield different results.
fnd_iss_except = 'AU' fnd_iss_except = 'AU'
#logger.info("AU Detected - fnd_iss_except set.") #logger.info("AU Detected - fnd_iss_except set.")
else: else:
#fcdigit = "0" #fcdigit = "0"
fcdigit = 0 fcdigit = 0
@ -431,12 +431,12 @@ def forceRescan(ComicID,archive=None):
#logger.fdebug("intdec: " + str(intdec)) #logger.fdebug("intdec: " + str(intdec))
#logger.fdebug("let's compare with this issue value: " + str(fcdigit)) #logger.fdebug("let's compare with this issue value: " + str(fcdigit))
elif 'au' in fcnew[som].lower(): elif 'au' in fcnew[som].lower():
#if AU is part of issue (5AU instead of 5 AU)
austart = fcnew[som].lower().find('au') austart = fcnew[som].lower().find('au')
if fcnew[som][:austart].isdigit(): if fcnew[som][:austart].isdigit():
fcdigit = int(fcnew[som][:austart]) * 1000 fcdigit = int(fcnew[som][:austart]) * 1000
fnd_iss_except = 'AU' fnd_iss_except = 'AU'
#logger.info("iss_except set to AU") #logger.info("iss_except set to AU")
#if AU is part of issue (5AU instead of 5 AU)
else: else:
# it's a word, skip it. # it's a word, skip it.
fcdigit = 19283838380101193 fcdigit = 19283838380101193
@ -447,6 +447,7 @@ def forceRescan(ComicID,archive=None):
#logger.fdebug("this is the int issue:" + str(int_iss)) #logger.fdebug("this is the int issue:" + str(int_iss))
#logger.fdebug("this is the fcdigit:" + str(fcdigit)) #logger.fdebug("this is the fcdigit:" + str(fcdigit))
if int(fcdigit) == int_iss: if int(fcdigit) == int_iss:
#logger.fdebug("issue match")
#logger.fdebug("fnd_iss_except: " + str(fnd_iss_except)) #logger.fdebug("fnd_iss_except: " + str(fnd_iss_except))
#logger.fdebug("iss_except: " + str(iss_except)) #logger.fdebug("iss_except: " + str(iss_except))
if str(fnd_iss_except) != 'None' and str(iss_except) == 'AU': if str(fnd_iss_except) != 'None' and str(iss_except) == 'AU':