mirror of https://github.com/evilhero/mylar
FIX: some fuzzy-year errors, IMP: added as folder/file naming option (#134), IMP: Lowercase entire filename option in Config (#134), FIX: Parse error on adding new series using Ultron-Checker (#151)
This commit is contained in:
evilhero
parent
4b6ca3cf2e
commit
3be8189b2a
|
|
@ -360,7 +360,7 @@
|
|||
<small>enter in the absolute path to the script</small>
|
||||
</div>
|
||||
<div class="row checkbox left clearfix">
|
||||
<input type="checkbox" name="enable_extra_scripts" value="1" ${config['enable_extra_scripts']} /><label>Use Extra Script AFTER Post-Processing</label>
|
||||
<input type="checkbox" name="enable_extra_scripts" value="1" ${config['enable_extra_scripts']} /><label>Use Extra Script AFTER Post-Processing</label>
|
||||
</div>
|
||||
<div class="row">
|
||||
<label>Extra Script Location</label>
|
||||
|
|
@ -393,6 +393,7 @@
|
|||
<input type="text" name="file_format" value="${config['file_format']}" size="43">
|
||||
<small>Use: $Series, $Year, $Issue<br />
|
||||
E.g.: $Series $Issue ($Year) = Animal Man 0 (2012) </small>
|
||||
|
||||
</fieldset>
|
||||
|
||||
<fieldset>
|
||||
|
|
@ -432,6 +433,10 @@
|
|||
</select>
|
||||
</div>
|
||||
|
||||
<div class="row checkboxclearfix">
|
||||
<input type="checkbox" name="lowercase_filenames" value="1" ${config['lowercase_filenames']} /><label>Lowercase the entire filename</label><br/>
|
||||
<small>(will work regardless if Rename Files is enabled)</small>
|
||||
</div>
|
||||
|
||||
</fieldset>
|
||||
|
||||
|
|
|
|||
|
|
@ -284,9 +284,14 @@ class PostProcessor(object):
|
|||
|
||||
#rename file and move to new path
|
||||
#nfilename = series + " " + issueno + " (" + seriesyear + ")"
|
||||
|
||||
file_values = {'$Series': series,
|
||||
'$Issue': prettycomiss,
|
||||
'$Year': issueyear
|
||||
'$Year': issueyear,
|
||||
'$series': series.lower(),
|
||||
'$Publisher': publisher,
|
||||
'$publisher': publisher.lower(),
|
||||
'$Volume': seriesyear
|
||||
}
|
||||
|
||||
for root, dirnames, filenames in os.walk(self.nzb_folder):
|
||||
|
|
@ -312,7 +317,10 @@ class PostProcessor(object):
|
|||
self._log("New Filename: " + nfilename, logger.DEBUG)
|
||||
|
||||
src = self.nzb_folder + "/" + ofilename
|
||||
dst = comlocation + "/" + nfilename + ext.lower()
|
||||
if mylar.LOWERCASE_FILENAMES:
|
||||
dst = (comlocation + "/" + nfilename + ext).lower()
|
||||
else:
|
||||
dst = comlocation + "/" + nfilename + ext.lower()
|
||||
self._log("Source:" + src, logger.DEBUG)
|
||||
self._log("Destination:" + dst, logger.DEBUG)
|
||||
os.rename(self.nzb_folder + "/" + ofilename, self.nzb_folder + "/" + nfilename + ext)
|
||||
|
|
|
|||
|
|
@ -104,6 +104,7 @@ REPLACE_SPACES = False
|
|||
REPLACE_CHAR = None
|
||||
ZERO_LEVEL = False
|
||||
ZERO_LEVEL_N = None
|
||||
LOWERCASE_FILENAME = False
|
||||
USE_MINSIZE = False
|
||||
MINSIZE = None
|
||||
USE_MAXSIZE = False
|
||||
|
|
@ -211,7 +212,7 @@ def initialize():
|
|||
NZBSU, NZBSU_APIKEY, DOGNZB, DOGNZB_APIKEY, NZBX,\
|
||||
NEWZNAB, NEWZNAB_HOST, NEWZNAB_APIKEY, NEWZNAB_ENABLED, EXTRA_NEWZNABS,\
|
||||
RAW, RAW_PROVIDER, RAW_USERNAME, RAW_PASSWORD, RAW_GROUPS, EXPERIMENTAL, \
|
||||
PREFERRED_QUALITY, MOVE_FILES, RENAME_FILES, USE_MINSIZE, MINSIZE, USE_MAXSIZE, MAXSIZE, CORRECT_METADATA, FOLDER_FORMAT, FILE_FORMAT, REPLACE_CHAR, REPLACE_SPACES, \
|
||||
PREFERRED_QUALITY, MOVE_FILES, RENAME_FILES, LOWERCASE_FILENAMES, USE_MINSIZE, MINSIZE, USE_MAXSIZE, MAXSIZE, CORRECT_METADATA, FOLDER_FORMAT, FILE_FORMAT, REPLACE_CHAR, REPLACE_SPACES, \
|
||||
COMIC_LOCATION, QUAL_ALTVERS, QUAL_SCANNER, QUAL_TYPE, QUAL_QUALITY, ENABLE_EXTRA_SCRIPTS, EXTRA_SCRIPTS, ENABLE_PRE_SCRIPTS, PRE_SCRIPTS
|
||||
|
||||
if __INITIALIZED__:
|
||||
|
|
@ -270,6 +271,7 @@ def initialize():
|
|||
REPLACE_CHAR = check_setting_str(CFG, 'General', 'replace_char', '')
|
||||
ZERO_LEVEL = bool(check_setting_int(CFG, 'General', 'zero_level', 0))
|
||||
ZERO_LEVEL_N = check_setting_str(CFG, 'General', 'zero_level_n', '')
|
||||
LOWERCASE_FILENAMES = bool(check_setting_int(CFG, 'General', 'lowercase_filenames', 0))
|
||||
USE_MINSIZE = bool(check_setting_int(CFG, 'General', 'use_minsize', 0))
|
||||
MINSIZE = check_setting_str(CFG, 'General', 'minsize', '')
|
||||
USE_MAXSIZE = bool(check_setting_int(CFG, 'General', 'use_maxsize', 0))
|
||||
|
|
@ -513,6 +515,7 @@ def config_write():
|
|||
new_config['General']['replace_char'] = REPLACE_CHAR
|
||||
new_config['General']['zero_level'] = int(ZERO_LEVEL)
|
||||
new_config['General']['zero_level_n'] = ZERO_LEVEL_N
|
||||
new_config['General']['lowercase_filenames'] = LOWERCASE_FILENAMES
|
||||
new_config['General']['use_minsize'] = int(USE_MINSIZE)
|
||||
new_config['General']['minsize'] = MINSIZE
|
||||
new_config['General']['use_maxsize'] = int(USE_MAXSIZE)
|
||||
|
|
|
|||
|
|
@ -133,8 +133,11 @@ def addComictoDB(comicid,mismatch=None,pullupd=None):
|
|||
#do work to generate folder path
|
||||
|
||||
values = {'$Series': series,
|
||||
'$Publisher': publisher,
|
||||
'$Year': year
|
||||
'$Publisher': publisher,
|
||||
'$Year': year,
|
||||
'$series': series.lower(),
|
||||
'$publisher': publisher.lower(),
|
||||
'$Volume': year
|
||||
}
|
||||
|
||||
#print mylar.FOLDER_FORMAT
|
||||
|
|
@ -469,10 +472,12 @@ def GCDimport(gcomicid, pullupd=None):
|
|||
year = ComicYear
|
||||
|
||||
#do work to generate folder path
|
||||
|
||||
values = {'$Series': series,
|
||||
'$Publisher': publisher,
|
||||
'$Year': year
|
||||
'$Publisher': publisher,
|
||||
'$Year': year,
|
||||
'$series': series.lower(),
|
||||
'$publisher': publisher.lower(),
|
||||
'$Volume': year
|
||||
}
|
||||
|
||||
if mylar.FOLDER_FORMAT == '':
|
||||
|
|
|
|||
|
|
@ -390,6 +390,7 @@ def NZB_SEARCH(ComicName, IssueNumber, ComicYear, SeriesYear, nzbprov, nzbpr, Is
|
|||
if cnt == 0:
|
||||
comic_andiss = m[cnt]
|
||||
logger.fdebug("Comic: " + str(comic_andiss))
|
||||
logger.fdebug("UseFuzzy is : " + str(UseFuzzy))
|
||||
if UseFuzzy == "0" or UseFuzzy == "2" or IssDateFix == "yes":
|
||||
|
||||
if m[cnt][:-2] == '19' or m[cnt][:-2] == '20':
|
||||
|
|
|
|||
|
|
@ -583,6 +583,7 @@ class WebInterface(object):
|
|||
"file_format" : mylar.FILE_FORMAT,
|
||||
"zero_level" : helpers.checked(mylar.ZERO_LEVEL),
|
||||
"zero_level_n" : mylar.ZERO_LEVEL_N,
|
||||
"lowercase_filenames" : mylar.LOWERCASE_FILENAMES,
|
||||
"enable_extra_scripts" : helpers.checked(mylar.ENABLE_EXTRA_SCRIPTS),
|
||||
"extra_scripts" : mylar.EXTRA_SCRIPTS,
|
||||
"branch" : version.MYLAR_VERSION,
|
||||
|
|
@ -676,7 +677,7 @@ class WebInterface(object):
|
|||
sab_host=None, sab_username=None, sab_apikey=None, sab_password=None, sab_category=None, sab_priority=None, log_dir=None, blackhole=0, blackhole_dir=None,
|
||||
usenet_retention=None, nzbsu=0, nzbsu_apikey=None, dognzb=0, dognzb_apikey=None, nzbx=0, newznab=0, newznab_host=None, newznab_apikey=None, newznab_enabled=0,
|
||||
raw=0, raw_provider=None, raw_username=None, raw_password=None, raw_groups=None, experimental=0,
|
||||
preferred_quality=0, move_files=0, rename_files=0, folder_format=None, file_format=None, enable_extra_scripts=0, extra_scripts=None, enable_pre_scripts=0, pre_scripts=None,
|
||||
preferred_quality=0, move_files=0, rename_files=0, lowercase_filenames=0, folder_format=None, file_format=None, enable_extra_scripts=0, extra_scripts=None, enable_pre_scripts=0, pre_scripts=None,
|
||||
destination_dir=None, replace_spaces=0, replace_char=None, use_minsize=0, minsize=None, use_maxsize=0, maxsize=None, autowant_all=0, autowant_upcoming=0, comic_cover_local=0, zero_level=0, zero_level_n=None, interface=None, **kwargs):
|
||||
mylar.HTTP_HOST = http_host
|
||||
mylar.HTTP_PORT = http_port
|
||||
|
|
@ -718,6 +719,7 @@ class WebInterface(object):
|
|||
mylar.REPLACE_CHAR = replace_char
|
||||
mylar.ZERO_LEVEL = zero_level
|
||||
mylar.ZERO_LEVEL_N = zero_level_n
|
||||
mylar.LOWERCASE_FILENAMES = lowercase_filenames
|
||||
mylar.USE_MINSIZE = use_minsize
|
||||
mylar.MINSIZE = minsize
|
||||
mylar.USE_MAXSIZE = use_maxsize
|
||||
|
|
|
|||
Loading…
Reference in New Issue