mirror/mylar
1
0
Fork 0
mirror of https://github.com/evilhero/mylar synced 2025-03-09 13:24:53 +00:00
Code Issues Releases Wiki Activity

FIX: When updating a setting in the comic details/Edit Settings tab, would take 'None' as a valid Alternate FileName if nothing else was present - which would cause errors when file-renaming.

Browse source
This commit is contained in:
evilhero 2015-01-30 20:07:21 -05:00
parent ee87963762
commit df09b562f8
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mylar/PostProcessor.py
View file

@ -723,11 +723,11 @@ class PostProcessor(object):
series = comicnzb['ComicName'].encode('ascii', 'ignore').strip()
self._log("Series: " + series)
logger.fdebug(module + ' Series: ' + str(series))
if comicnzb['AlternateFileName']:
if comicnzb['AlternateFileName'] is None or comicnzb['AlternateFileName'] == 'None':
seriesfilename = series
else:
seriesfilename = comicnzb['AlternateFileName'].encode('ascii', 'ignore').strip()
logger.fdebug(module + ' Alternate File Naming has been enabled for this series. Will rename series to : ' + seriesfilename)
else:
seriesfilename = series
seriesyear = comicnzb['ComicYear']
self._log("Year: " + seriesyear)
logger.fdebug(module + ' Year: ' + str(seriesyear))

7
mylar/helpers.py
View file

@ -453,11 +453,11 @@ def rename_param(comicid, comicname, issue, ofilename, comicyear=None, issueid=N
logger.fdebug('Publisher: ' + str(publisher))
series = comicnzb['ComicName']
logger.fdebug('Series: ' + str(series))
if comicnzb['AlternateFileName']:
if comicnzb['AlternateFileName'] is None or comicnzb['AlternateFileName'] == 'None':
seriesfilename = series
else:
seriesfilename = comicnzb['AlternateFileName']
logger.fdebug('Alternate File Naming has been enabled for this series. Will rename series title to : ' + seriesfilename)
else:
seriesfilename = series
seriesyear = comicnzb['ComicYear']
logger.fdebug('Year: ' + str(seriesyear))
comlocation = comicnzb['ComicLocation']
@ -1118,7 +1118,6 @@ def havetotals(refreshit=None):
if mylar.DBCHOICE == 'postgresql':
import db_postgresql as db
myDB = db.DBConnection()
print 'here'
comiclist = myDB.select('SELECT * from comics order by ComicSortName')# COLLATE "%s"',[mylar.OS_LANG])
else:
import db