mirror of https://github.com/evilhero/mylar
FIX: Fix for Manual Post-Processing of issues where multiple series volumes are present within the watchlist - will now verify volume/year to ensure proper match, IMP: Added option in config.ini for metatagging to use start year as volume
This commit is contained in:
evilhero
parent
704ef85dec
commit
6ae316c931
|
|
@ -396,49 +396,105 @@ class PostProcessor(object):
|
|||
#compare the ReleaseDate for the issue, to the found issue date in the filename.
|
||||
#if ReleaseDate doesn't exist, use IssueDate
|
||||
#if no issue date was found, then ignore.
|
||||
logger.fdebug(module + '[ISSUE-VERIFY] Now checking against ' + cs['ComicName'] + '-' + cs['ComicID'])
|
||||
issyr = None
|
||||
#logger.fdebug('issuedate:' + str(issuechk['IssueDate']))
|
||||
#logger.fdebug('issuechk: ' + str(issuechk['IssueDate'][5:7]))
|
||||
#logger.fdebug(module + ' issuedate:' + str(issuechk['IssueDate']))
|
||||
#logger.fdebug(module + ' issuechk: ' + str(issuechk['IssueDate'][5:7]))
|
||||
|
||||
#logger.info('ReleaseDate: ' + str(issuechk['ReleaseDate']))
|
||||
#logger.info('IssueDate: ' + str(issuechk['IssueDate']))
|
||||
#logger.info(module + ' ReleaseDate: ' + str(issuechk['ReleaseDate']))
|
||||
#logger.info(module + ' IssueDate: ' + str(issuechk['IssueDate']))
|
||||
if issuechk['ReleaseDate'] is not None and issuechk['ReleaseDate'] != '0000-00-00':
|
||||
monthval = issuechk['ReleaseDate']
|
||||
watch_issueyear = issuechk['ReleaseDate'][:4]
|
||||
if int(issuechk['ReleaseDate'][:4]) < int(watchmatch['issue_year']):
|
||||
logger.fdebug(module + ' ' + str(issuechk['ReleaseDate']) + ' is before the issue year of ' + str(watchmatch['issue_year']) + ' that was discovered in the filename')
|
||||
logger.fdebug(module + '[ISSUE-VERIFY] ' + str(issuechk['ReleaseDate']) + ' is before the issue year of ' + str(watchmatch['issue_year']) + ' that was discovered in the filename')
|
||||
datematch = "False"
|
||||
else:
|
||||
monthval = issuechk['IssueDate']
|
||||
watch_issueyear = issuechk['IssueDate'][:4]
|
||||
if int(issuechk['IssueDate'][:4]) < int(watchmatch['issue_year']):
|
||||
logger.fdebug(module + ' ' + str(issuechk['IssueDate']) + ' is before the issue year ' + str(watchmatch['issue_year']) + ' that was discovered in the filename')
|
||||
logger.fdebug(module + '[ISSUE-VERIFY] ' + str(issuechk['IssueDate']) + ' is before the issue year ' + str(watchmatch['issue_year']) + ' that was discovered in the filename')
|
||||
datematch = "False"
|
||||
|
||||
if int(monthval[5:7]) == 11 or int(monthval[5:7]) == 12:
|
||||
issyr = int(monthval[:4]) + 1
|
||||
logger.fdebug(module + ' IssueYear (issyr) is ' + str(issyr))
|
||||
logger.fdebug(module + '[ISSUE-VERIFY] IssueYear (issyr) is ' + str(issyr))
|
||||
elif int(monthval[5:7]) == 1 or int(monthval[5:7]) == 2 or int(monthval[5:7]) == 3:
|
||||
issyr = int(monthval[:4]) - 1
|
||||
|
||||
if datematch == "False" and issyr is not None:
|
||||
logger.fdebug(module + ' ' + str(issyr) + ' comparing to ' + str(watchmatch['issue_year']) + ' : rechecking by month-check versus year.')
|
||||
logger.fdebug(module + '[ISSUE-VERIFY] ' + str(issyr) + ' comparing to ' + str(watchmatch['issue_year']) + ' : rechecking by month-check versus year.')
|
||||
datematch = "True"
|
||||
if int(issyr) != int(watchmatch['issue_year']):
|
||||
logger.fdebug(module + '[.:FAIL:.] Issue is before the modified issue year of ' + str(issyr))
|
||||
logger.fdebug(module + '[ISSUE-VERIFY][.:FAIL:.] Issue is before the modified issue year of ' + str(issyr))
|
||||
datematch = "False"
|
||||
|
||||
else:
|
||||
logger.info(module + ' Found matching issue # ' + str(fcdigit) + ' for ComicID: ' + str(cs['ComicID']) + ' / IssueID: ' + str(issuechk['IssueID']))
|
||||
logger.info(module + '[ISSUE-VERIFY] Found matching issue # ' + str(fcdigit) + ' for ComicID: ' + str(cs['ComicID']) + ' / IssueID: ' + str(issuechk['IssueID']))
|
||||
|
||||
if datematch == "True":
|
||||
if watchmatch['sub']:
|
||||
clocation = os.path.join(watchmatch['comiclocation'], watchmatch['sub'], watchmatch['comicfilename'].decode('utf-8'))
|
||||
# if we get to here, we need to do some more comparisons just to make sure we have the right volume
|
||||
# first we chk volume label if it exists, then we drop down to issue year
|
||||
# if the above both don't exist, and there's more than one series on the watchlist (or the series is > v1)
|
||||
# then spit out the error message and don't post-process it.
|
||||
watch_values = cs['WatchValues']
|
||||
logger.info(watch_values)
|
||||
if watch_values['ComicVersion'] is None:
|
||||
tmp_watchlist_vol = '1'
|
||||
else:
|
||||
clocation = os.path.join(watchmatch['comiclocation'],watchmatch['comicfilename'].decode('utf-8'))
|
||||
manual_list.append({"ComicLocation": clocation,
|
||||
"ComicID": cs['ComicID'],
|
||||
"IssueID": issuechk['IssueID'],
|
||||
"IssueNumber": issuechk['Issue_Number'],
|
||||
"ComicName": cs['ComicName']})
|
||||
tmp_watchlist_vol = re.sub("[^0-9]", "", watch_values['ComicVersion']).strip()
|
||||
if not any([watchmatch['series_volume'] != 'None', watchmatch['series_volume'] is not None]):
|
||||
tmp_watchmatch_vol = re.sub("[^0-9]","", watchmatch['series_volume']).strip()
|
||||
if len(tmp_watchmatch_vol) == 4:
|
||||
if int(tmp_watchmatch_vol) == int(watch_values['SeriesYear']):
|
||||
logger.fdebug(module + '[ISSUE-VERIFY][SeriesYear-Volume MATCH] Series Year of ' + str(watch_values['SeriesYear']) + ' matched to volume/year label of ' + str(tmp_watchmatch_vol))
|
||||
else:
|
||||
logger.fdebug(module + '[ISSUE-VERIFY][SeriesYear-Volume FAILURE] Series Year of ' + str(watch_values['SeriesYear']) + ' DID NOT match to volume/year label of ' + tmp_watchmatch_vol)
|
||||
datematch = "False"
|
||||
if len(watchvals) > 1 and int(tmp_watchmatch_vol) > 1:
|
||||
if int(tmp_watchmatch_vol) == int(tmp_watchlist_vol):
|
||||
logger.fdebug(module + '[ISSUE-VERIFY][SeriesYear-Volume MATCH] Volume label of series Year of ' + str(watch_values['ComicVersion']) + ' matched to volume label of ' + str(watchmatch['series_volume']))
|
||||
else:
|
||||
logger.fdebug(module + '[ISSUE-VERIFY][SeriesYear-Volume FAILURE] Volume label of Series Year of ' + str(watch_values['ComicVersion']) + ' DID NOT match to volume label of ' + str(watchmatch['series_volume']))
|
||||
datematch = "False"
|
||||
else:
|
||||
if any([tmp_watchlist_vol is None, tmp_watchlist_vol == 'None', tmp_watchlist_vol == '']):
|
||||
logger.fdebug(module + '[ISSUE-VERIFY][NO VOLUME PRESENT] No Volume label present for series. Dropping down to Issue Year matching.')
|
||||
datematch = "False"
|
||||
elif len(watchvals) == 1 and int(tmp_watchlist_vol) == 1:
|
||||
logger.fdebug(module + '[ISSUE-VERIFY][Lone Volume MATCH] Volume label of ' + str(watch_values['ComicVersion']) + ' indicates only volume for this series on your watchlist.')
|
||||
elif int(tmp_watchlist_vol) > 1:
|
||||
logger.fdebug(module + '[ISSUE-VERIFY][Lone Volume FAILURE] Volume label of ' + str(watch_values['ComicVersion']) + ' indicates that there is more than one volume for this series, but the one on your watchlist has no volume label set.')
|
||||
datematch = "False"
|
||||
|
||||
if datematch == "False" and any([watchmatch['issue_year'] is not None, watchmatch['issue_year'] != 'None']):
|
||||
#now we see if the issue year matches exactly to what we have within Mylar.
|
||||
if int(watch_issueyear) == int(watchmatch['issue_year']):
|
||||
logger.fdebug(module + '[ISSUE-VERIFY][Issue Year MATCH] Issue Year of ' + str(watch_issueyear) + ' is a match to the year found in the filename of : ' + str(watchmatch['issue_year']))
|
||||
datematch = 'True'
|
||||
else:
|
||||
logger.fdebug(module + '[ISSUE-VERIFY][Issue Year FAILURE] Issue Year of ' + str(watch_issueyear) + ' does NOT match the year found in the filename of : ' + str(watchmatch['issue_year']))
|
||||
logger.fdebug(module + '[ISSUE-VERIFY] Checking against complete date to see if month published could allow for different publication year.')
|
||||
if issyr is not None:
|
||||
if int(issyr) != int(watchmatch['issue_year']):
|
||||
logger.fdebug(module + '[ISSUE-VERIFY][Issue Year FAILURE] Modified Issue year of ' + str(issyr) + ' is before the modified issue year of ' + str(issyr))
|
||||
else:
|
||||
logger.fdebug(module + '[ISSUE-VERIFY][Issue Year MATCH] Modified Issue Year of ' + str(issyr) + ' is a match to the year found in the filename of : ' + str(watchmatch['issue_year']))
|
||||
datematch = 'True'
|
||||
|
||||
if datematch == 'True':
|
||||
if watchmatch['sub']:
|
||||
clocation = os.path.join(watchmatch['comiclocation'], watchmatch['sub'], watchmatch['comicfilename'].decode('utf-8'))
|
||||
else:
|
||||
clocation = os.path.join(watchmatch['comiclocation'],watchmatch['comicfilename'].decode('utf-8'))
|
||||
manual_list.append({"ComicLocation": clocation,
|
||||
"ComicID": cs['ComicID'],
|
||||
"IssueID": issuechk['IssueID'],
|
||||
"IssueNumber": issuechk['Issue_Number'],
|
||||
"ComicName": cs['ComicName']})
|
||||
else:
|
||||
logger.fdebug(module + '[NON-MATCH: ' + cs['ComicName'] + '-' + cs['ComicID'] + '] Incorrect series - not populating..continuing post-processing')
|
||||
continue
|
||||
else:
|
||||
logger.fdebug(module + '[NON-MATCH: ' + cs['ComicName'] + '-' + cs['ComicID'] + '] Incorrect series - not populating..continuing post-processing')
|
||||
continue
|
||||
|
|
@ -1106,7 +1162,7 @@ class PostProcessor(object):
|
|||
if stat is None: stat = ' [1/1]'
|
||||
module = self.module
|
||||
annchk = "no"
|
||||
extensions = ('.cbr', '.cbz')
|
||||
extensions = ('.cbr', '.cbz', '.pdf')
|
||||
snatchedtorrent = False
|
||||
myDB = db.DBConnection()
|
||||
comicnzb = myDB.selectone("SELECT * from comics WHERE comicid=?", [comicid]).fetchone()
|
||||
|
|
@ -1430,12 +1486,17 @@ class PostProcessor(object):
|
|||
self._log("Metatagging enabled - proceeding...")
|
||||
logger.fdebug(module + ' Metatagging enabled - proceeding...')
|
||||
pcheck = "pass"
|
||||
if mylar.CMTAG_START_YEAR_AS_VOLUME:
|
||||
vol_label = seriesyear
|
||||
else:
|
||||
vol_label = comversion
|
||||
|
||||
try:
|
||||
import cmtagmylar
|
||||
if ml is None:
|
||||
pcheck = cmtagmylar.run(self.nzb_folder, issueid=issueid, comversion=comversion, filename=os.path.join(odir, ofilename))
|
||||
pcheck = cmtagmylar.run(self.nzb_folder, issueid=issueid, comversion=vol_label, filename=os.path.join(odir, ofilename))
|
||||
else:
|
||||
pcheck = cmtagmylar.run(self.nzb_folder, issueid=issueid, comversion=comversion, manual="yes", filename=ml['ComicLocation'])
|
||||
pcheck = cmtagmylar.run(self.nzb_folder, issueid=issueid, comversion=vol_label, manual="yes", filename=ml['ComicLocation'])
|
||||
|
||||
except ImportError:
|
||||
logger.fdebug(module + ' comictaggerlib not found on system. Ensure the ENTIRE lib directory is located within mylar/lib/comictaggerlib/')
|
||||
|
|
|
|||
|
|
@ -176,7 +176,7 @@ CHECK_FOLDER = None
|
|||
ENABLE_CHECK_FOLDER = False
|
||||
INTERFACE = None
|
||||
DUPECONSTRAINT = None
|
||||
DDUMP = 0
|
||||
DDUMP = False
|
||||
DUPLICATE_DUMP = None
|
||||
PREFERRED_QUALITY = 0
|
||||
CORRECT_METADATA = False
|
||||
|
|
@ -315,6 +315,9 @@ STORYARCDIR = 0
|
|||
COPY2ARCDIR = 0
|
||||
|
||||
CVURL = None
|
||||
CURRENT_WEEKNUMBER = None
|
||||
CURRENT_YEAR = None
|
||||
PULL_REFRESH = None
|
||||
WEEKFOLDER = 0
|
||||
WEEKFOLDER_LOC = None
|
||||
LOCMOVE = 0
|
||||
|
|
@ -334,6 +337,7 @@ CT_TAG_CBL = 1
|
|||
CT_CBZ_OVERWRITE = 0
|
||||
UNRAR_CMD = None
|
||||
CT_SETTINGSPATH = None
|
||||
CMTAG_START_YEAR_AS_VOLUME = False
|
||||
|
||||
UPCOMING_SNATCHED = 1
|
||||
|
||||
|
|
@ -458,14 +462,14 @@ def initialize():
|
|||
ENABLE_TORZNAB, TORZNAB_NAME, TORZNAB_HOST, TORZNAB_APIKEY, TORZNAB_CATEGORY, TORZNAB_VERIFY, \
|
||||
EXPERIMENTAL, ALTEXPERIMENTAL, USE_RTORRENT, RTORRENT_HOST, RTORRENT_USERNAME, RTORRENT_PASSWORD, RTORRENT_STARTONLOAD, RTORRENT_LABEL, RTORRENT_DIRECTORY, \
|
||||
USE_UTORRENT, UTORRENT_HOST, UTORRENT_USERNAME, UTORRENT_PASSWORD, UTORRENT_LABEL, USE_TRANSMISSION, TRANSMISSION_HOST, TRANSMISSION_USERNAME, TRANSMISSION_PASSWORD, \
|
||||
ENABLE_META, CMTAGGER_PATH, CBR2CBZ_ONLY, CT_TAG_CR, CT_TAG_CBL, CT_CBZ_OVERWRITE, UNRAR_CMD, CT_SETTINGSPATH, UPDATE_ENDED, INDIE_PUB, BIGGIE_PUB, IGNORE_HAVETOTAL, SNATCHED_HAVETOTAL, PROVIDER_ORDER, \
|
||||
ENABLE_META, CMTAGGER_PATH, CBR2CBZ_ONLY, CT_TAG_CR, CT_TAG_CBL, CT_CBZ_OVERWRITE, UNRAR_CMD, CT_SETTINGSPATH, CMTAG_START_YEAR_AS_VOLUME, UPDATE_ENDED, INDIE_PUB, BIGGIE_PUB, IGNORE_HAVETOTAL, SNATCHED_HAVETOTAL, PROVIDER_ORDER, \
|
||||
dbUpdateScheduler, searchScheduler, RSSScheduler, WeeklyScheduler, VersionScheduler, FolderMonitorScheduler, \
|
||||
ENABLE_TORRENTS, TORRENT_DOWNLOADER, MINSEEDS, USE_WATCHDIR, TORRENT_LOCAL, LOCAL_WATCHDIR, TORRENT_SEEDBOX, SEEDBOX_HOST, SEEDBOX_PORT, SEEDBOX_USER, SEEDBOX_PASS, SEEDBOX_WATCHDIR, \
|
||||
ENABLE_RSS, RSS_CHECKINTERVAL, RSS_LASTRUN, FAILED_DOWNLOAD_HANDLING, FAILED_AUTO, ENABLE_TORRENT_SEARCH, ENABLE_KAT, KAT_PROXY, KAT_VERIFY, ENABLE_32P, MODE_32P, KEYS_32P, RSSFEED_32P, USERNAME_32P, PASSWORD_32P, AUTHKEY_32P, PASSKEY_32P, FEEDINFO_32P, VERIFY_32P, SNATCHEDTORRENT_NOTIFY, \
|
||||
PROWL_ENABLED, PROWL_PRIORITY, PROWL_KEYS, PROWL_ONSNATCH, NMA_ENABLED, NMA_APIKEY, NMA_PRIORITY, NMA_ONSNATCH, PUSHOVER_ENABLED, PUSHOVER_PRIORITY, PUSHOVER_APIKEY, PUSHOVER_USERKEY, PUSHOVER_ONSNATCH, BOXCAR_ENABLED, BOXCAR_ONSNATCH, BOXCAR_TOKEN, \
|
||||
PUSHBULLET_ENABLED, PUSHBULLET_APIKEY, PUSHBULLET_DEVICEID, PUSHBULLET_ONSNATCH, LOCMOVE, NEWCOM_DIR, FFTONEWCOM_DIR, \
|
||||
PREFERRED_QUALITY, MOVE_FILES, RENAME_FILES, LOWERCASE_FILENAMES, USE_MINSIZE, MINSIZE, USE_MAXSIZE, MAXSIZE, CORRECT_METADATA, FOLDER_FORMAT, FILE_FORMAT, REPLACE_CHAR, REPLACE_SPACES, ADD_TO_CSV, CVINFO, LOG_LEVEL, POST_PROCESSING, POST_PROCESSING_SCRIPT, FILE_OPTS, SEARCH_DELAY, GRABBAG_DIR, READ2FILENAME, SEND2READ, TAB_ENABLE, TAB_HOST, TAB_USER, TAB_PASS, TAB_DIRECTORY, STORYARCDIR, COPY2ARCDIR, CVURL, CHECK_FOLDER, ENABLE_CHECK_FOLDER, \
|
||||
COMIC_LOCATION, QUAL_ALTVERS, QUAL_SCANNER, QUAL_TYPE, QUAL_QUALITY, ENABLE_EXTRA_SCRIPTS, EXTRA_SCRIPTS, ENABLE_PRE_SCRIPTS, PRE_SCRIPTS, PULLNEW, ALT_PULL, COUNT_ISSUES, COUNT_HAVES, COUNT_COMICS, SYNO_FIX, CHMOD_FILE, CHMOD_DIR, CHOWNER, CHGROUP, ANNUALS_ON, CV_ONLY, CV_ONETIMER, WEEKFOLDER, WEEKFOLDER_LOC, UMASK
|
||||
COMIC_LOCATION, QUAL_ALTVERS, QUAL_SCANNER, QUAL_TYPE, QUAL_QUALITY, ENABLE_EXTRA_SCRIPTS, EXTRA_SCRIPTS, ENABLE_PRE_SCRIPTS, PRE_SCRIPTS, PULLNEW, ALT_PULL, COUNT_ISSUES, COUNT_HAVES, COUNT_COMICS, SYNO_FIX, CHMOD_FILE, CHMOD_DIR, CHOWNER, CHGROUP, ANNUALS_ON, CV_ONLY, CV_ONETIMER, CURRENT_WEEKNUMBER, CURRENT_YEAR, PULL_REFRESH, WEEKFOLDER, WEEKFOLDER_LOC, UMASK
|
||||
|
||||
if __INITIALIZED__:
|
||||
return False
|
||||
|
|
@ -659,6 +663,7 @@ def initialize():
|
|||
CT_TAG_CBL = bool(check_setting_int(CFG, 'General', 'ct_tag_cbl', 1))
|
||||
CT_CBZ_OVERWRITE = bool(check_setting_int(CFG, 'General', 'ct_cbz_overwrite', 0))
|
||||
UNRAR_CMD = check_setting_str(CFG, 'General', 'unrar_cmd', '')
|
||||
CMTAG_START_YEAR_AS_VOLUME = bool(check_setting_int(CFG, 'General', 'cmtag_start_year_as_volume', 0))
|
||||
|
||||
UPCOMING_SNATCHED = bool(check_setting_int(CFG, 'General', 'upcoming_snatched', 1))
|
||||
UPDATE_ENDED = bool(check_setting_int(CFG, 'General', 'update_ended', 0))
|
||||
|
|
@ -1191,6 +1196,12 @@ def initialize():
|
|||
runImmediately=True,
|
||||
delay=60)
|
||||
|
||||
|
||||
# set the current week for the pull-list
|
||||
todaydate = datetime.datetime.today()
|
||||
CURRENT_WEEKNUMBER = todaydate.strftime("%U")
|
||||
CURRENT_YEAR = todaydate.strftime("%Y")
|
||||
|
||||
# Store the original umask
|
||||
UMASK = os.umask(0)
|
||||
os.umask(UMASK)
|
||||
|
|
@ -1336,7 +1347,7 @@ def config_write():
|
|||
new_config['General']['check_folder'] = CHECK_FOLDER
|
||||
new_config['General']['interface'] = INTERFACE
|
||||
new_config['General']['dupeconstraint'] = DUPECONSTRAINT
|
||||
new_config['General']['ddump'] = DDUMP
|
||||
new_config['General']['ddump'] = int(DDUMP)
|
||||
new_config['General']['duplicate_dump'] = DUPLICATE_DUMP
|
||||
new_config['General']['autowant_all'] = int(AUTOWANT_ALL)
|
||||
new_config['General']['autowant_upcoming'] = int(AUTOWANT_UPCOMING)
|
||||
|
|
@ -1394,6 +1405,7 @@ def config_write():
|
|||
new_config['General']['ct_tag_cbl'] = int(CT_TAG_CBL)
|
||||
new_config['General']['ct_cbz_overwrite'] = int(CT_CBZ_OVERWRITE)
|
||||
new_config['General']['unrar_cmd'] = UNRAR_CMD
|
||||
new_config['General']['cmtag_start_year_as_volume'] = int(CMTAG_START_YEAR_AS_VOLUME)
|
||||
new_config['General']['update_ended'] = int(UPDATE_ENDED)
|
||||
new_config['General']['indie_pub'] = INDIE_PUB
|
||||
new_config['General']['biggie_pub'] = BIGGIE_PUB
|
||||
|
|
@ -1626,7 +1638,7 @@ def dbcheck():
|
|||
c.execute('CREATE TABLE IF NOT EXISTS snatched (IssueID TEXT, ComicName TEXT, Issue_Number TEXT, Size INTEGER, DateAdded TEXT, Status TEXT, FolderName TEXT, ComicID TEXT, Provider TEXT)')
|
||||
c.execute('CREATE TABLE IF NOT EXISTS upcoming (ComicName TEXT, IssueNumber TEXT, ComicID TEXT, IssueID TEXT, IssueDate TEXT, Status TEXT, DisplayComicName TEXT)')
|
||||
c.execute('CREATE TABLE IF NOT EXISTS nzblog (IssueID TEXT, NZBName TEXT, SARC TEXT, PROVIDER TEXT, ID TEXT, AltNZBName TEXT)')
|
||||
c.execute('CREATE TABLE IF NOT EXISTS weekly (SHIPDATE TEXT, PUBLISHER TEXT, ISSUE TEXT, COMIC VARCHAR(150), EXTRA TEXT, STATUS TEXT, ComicID TEXT, IssueID TEXT, CV_Last_Update TEXT, DynamicName TEXT)')
|
||||
c.execute('CREATE TABLE IF NOT EXISTS weekly (SHIPDATE TEXT, PUBLISHER TEXT, ISSUE TEXT, COMIC VARCHAR(150), EXTRA TEXT, STATUS TEXT, ComicID TEXT, IssueID TEXT, CV_Last_Update TEXT, DynamicName TEXT, weeknumber TEXT, year TEXT)')
|
||||
# c.execute('CREATE TABLE IF NOT EXISTS sablog (nzo_id TEXT, ComicName TEXT, ComicYEAR TEXT, ComicIssue TEXT, name TEXT, nzo_complete TEXT)')
|
||||
c.execute('CREATE TABLE IF NOT EXISTS importresults (impID TEXT, ComicName TEXT, ComicYear TEXT, Status TEXT, ImportDate TEXT, ComicFilename TEXT, ComicLocation TEXT, WatchMatch TEXT, DisplayName TEXT, SRID TEXT, ComicID TEXT, IssueID TEXT, Volume TEXT, IssueNumber TEXT, DynamicName TEXT)')
|
||||
c.execute('CREATE TABLE IF NOT EXISTS readlist (IssueID TEXT, ComicName TEXT, Issue_Number TEXT, Status TEXT, DateAdded TEXT, Location TEXT, inCacheDir TEXT, SeriesYear TEXT, ComicID TEXT, StatusChange TEXT)')
|
||||
|
|
@ -1880,6 +1892,16 @@ def dbcheck():
|
|||
except sqlite3.OperationalError:
|
||||
c.execute('ALTER TABLE weekly ADD COLUMN CV_Last_Update TEXT')
|
||||
|
||||
try:
|
||||
c.execute('SELECT weeknumber from weekly')
|
||||
except sqlite3.OperationalError:
|
||||
c.execute('ALTER TABLE weekly ADD COLUMN weeknumber TEXT')
|
||||
|
||||
try:
|
||||
c.execute('SELECT year from weekly')
|
||||
except sqlite3.OperationalError:
|
||||
c.execute('ALTER TABLE weekly ADD COLUMN year TEXT')
|
||||
|
||||
## -- Nzblog Table --
|
||||
|
||||
try:
|
||||
|
|
|
|||
|
|
@ -78,9 +78,13 @@ def run(dirName, nzbName=None, issueid=None, comversion=None, manual=None, filen
|
|||
else:
|
||||
cbr2cbzoptions = ["-e"]
|
||||
|
||||
if comversion is None or comversion == '':
|
||||
comversion = '1'
|
||||
comversion = re.sub('[^0-9]', '', comversion).strip()
|
||||
if mylar.CMTAG_START_YEAR_AS_VOLUME:
|
||||
comversion = 'V' + str(comversion)
|
||||
else:
|
||||
if comversion is None or comversion == '':
|
||||
comversion = '1'
|
||||
comversion = re.sub('[^0-9]', '', comversion).strip()
|
||||
|
||||
cvers = 'volume=' + str(comversion)
|
||||
tagoptions = ["-s", "-m", cvers] #"--verbose"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue