mirror of
https://github.com/evilhero/mylar
synced 2025-03-15 08:18:44 +00:00
FIX:(#1519) Allow for scanning/checking of files whose issue numbers indicate seasons (must be numbered as #Winter, #Summer, #Spring, or #Fall)
This commit is contained in:
parent
52788daf26
commit
ba011cc659
4 changed files with 31 additions and 6 deletions
|
@ -390,7 +390,7 @@ class FileChecker(object):
|
|||
lastmod_position = 0
|
||||
booktype = 'issue'
|
||||
#exceptions that are considered alpha-numeric issue numbers
|
||||
exceptions = ('NOW', 'AI', 'AU', 'X', 'A', 'B', 'C', 'INH', 'MU')
|
||||
exceptions = ('NOW', 'AI', 'AU', 'X', 'A', 'B', 'C', 'INH', 'MU', 'SUMMER', 'SPRING', 'FALL', 'WINTER')
|
||||
|
||||
#unicode characters, followed by int value
|
||||
# num_exceptions = [{iss:u'\xbd',val:.5},{iss:u'\xbc',val:.25}, {iss:u'\xe',val:.75}, {iss:u'\221e',val:'infinity'}]
|
||||
|
@ -444,7 +444,14 @@ class FileChecker(object):
|
|||
'position': split_file.index(sf),
|
||||
'mod_position': self.char_file_position(modfilename, sf, lastmod_position),
|
||||
'validcountchk': validcountchk})
|
||||
|
||||
else:
|
||||
test_position = modfilename[self.char_file_position(modfilename, sf,lastmod_position)-1]
|
||||
if test_position == '#':
|
||||
possible_issuenumbers.append({'number': sf,
|
||||
'position': split_file.index(sf),
|
||||
'mod_position': self.char_file_position(modfilename, sf, lastmod_position),
|
||||
'validcountchk': validcountchk})
|
||||
|
||||
if sf == 'XCV':
|
||||
# new 2016-09-19 \ attempt to check for XCV which replaces any unicode above
|
||||
for x in list(wrds):
|
||||
|
|
|
@ -1092,8 +1092,16 @@ def issuedigits(issnum):
|
|||
a+=1
|
||||
int_issnum = (int(issno) * 1000) + ordtot
|
||||
elif invchk == "true":
|
||||
logger.fdebug('this does not have an issue # that I can parse properly.')
|
||||
return 999999999999999
|
||||
if any([issnum.lower() == 'fall', issnum.lower() == 'spring', issnum.lower() == 'summer', issnum.lower() == 'winter']):
|
||||
inu = 0
|
||||
ordtot = 0
|
||||
while (inu < len(issnum)):
|
||||
ordtot += ord(issnum[inu].lower()) #lower-case the letters for simplicty
|
||||
inu+=1
|
||||
int_issnum = ordtot
|
||||
else:
|
||||
logger.fdebug('this does not have an issue # that I can parse properly.')
|
||||
return 999999999999999
|
||||
else:
|
||||
if issnum == '9-5':
|
||||
issnum = u'9\xbd'
|
||||
|
|
|
@ -1195,8 +1195,17 @@ def updateissuedata(comicid, comicname=None, issued=None, comicIssues=None, call
|
|||
a+=1
|
||||
int_issnum = (int(issno) * 1000) + ordtot
|
||||
elif invchk == "true":
|
||||
logger.fdebug('this does not have an issue # that I can parse properly.')
|
||||
return
|
||||
if any([issnum.lower() == 'fall 2005', issnum.lower() == 'spring 2005', issnum.lower() == 'summer 2006', issnum.lower() == 'winter 2009']):
|
||||
issnum = re.sub('[0-9]+', '', issnum).strip()
|
||||
inu = 0
|
||||
ordtot = 0
|
||||
while (inu < len(issnum)):
|
||||
ordtot += ord(issnum[inu].lower()) #lower-case the letters for simplicty
|
||||
inu+=1
|
||||
int_issnum = ordtot
|
||||
else:
|
||||
logger.fdebug('this does not have an issue # that I can parse properly.')
|
||||
return
|
||||
else:
|
||||
if int_issnum is not None:
|
||||
pass
|
||||
|
|
|
@ -1119,6 +1119,7 @@ def forceRescan(ComicID, archive=None, module=None, recheck=False):
|
|||
while True:
|
||||
try:
|
||||
reiss = reissues[n]
|
||||
int_iss = None
|
||||
except IndexError:
|
||||
break
|
||||
int_iss = helpers.issuedigits(reiss['Issue_Number'])
|
||||
|
|
Loading…
Add table
Reference in a new issue