diff --git a/mylar/PostProcessor.py b/mylar/PostProcessor.py index f0ac4d29..a97ab77d 100755 --- a/mylar/PostProcessor.py +++ b/mylar/PostProcessor.py @@ -1658,8 +1658,8 @@ class PostProcessor(object): if mylar.REPLACE_SPACES: #mylar.REPLACE_CHAR ...determines what to replace spaces with underscore or dot nfilename = nfilename.replace(' ', mylar.REPLACE_CHAR) - nfilename = re.sub('[\,\:\?]', '', nfilename) - nfilename = re.sub('[\/]', '-', nfilename) + nfilename = re.sub('[\,\:\?\"\']', '', nfilename) + nfilename = re.sub('[\/\*]', '-', nfilename) self._log("New Filename: " + nfilename) logger.fdebug(module + ' New Filename: ' + nfilename) diff --git a/mylar/helpers.py b/mylar/helpers.py index ecd76953..0e3d0068 100755 --- a/mylar/helpers.py +++ b/mylar/helpers.py @@ -579,11 +579,13 @@ def rename_param(comicid, comicname, issue, ofilename, comicyear=None, issueid=N logger.fdebug('Annual detected within series title of ' + series + '. Not auto-correcting issue #') seriesfilename = seriesfilename.encode('ascii', 'ignore').strip() - filebad = [':', ',', '/', '?', '!', '\''] #in u_comicname or '/' in u_comicname or ',' in u_comicname or '?' in u_comicname: + filebad = [':', ',', '/', '?', '!', '\'', '\"', '\*'] #in u_comicname or '/' in u_comicname or ',' in u_comicname or '?' in u_comicname: for dbd in filebad: if dbd in seriesfilename: - if dbd == '/': repthechar = '-' - else: repthechar = '' + if any([dbd == '/', dbd == '*']): + repthechar = '-' + else: + repthechar = '' seriesfilename = seriesfilename.replace(dbd, repthechar) logger.fdebug('Altering series name due to filenaming restrictions: ' + seriesfilename) diff --git a/mylar/search.py b/mylar/search.py index a8dc6603..5e44c4cd 100755 --- a/mylar/search.py +++ b/mylar/search.py @@ -757,7 +757,7 @@ def NZB_SEARCH(ComicName, IssueNumber, ComicYear, SeriesYear, Publisher, IssueDa logger.fdebug('Quality restriction enforced [ .cbz only ]. Rejecting this result.') continue - if comsize_b is None: + if comsize_b is None or comsize_b == '0': logger.fdebug('Size of file cannot be retrieved. Ignoring size-comparison and continuing.') #comsize_b = 0 else: