mirror/mylar
1
0
Fork 0
mirror of https://github.com/evilhero/mylar synced 2024-12-22 15:52:47 +00:00
Code Issues Releases Wiki Activity

FIX:(#2219) Em dash in filename / subfolders cause encoding error when performing a manual post-processing

Browse source
This commit is contained in:
evilhero 2019-03-01 11:21:19 -05:00
parent 5c75d9fc00
commit 3aa96d6378
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
mylar/filechecker.py
View file

@ -159,10 +159,10 @@ class FileChecker(object):
'sub': runresults['sub'], 'sub': runresults['sub'],
'comicfilename': runresults['comicfilename'], 'comicfilename': runresults['comicfilename'],
'comiclocation': runresults['comiclocation'], 'comiclocation': runresults['comiclocation'],
'series_name': runresults['series_name'], 'series_name': helpers.conversion(runresults['series_name']),
'series_name_decoded': runresults['series_name_decoded'], 'series_name_decoded': runresults['series_name_decoded'],
'issueid': runresults['issueid'], 'issueid': runresults['issueid'],
'alt_series': runresults['alt_series'], 'alt_series': helpers.conversion(runresults['alt_series']),
'alt_issue': runresults['alt_issue'], 'alt_issue': runresults['alt_issue'],
'dynamic_name': runresults['dynamic_name'], 'dynamic_name': runresults['dynamic_name'],
'series_volume': runresults['series_volume'], 'series_volume': runresults['series_volume'],
@ -178,7 +178,7 @@ class FileChecker(object):
'ComicFilename': runresults['comicfilename'], 'ComicFilename': runresults['comicfilename'],
'ComicLocation': runresults['comiclocation'], 'ComicLocation': runresults['comiclocation'],
'ComicSize': files['comicsize'], 'ComicSize': files['comicsize'],
'ComicName': runresults['series_name'], 'ComicName': helpers.conversion(runresults['series_name']),
'SeriesVolume': runresults['series_volume'], 'SeriesVolume': runresults['series_volume'],
'IssueYear': runresults['issue_year'], 'IssueYear': runresults['issue_year'],
'JusttheDigits': runresults['justthedigits'], 'JusttheDigits': runresults['justthedigits'],
@ -194,9 +194,9 @@ class FileChecker(object):
'sub': runresults['sub'], 'sub': runresults['sub'],
'comicfilename': runresults['comicfilename'], 'comicfilename': runresults['comicfilename'],
'comiclocation': runresults['comiclocation'], 'comiclocation': runresults['comiclocation'],
'series_name': runresults['series_name'], 'series_name': helpers.conversion(runresults['series_name']),
'series_volume': runresults['series_volume'], 'series_volume': runresults['series_volume'],
'alt_series': runresults['alt_series'], 'alt_series': helpres.conversion(runresults['alt_series']),
'alt_issue': runresults['alt_issue'], 'alt_issue': runresults['alt_issue'],
'issue_year': runresults['issue_year'], 'issue_year': runresults['issue_year'],
'issue_number': runresults['issue_number'], 'issue_number': runresults['issue_number'],
@ -227,8 +227,9 @@ class FileChecker(object):
#basepath the sub if it exists to get the parent folder. #basepath the sub if it exists to get the parent folder.
logger.fdebug('[SUB-PATH] Checking Folder Name for more information.') logger.fdebug('[SUB-PATH] Checking Folder Name for more information.')
#sub = re.sub(origpath, '', path).strip()}) #sub = re.sub(origpath, '', path).strip()})
logger.fdebug('[SUB-PATH] Original Path : ' + str(path)) logger.fdebug('[SUB-PATH] Original Path : %s' % path)
logger.fdebug('[SUB-PATH] Sub-directory : ' + str(subpath)) logger.fdebug('[SUB-PATH] Sub-directory : %s' % subpath)
subpath = helpers.conversion(subpath)
if 'windows' in mylar.OS_DETECT.lower(): if 'windows' in mylar.OS_DETECT.lower():
if path in subpath: if path in subpath:
ab = len(path) ab = len(path)