2012-09-13 15:27:34 +00:00
|
|
|
# This file is part of Mylar.
|
|
|
|
#
|
|
|
|
# Mylar is free software: you can redistribute it and/or modify
|
|
|
|
# it under the terms of the GNU General Public License as published by
|
|
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
|
|
# (at your option) any later version.
|
|
|
|
#
|
|
|
|
# Mylar is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
# GNU General Public License for more details.
|
|
|
|
#
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
|
|
# along with Mylar. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
import time
|
|
|
|
from operator import itemgetter
|
|
|
|
import datetime
|
|
|
|
import re
|
2013-01-13 18:08:21 +00:00
|
|
|
import itertools
|
2013-02-13 01:27:24 +00:00
|
|
|
import os
|
2012-09-13 15:27:34 +00:00
|
|
|
import mylar
|
|
|
|
|
|
|
|
def multikeysort(items, columns):
|
|
|
|
|
|
|
|
comparers = [ ((itemgetter(col[1:].strip()), -1) if col.startswith('-') else (itemgetter(col.strip()), 1)) for col in columns]
|
|
|
|
|
|
|
|
def comparer(left, right):
|
|
|
|
for fn, mult in comparers:
|
|
|
|
result = cmp(fn(left), fn(right))
|
|
|
|
if result:
|
|
|
|
return mult * result
|
|
|
|
else:
|
|
|
|
return 0
|
|
|
|
|
|
|
|
return sorted(items, cmp=comparer)
|
|
|
|
|
|
|
|
def checked(variable):
|
|
|
|
if variable:
|
|
|
|
return 'Checked'
|
|
|
|
else:
|
|
|
|
return ''
|
|
|
|
|
|
|
|
def radio(variable, pos):
|
|
|
|
|
|
|
|
if variable == pos:
|
|
|
|
return 'Checked'
|
|
|
|
else:
|
|
|
|
return ''
|
|
|
|
|
|
|
|
def latinToAscii(unicrap):
|
|
|
|
"""
|
|
|
|
From couch potato
|
|
|
|
"""
|
|
|
|
xlate = {0xc0:'A', 0xc1:'A', 0xc2:'A', 0xc3:'A', 0xc4:'A', 0xc5:'A',
|
|
|
|
0xc6:'Ae', 0xc7:'C',
|
|
|
|
0xc8:'E', 0xc9:'E', 0xca:'E', 0xcb:'E', 0x86:'e',
|
|
|
|
0xcc:'I', 0xcd:'I', 0xce:'I', 0xcf:'I',
|
|
|
|
0xd0:'Th', 0xd1:'N',
|
|
|
|
0xd2:'O', 0xd3:'O', 0xd4:'O', 0xd5:'O', 0xd6:'O', 0xd8:'O',
|
|
|
|
0xd9:'U', 0xda:'U', 0xdb:'U', 0xdc:'U',
|
|
|
|
0xdd:'Y', 0xde:'th', 0xdf:'ss',
|
|
|
|
0xe0:'a', 0xe1:'a', 0xe2:'a', 0xe3:'a', 0xe4:'a', 0xe5:'a',
|
|
|
|
0xe6:'ae', 0xe7:'c',
|
|
|
|
0xe8:'e', 0xe9:'e', 0xea:'e', 0xeb:'e', 0x0259:'e',
|
|
|
|
0xec:'i', 0xed:'i', 0xee:'i', 0xef:'i',
|
|
|
|
0xf0:'th', 0xf1:'n',
|
|
|
|
0xf2:'o', 0xf3:'o', 0xf4:'o', 0xf5:'o', 0xf6:'o', 0xf8:'o',
|
|
|
|
0xf9:'u', 0xfa:'u', 0xfb:'u', 0xfc:'u',
|
|
|
|
0xfd:'y', 0xfe:'th', 0xff:'y',
|
|
|
|
0xa1:'!', 0xa2:'{cent}', 0xa3:'{pound}', 0xa4:'{currency}',
|
|
|
|
0xa5:'{yen}', 0xa6:'|', 0xa7:'{section}', 0xa8:'{umlaut}',
|
|
|
|
0xa9:'{C}', 0xaa:'{^a}', 0xab:'<<', 0xac:'{not}',
|
|
|
|
0xad:'-', 0xae:'{R}', 0xaf:'_', 0xb0:'{degrees}',
|
|
|
|
0xb1:'{+/-}', 0xb2:'{^2}', 0xb3:'{^3}', 0xb4:"'",
|
|
|
|
0xb5:'{micro}', 0xb6:'{paragraph}', 0xb7:'*', 0xb8:'{cedilla}',
|
|
|
|
0xb9:'{^1}', 0xba:'{^o}', 0xbb:'>>',
|
|
|
|
0xbc:'{1/4}', 0xbd:'{1/2}', 0xbe:'{3/4}', 0xbf:'?',
|
|
|
|
0xd7:'*', 0xf7:'/'
|
|
|
|
}
|
|
|
|
|
|
|
|
r = ''
|
|
|
|
for i in unicrap:
|
|
|
|
if xlate.has_key(ord(i)):
|
|
|
|
r += xlate[ord(i)]
|
|
|
|
elif ord(i) >= 0x80:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
r += str(i)
|
|
|
|
return r
|
|
|
|
|
|
|
|
def convert_milliseconds(ms):
|
|
|
|
|
|
|
|
seconds = ms/1000
|
|
|
|
gmtime = time.gmtime(seconds)
|
|
|
|
if seconds > 3600:
|
|
|
|
minutes = time.strftime("%H:%M:%S", gmtime)
|
|
|
|
else:
|
|
|
|
minutes = time.strftime("%M:%S", gmtime)
|
|
|
|
|
|
|
|
return minutes
|
|
|
|
|
|
|
|
def convert_seconds(s):
|
|
|
|
|
|
|
|
gmtime = time.gmtime(s)
|
|
|
|
if s > 3600:
|
|
|
|
minutes = time.strftime("%H:%M:%S", gmtime)
|
|
|
|
else:
|
|
|
|
minutes = time.strftime("%M:%S", gmtime)
|
|
|
|
|
|
|
|
return minutes
|
|
|
|
|
|
|
|
def today():
|
|
|
|
today = datetime.date.today()
|
|
|
|
yyyymmdd = datetime.date.isoformat(today)
|
|
|
|
return yyyymmdd
|
|
|
|
|
|
|
|
def now():
|
|
|
|
now = datetime.datetime.now()
|
|
|
|
return now.strftime("%Y-%m-%d %H:%M:%S")
|
|
|
|
|
|
|
|
def bytes_to_mb(bytes):
|
|
|
|
|
|
|
|
mb = int(bytes)/1048576
|
|
|
|
size = '%.1f MB' % mb
|
|
|
|
return size
|
2013-02-25 15:36:43 +00:00
|
|
|
|
|
|
|
def human_size(size_bytes):
|
|
|
|
"""
|
|
|
|
format a size in bytes into a 'human' file size, e.g. bytes, KB, MB, GB, TB, PB
|
|
|
|
Note that bytes/KB will be reported in whole numbers but MB and above will have greater precision
|
|
|
|
e.g. 1 byte, 43 bytes, 443 KB, 4.3 MB, 4.43 GB, etc
|
|
|
|
"""
|
|
|
|
if size_bytes == 1:
|
|
|
|
# because I really hate unnecessary plurals
|
|
|
|
return "1 byte"
|
|
|
|
|
|
|
|
suffixes_table = [('bytes',0),('KB',0),('MB',1),('GB',2),('TB',2), ('PB',2)]
|
|
|
|
|
2013-02-27 16:12:33 +00:00
|
|
|
num = float(0 if size_bytes is None else size_bytes)
|
2013-02-25 15:36:43 +00:00
|
|
|
for suffix, precision in suffixes_table:
|
|
|
|
if num < 1024.0:
|
|
|
|
break
|
|
|
|
num /= 1024.0
|
|
|
|
|
|
|
|
if precision == 0:
|
|
|
|
formatted_size = "%d" % num
|
|
|
|
else:
|
|
|
|
formatted_size = str(round(num, ndigits=precision))
|
|
|
|
|
|
|
|
return "%s %s" % (formatted_size, suffix)
|
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
def replace_all(text, dic):
|
|
|
|
for i, j in dic.iteritems():
|
|
|
|
text = text.replace(i, j)
|
|
|
|
return text
|
|
|
|
|
|
|
|
def cleanName(string):
|
|
|
|
|
|
|
|
pass1 = latinToAscii(string).lower()
|
|
|
|
out_string = re.sub('[\/\@\#\$\%\^\*\+\"\[\]\{\}\<\>\=\_]', '', pass1).encode('utf-8')
|
|
|
|
|
|
|
|
return out_string
|
|
|
|
|
|
|
|
def cleanTitle(title):
|
|
|
|
|
|
|
|
title = re.sub('[\.\-\/\_]', ' ', title).lower()
|
|
|
|
|
|
|
|
# Strip out extra whitespace
|
|
|
|
title = ' '.join(title.split())
|
|
|
|
|
|
|
|
title = title.title()
|
|
|
|
|
|
|
|
return title
|
|
|
|
|
|
|
|
def extract_logline(s):
|
|
|
|
# Default log format
|
|
|
|
pattern = re.compile(r'(?P<timestamp>.*?)\s\-\s(?P<level>.*?)\s*\:\:\s(?P<thread>.*?)\s\:\s(?P<message>.*)', re.VERBOSE)
|
|
|
|
match = pattern.match(s)
|
|
|
|
if match:
|
|
|
|
timestamp = match.group("timestamp")
|
|
|
|
level = match.group("level")
|
|
|
|
thread = match.group("thread")
|
|
|
|
message = match.group("message")
|
|
|
|
return (timestamp, level, thread, message)
|
|
|
|
else:
|
|
|
|
return None
|
|
|
|
|
|
|
|
def is_number(s):
|
|
|
|
try:
|
|
|
|
float(s)
|
|
|
|
return True
|
|
|
|
except ValueError:
|
|
|
|
return False
|
2012-12-31 16:52:16 +00:00
|
|
|
|
|
|
|
def decimal_issue(iss):
|
|
|
|
iss_find = iss.find('.')
|
2013-04-02 08:56:24 +00:00
|
|
|
dec_except = None
|
2013-03-11 17:25:45 +00:00
|
|
|
if iss_find == -1:
|
|
|
|
#no matches for a decimal, assume we're converting from decimal to int.
|
2013-04-02 08:56:24 +00:00
|
|
|
#match for special issues with alphanumeric numbering...
|
|
|
|
if 'au' in iss.lower():
|
|
|
|
dec_except = 'AU'
|
|
|
|
decex = iss.lower().find('au')
|
|
|
|
deciss = int(iss[:decex]) * 1000
|
|
|
|
else:
|
|
|
|
deciss = int(iss) * 1000
|
2012-12-31 16:52:16 +00:00
|
|
|
else:
|
2013-03-11 17:25:45 +00:00
|
|
|
iss_b4dec = iss[:iss_find]
|
|
|
|
iss_decval = iss[iss_find+1:]
|
|
|
|
if int(iss_decval) == 0:
|
|
|
|
iss = iss_b4dec
|
|
|
|
issdec = int(iss_decval)
|
2012-12-31 16:52:16 +00:00
|
|
|
else:
|
2013-03-11 17:25:45 +00:00
|
|
|
if len(iss_decval) == 1:
|
|
|
|
iss = iss_b4dec + "." + iss_decval
|
|
|
|
issdec = int(iss_decval) * 10
|
|
|
|
else:
|
|
|
|
iss = iss_b4dec + "." + iss_decval.rstrip('0')
|
|
|
|
issdec = int(iss_decval.rstrip('0')) * 10
|
|
|
|
deciss = (int(iss_b4dec) * 1000) + issdec
|
2013-04-02 08:56:24 +00:00
|
|
|
return deciss, dec_except
|
2013-01-28 20:31:43 +00:00
|
|
|
|
2013-02-13 01:27:24 +00:00
|
|
|
def rename_param(comicid, comicname, issue, ofilename, comicyear=None, issueid=None):
|
|
|
|
from mylar import db, logger
|
2013-01-28 20:31:43 +00:00
|
|
|
myDB = db.DBConnection()
|
2013-04-26 03:45:02 +00:00
|
|
|
print ("comicid: " + str(comicid))
|
|
|
|
print ("issue#: " + str(issue))
|
2013-02-13 01:27:24 +00:00
|
|
|
# the issue here is a non-decimalized version, we need to see if it's got a decimal and if not, add '.00'
|
FIX:(#304) Index out of range on recheck, FIX:(#303) Comicvine link updated on details page, FIX:(#302) Query rate (Search Delay) Added as a configuration option, FIX:(#300) Version number error on searching when no version number, FIX:(#297) Manual Rename of Files working, FIX:(#294) 'AU' issue problems should be resolved now, FIX:(#290) V#(year) and Vol#(year) added to filechecking, IMP: ComicVine data use only now as a hidden option (cv_only = 1 in config.ini), IMP: added as options for file naming, IMP: Rough drafting of Annuals (annuals_on = 1 in config.ini), Other fixes..
2013-04-06 09:43:18 +00:00
|
|
|
# iss_find = issue.find('.')
|
|
|
|
# if iss_find < 0:
|
|
|
|
# # no decimal in issue number
|
|
|
|
# iss = str(int(issue)) + ".00"
|
|
|
|
# else:
|
|
|
|
# iss_b4dec = issue[:iss_find]
|
|
|
|
# iss_decval = issue[iss_find+1:]
|
|
|
|
# if len(str(int(iss_decval))) == 1:
|
|
|
|
# iss = str(int(iss_b4dec)) + "." + str(int(iss_decval)*10)
|
|
|
|
# else:
|
|
|
|
# if issue.endswith(".00"):
|
|
|
|
# iss = issue
|
|
|
|
# else:
|
|
|
|
# iss = str(int(iss_b4dec)) + "." + iss_decval
|
|
|
|
# issue = iss
|
|
|
|
|
|
|
|
# print ("converted issue#: " + str(issue))
|
2013-01-28 20:31:43 +00:00
|
|
|
if issueid is None:
|
|
|
|
chkissue = myDB.action("SELECT * from issues WHERE ComicID=? AND Issue_Number=?", [comicid, issue]).fetchone()
|
|
|
|
if chkissue is None:
|
2013-04-26 03:45:02 +00:00
|
|
|
#rechk chkissue against int value of issue #
|
|
|
|
chkissue = myDB.action("SELECT * from issues WHERE ComicID=? AND Issue_Number=?", [comicid, int(issue)]).fetchone()
|
|
|
|
if chkissue is None:
|
|
|
|
logger.error("Invalid Issue_Number - please validate.")
|
|
|
|
return
|
|
|
|
else:
|
|
|
|
logger.info("Int Issue_number compare found. continuing...")
|
|
|
|
issueid = chkissue['IssueID']
|
2013-01-28 20:31:43 +00:00
|
|
|
else:
|
|
|
|
issueid = chkissue['IssueID']
|
|
|
|
|
|
|
|
#use issueid to get publisher, series, year, issue number
|
|
|
|
issuenzb = myDB.action("SELECT * from issues WHERE issueid=?", [issueid]).fetchone()
|
|
|
|
#comicid = issuenzb['ComicID']
|
|
|
|
issuenum = issuenzb['Issue_Number']
|
|
|
|
#issueno = str(issuenum).split('.')[0]
|
FIX:(#304) Index out of range on recheck, FIX:(#303) Comicvine link updated on details page, FIX:(#302) Query rate (Search Delay) Added as a configuration option, FIX:(#300) Version number error on searching when no version number, FIX:(#297) Manual Rename of Files working, FIX:(#294) 'AU' issue problems should be resolved now, FIX:(#290) V#(year) and Vol#(year) added to filechecking, IMP: ComicVine data use only now as a hidden option (cv_only = 1 in config.ini), IMP: added as options for file naming, IMP: Rough drafting of Annuals (annuals_on = 1 in config.ini), Other fixes..
2013-04-06 09:43:18 +00:00
|
|
|
issue_except = 'None'
|
|
|
|
if 'au' in issuenum.lower():
|
|
|
|
issuenum = re.sub("[^0-9]", "", issuenum)
|
|
|
|
issue_except = ' AU'
|
|
|
|
if '.' in issuenum:
|
|
|
|
iss_find = issuenum.find('.')
|
|
|
|
iss_b4dec = issuenum[:iss_find]
|
|
|
|
iss_decval = issuenum[iss_find+1:]
|
|
|
|
if int(iss_decval) == 0:
|
|
|
|
iss = iss_b4dec
|
|
|
|
issdec = int(iss_decval)
|
|
|
|
issueno = str(iss)
|
|
|
|
logger.fdebug("Issue Number: " + str(issueno))
|
2013-01-28 20:31:43 +00:00
|
|
|
else:
|
FIX:(#304) Index out of range on recheck, FIX:(#303) Comicvine link updated on details page, FIX:(#302) Query rate (Search Delay) Added as a configuration option, FIX:(#300) Version number error on searching when no version number, FIX:(#297) Manual Rename of Files working, FIX:(#294) 'AU' issue problems should be resolved now, FIX:(#290) V#(year) and Vol#(year) added to filechecking, IMP: ComicVine data use only now as a hidden option (cv_only = 1 in config.ini), IMP: added as options for file naming, IMP: Rough drafting of Annuals (annuals_on = 1 in config.ini), Other fixes..
2013-04-06 09:43:18 +00:00
|
|
|
if len(iss_decval) == 1:
|
|
|
|
iss = iss_b4dec + "." + iss_decval
|
|
|
|
issdec = int(iss_decval) * 10
|
|
|
|
else:
|
|
|
|
iss = iss_b4dec + "." + iss_decval.rstrip('0')
|
|
|
|
issdec = int(iss_decval.rstrip('0')) * 10
|
|
|
|
issueno = iss_b4dec
|
|
|
|
logger.fdebug("Issue Number: " + str(iss))
|
|
|
|
else:
|
|
|
|
iss = issuenum
|
|
|
|
issueno = str(iss)
|
2013-01-28 20:31:43 +00:00
|
|
|
# issue zero-suppression here
|
|
|
|
if mylar.ZERO_LEVEL == "0":
|
|
|
|
zeroadd = ""
|
|
|
|
else:
|
|
|
|
if mylar.ZERO_LEVEL_N == "none": zeroadd = ""
|
|
|
|
elif mylar.ZERO_LEVEL_N == "0x": zeroadd = "0"
|
|
|
|
elif mylar.ZERO_LEVEL_N == "00x": zeroadd = "00"
|
|
|
|
|
|
|
|
logger.fdebug("Zero Suppression set to : " + str(mylar.ZERO_LEVEL_N))
|
|
|
|
|
|
|
|
if str(len(issueno)) > 1:
|
|
|
|
if int(issueno) < 10:
|
|
|
|
logger.fdebug("issue detected less than 10")
|
FIX:(#304) Index out of range on recheck, FIX:(#303) Comicvine link updated on details page, FIX:(#302) Query rate (Search Delay) Added as a configuration option, FIX:(#300) Version number error on searching when no version number, FIX:(#297) Manual Rename of Files working, FIX:(#294) 'AU' issue problems should be resolved now, FIX:(#290) V#(year) and Vol#(year) added to filechecking, IMP: ComicVine data use only now as a hidden option (cv_only = 1 in config.ini), IMP: added as options for file naming, IMP: Rough drafting of Annuals (annuals_on = 1 in config.ini), Other fixes..
2013-04-06 09:43:18 +00:00
|
|
|
if '.' in iss:
|
|
|
|
if int(iss_decval) > 0:
|
|
|
|
issueno = str(iss)
|
|
|
|
prettycomiss = str(zeroadd) + str(iss)
|
|
|
|
else:
|
|
|
|
prettycomiss = str(zeroadd) + str(int(issueno))
|
2013-01-28 20:31:43 +00:00
|
|
|
else:
|
FIX:(#304) Index out of range on recheck, FIX:(#303) Comicvine link updated on details page, FIX:(#302) Query rate (Search Delay) Added as a configuration option, FIX:(#300) Version number error on searching when no version number, FIX:(#297) Manual Rename of Files working, FIX:(#294) 'AU' issue problems should be resolved now, FIX:(#290) V#(year) and Vol#(year) added to filechecking, IMP: ComicVine data use only now as a hidden option (cv_only = 1 in config.ini), IMP: added as options for file naming, IMP: Rough drafting of Annuals (annuals_on = 1 in config.ini), Other fixes..
2013-04-06 09:43:18 +00:00
|
|
|
prettycomiss = str(zeroadd) + str(iss)
|
|
|
|
if issue_except != 'None':
|
|
|
|
prettycomiss = str(prettycomiss) + issue_except
|
2013-01-28 20:31:43 +00:00
|
|
|
logger.fdebug("Zero level supplement set to " + str(mylar.ZERO_LEVEL_N) + ". Issue will be set as : " + str(prettycomiss))
|
|
|
|
elif int(issueno) >= 10 and int(issueno) < 100:
|
|
|
|
logger.fdebug("issue detected greater than 10, but less than 100")
|
|
|
|
if mylar.ZERO_LEVEL_N == "none":
|
|
|
|
zeroadd = ""
|
|
|
|
else:
|
|
|
|
zeroadd = "0"
|
FIX:(#304) Index out of range on recheck, FIX:(#303) Comicvine link updated on details page, FIX:(#302) Query rate (Search Delay) Added as a configuration option, FIX:(#300) Version number error on searching when no version number, FIX:(#297) Manual Rename of Files working, FIX:(#294) 'AU' issue problems should be resolved now, FIX:(#290) V#(year) and Vol#(year) added to filechecking, IMP: ComicVine data use only now as a hidden option (cv_only = 1 in config.ini), IMP: added as options for file naming, IMP: Rough drafting of Annuals (annuals_on = 1 in config.ini), Other fixes..
2013-04-06 09:43:18 +00:00
|
|
|
if '.' in iss:
|
|
|
|
if int(iss_decval) > 0:
|
|
|
|
issueno = str(iss)
|
|
|
|
prettycomiss = str(zeroadd) + str(iss)
|
|
|
|
else:
|
|
|
|
prettycomiss = str(zeroadd) + str(int(issueno))
|
2013-01-28 20:31:43 +00:00
|
|
|
else:
|
FIX:(#304) Index out of range on recheck, FIX:(#303) Comicvine link updated on details page, FIX:(#302) Query rate (Search Delay) Added as a configuration option, FIX:(#300) Version number error on searching when no version number, FIX:(#297) Manual Rename of Files working, FIX:(#294) 'AU' issue problems should be resolved now, FIX:(#290) V#(year) and Vol#(year) added to filechecking, IMP: ComicVine data use only now as a hidden option (cv_only = 1 in config.ini), IMP: added as options for file naming, IMP: Rough drafting of Annuals (annuals_on = 1 in config.ini), Other fixes..
2013-04-06 09:43:18 +00:00
|
|
|
prettycomiss = str(zeroadd) + str(iss)
|
|
|
|
if issue_except != 'None':
|
|
|
|
prettycomiss = str(prettycomiss) + issue_except
|
2013-01-28 20:31:43 +00:00
|
|
|
logger.fdebug("Zero level supplement set to " + str(mylar.ZERO_LEVEL_N) + ".Issue will be set as : " + str(prettycomiss))
|
|
|
|
else:
|
|
|
|
logger.fdebug("issue detected greater than 100")
|
FIX:(#304) Index out of range on recheck, FIX:(#303) Comicvine link updated on details page, FIX:(#302) Query rate (Search Delay) Added as a configuration option, FIX:(#300) Version number error on searching when no version number, FIX:(#297) Manual Rename of Files working, FIX:(#294) 'AU' issue problems should be resolved now, FIX:(#290) V#(year) and Vol#(year) added to filechecking, IMP: ComicVine data use only now as a hidden option (cv_only = 1 in config.ini), IMP: added as options for file naming, IMP: Rough drafting of Annuals (annuals_on = 1 in config.ini), Other fixes..
2013-04-06 09:43:18 +00:00
|
|
|
if '.' in iss:
|
|
|
|
if int(iss_decval) > 0:
|
|
|
|
issueno = str(iss)
|
2013-01-28 20:31:43 +00:00
|
|
|
prettycomiss = str(issueno)
|
FIX:(#304) Index out of range on recheck, FIX:(#303) Comicvine link updated on details page, FIX:(#302) Query rate (Search Delay) Added as a configuration option, FIX:(#300) Version number error on searching when no version number, FIX:(#297) Manual Rename of Files working, FIX:(#294) 'AU' issue problems should be resolved now, FIX:(#290) V#(year) and Vol#(year) added to filechecking, IMP: ComicVine data use only now as a hidden option (cv_only = 1 in config.ini), IMP: added as options for file naming, IMP: Rough drafting of Annuals (annuals_on = 1 in config.ini), Other fixes..
2013-04-06 09:43:18 +00:00
|
|
|
if issue_except != 'None':
|
|
|
|
prettycomiss = str(prettycomiss) + issue_except
|
2013-01-28 20:31:43 +00:00
|
|
|
logger.fdebug("Zero level supplement set to " + str(mylar.ZERO_LEVEL_N) + ". Issue will be set as : " + str(prettycomiss))
|
|
|
|
else:
|
|
|
|
prettycomiss = str(issueno)
|
|
|
|
logger.fdebug("issue length error - cannot determine length. Defaulting to None: " + str(prettycomiss))
|
|
|
|
|
|
|
|
logger.fdebug("Pretty Comic Issue is : " + str(prettycomiss))
|
|
|
|
issueyear = issuenzb['IssueDate'][:4]
|
|
|
|
logger.fdebug("Issue Year : " + str(issueyear))
|
|
|
|
comicnzb= myDB.action("SELECT * from comics WHERE comicid=?", [comicid]).fetchone()
|
|
|
|
publisher = comicnzb['ComicPublisher']
|
|
|
|
logger.fdebug("Publisher: " + str(publisher))
|
|
|
|
series = comicnzb['ComicName']
|
|
|
|
logger.fdebug("Series: " + str(series))
|
|
|
|
seriesyear = comicnzb['ComicYear']
|
|
|
|
logger.fdebug("Year: " + str(seriesyear))
|
|
|
|
comlocation = comicnzb['ComicLocation']
|
|
|
|
logger.fdebug("Comic Location: " + str(comlocation))
|
FIX:(#304) Index out of range on recheck, FIX:(#303) Comicvine link updated on details page, FIX:(#302) Query rate (Search Delay) Added as a configuration option, FIX:(#300) Version number error on searching when no version number, FIX:(#297) Manual Rename of Files working, FIX:(#294) 'AU' issue problems should be resolved now, FIX:(#290) V#(year) and Vol#(year) added to filechecking, IMP: ComicVine data use only now as a hidden option (cv_only = 1 in config.ini), IMP: added as options for file naming, IMP: Rough drafting of Annuals (annuals_on = 1 in config.ini), Other fixes..
2013-04-06 09:43:18 +00:00
|
|
|
comversion = comicnzb['ComicVersion']
|
|
|
|
if comversion is None:
|
|
|
|
comversion = 'None'
|
|
|
|
#if comversion is None, remove it so it doesn't populate with 'None'
|
|
|
|
if comversion == 'None':
|
|
|
|
chunk_f_f = re.sub('\$VolumeN','',mylar.FILE_FORMAT)
|
|
|
|
chunk_f = re.compile(r'\s+')
|
|
|
|
chunk_file_format = chunk_f.sub(' ', chunk_f_f)
|
|
|
|
logger.fdebug("No version # found for series, removing from filename")
|
|
|
|
print ("new format: " + str(chunk_file_format))
|
|
|
|
else:
|
|
|
|
chunk_file_format = mylar.FILE_FORMAT
|
2013-01-28 20:31:43 +00:00
|
|
|
|
|
|
|
file_values = {'$Series': series,
|
|
|
|
'$Issue': prettycomiss,
|
|
|
|
'$Year': issueyear,
|
|
|
|
'$series': series.lower(),
|
|
|
|
'$Publisher': publisher,
|
|
|
|
'$publisher': publisher.lower(),
|
FIX:(#304) Index out of range on recheck, FIX:(#303) Comicvine link updated on details page, FIX:(#302) Query rate (Search Delay) Added as a configuration option, FIX:(#300) Version number error on searching when no version number, FIX:(#297) Manual Rename of Files working, FIX:(#294) 'AU' issue problems should be resolved now, FIX:(#290) V#(year) and Vol#(year) added to filechecking, IMP: ComicVine data use only now as a hidden option (cv_only = 1 in config.ini), IMP: added as options for file naming, IMP: Rough drafting of Annuals (annuals_on = 1 in config.ini), Other fixes..
2013-04-06 09:43:18 +00:00
|
|
|
'$VolumeY': 'V' + str(seriesyear),
|
|
|
|
'$VolumeN': comversion
|
2013-01-28 20:31:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
extensions = ('.cbr', '.cbz')
|
|
|
|
|
2013-02-13 01:27:24 +00:00
|
|
|
if ofilename.lower().endswith(extensions):
|
|
|
|
path, ext = os.path.splitext(ofilename)
|
|
|
|
|
2013-01-28 20:31:43 +00:00
|
|
|
if mylar.FILE_FORMAT == '':
|
|
|
|
logger.fdebug("Rename Files isn't enabled - keeping original filename.")
|
|
|
|
#check if extension is in nzb_name - will screw up otherwise
|
|
|
|
if ofilename.lower().endswith(extensions):
|
|
|
|
nfilename = ofilename[:-4]
|
|
|
|
else:
|
|
|
|
nfilename = ofilename
|
|
|
|
else:
|
FIX:(#304) Index out of range on recheck, FIX:(#303) Comicvine link updated on details page, FIX:(#302) Query rate (Search Delay) Added as a configuration option, FIX:(#300) Version number error on searching when no version number, FIX:(#297) Manual Rename of Files working, FIX:(#294) 'AU' issue problems should be resolved now, FIX:(#290) V#(year) and Vol#(year) added to filechecking, IMP: ComicVine data use only now as a hidden option (cv_only = 1 in config.ini), IMP: added as options for file naming, IMP: Rough drafting of Annuals (annuals_on = 1 in config.ini), Other fixes..
2013-04-06 09:43:18 +00:00
|
|
|
nfilename = replace_all(chunk_file_format, file_values)
|
2013-01-28 20:31:43 +00:00
|
|
|
if mylar.REPLACE_SPACES:
|
|
|
|
#mylar.REPLACE_CHAR ...determines what to replace spaces with underscore or dot
|
|
|
|
nfilename = nfilename.replace(' ', mylar.REPLACE_CHAR)
|
2013-02-13 01:27:24 +00:00
|
|
|
nfilename = re.sub('[\,\:]', '', nfilename) + ext.lower()
|
2013-01-28 20:31:43 +00:00
|
|
|
logger.fdebug("New Filename: " + str(nfilename))
|
|
|
|
|
|
|
|
if mylar.LOWERCASE_FILENAMES:
|
2013-02-13 01:27:24 +00:00
|
|
|
dst = (comlocation + "/" + nfilename).lower()
|
2013-01-28 20:31:43 +00:00
|
|
|
else:
|
2013-02-13 01:27:24 +00:00
|
|
|
dst = comlocation + "/" + nfilename
|
|
|
|
logger.fdebug("Source: " + str(ofilename))
|
2013-01-28 20:31:43 +00:00
|
|
|
logger.fdebug("Destination: " + str(dst))
|
|
|
|
|
|
|
|
rename_this = { "destination_dir" : dst,
|
|
|
|
"nfilename" : nfilename,
|
|
|
|
"issueid" : issueid,
|
|
|
|
"comicid" : comicid }
|
|
|
|
|
|
|
|
return rename_this
|
2013-03-07 19:33:16 +00:00
|
|
|
|
|
|
|
|
|
|
|
def apiremove(apistring, type):
|
|
|
|
if type == 'nzb':
|
|
|
|
value_regex = re.compile("(?<=apikey=)(?P<value>.*?)(?=$)")
|
|
|
|
#match = value_regex.search(apistring)
|
|
|
|
apiremoved = value_regex.sub("xUDONTNEEDTOKNOWTHISx", apistring)
|
|
|
|
else:
|
|
|
|
#type = $ to denote end of string
|
|
|
|
#type = & to denote up until next api variable
|
|
|
|
value_regex = re.compile("(?<=%26i=1%26r=)(?P<value>.*?)(?=" + str(type) +")")
|
|
|
|
#match = value_regex.search(apistring)
|
|
|
|
apiremoved = value_regex.sub("xUDONTNEEDTOKNOWTHISx", apistring)
|
|
|
|
|
|
|
|
return apiremoved
|
2013-03-14 08:33:16 +00:00
|
|
|
|
2013-03-21 17:09:10 +00:00
|
|
|
def ComicSort(comicorder=None,sequence=None,imported=None):
|
|
|
|
if sequence:
|
|
|
|
# if it's on startup, load the sql into a tuple for use to avoid record-locking
|
|
|
|
i = 0
|
|
|
|
import db, logger
|
|
|
|
myDB = db.DBConnection()
|
2013-03-16 17:16:42 +00:00
|
|
|
comicsort = myDB.action("SELECT * FROM comics ORDER BY ComicSortName COLLATE NOCASE")
|
2013-03-21 17:09:10 +00:00
|
|
|
comicorderlist = []
|
|
|
|
comicorder = {}
|
2013-03-16 17:16:42 +00:00
|
|
|
comicidlist = []
|
2013-03-21 17:09:10 +00:00
|
|
|
if sequence == 'update':
|
2013-03-30 16:53:07 +00:00
|
|
|
mylar.COMICSORT['SortOrder'] = None
|
2013-03-21 17:09:10 +00:00
|
|
|
mylar.COMICSORT['LastOrderNo'] = None
|
|
|
|
mylar.COMICSORT['LastOrderID'] = None
|
2013-03-14 08:33:16 +00:00
|
|
|
for csort in comicsort:
|
2013-03-16 17:16:42 +00:00
|
|
|
if csort['ComicID'] is None: pass
|
|
|
|
if not csort['ComicID'] in comicidlist:
|
2013-03-21 17:09:10 +00:00
|
|
|
if sequence == 'startup':
|
|
|
|
comicorderlist.append({
|
|
|
|
'ComicID': csort['ComicID'],
|
|
|
|
'ComicOrder': i
|
|
|
|
})
|
|
|
|
elif sequence == 'update':
|
2013-03-30 16:53:07 +00:00
|
|
|
comicorderlist.append({
|
|
|
|
# mylar.COMICSORT['SortOrder'].append({
|
2013-03-21 17:09:10 +00:00
|
|
|
'ComicID': csort['ComicID'],
|
|
|
|
'ComicOrder': i
|
|
|
|
})
|
|
|
|
|
2013-03-16 17:16:42 +00:00
|
|
|
comicidlist.append(csort['ComicID'])
|
|
|
|
i+=1
|
2013-03-21 17:09:10 +00:00
|
|
|
if sequence == 'startup':
|
2013-03-30 16:53:07 +00:00
|
|
|
if i == 0:
|
|
|
|
comicorder['SortOrder'] = ({'ComicID':'99999','ComicOrder':1})
|
|
|
|
comicorder['LastOrderNo'] = 1
|
|
|
|
comicorder['LastOrderID'] = 99999
|
|
|
|
else:
|
|
|
|
comicorder['SortOrder'] = comicorderlist
|
|
|
|
comicorder['LastOrderNo'] = i-1
|
|
|
|
comicorder['LastOrderID'] = comicorder['SortOrder'][i-1]['ComicID']
|
2013-03-21 17:09:10 +00:00
|
|
|
logger.info("Sucessfully ordered " + str(i-1) + " series in your watchlist.")
|
|
|
|
return comicorder
|
|
|
|
elif sequence == 'update':
|
2013-03-30 16:53:07 +00:00
|
|
|
mylar.COMICSORT['SortOrder'] = comicorderlist
|
|
|
|
print ("i:" + str(i))
|
|
|
|
if i == 0:
|
|
|
|
placemnt = 1
|
|
|
|
else:
|
|
|
|
placemnt = int(i-1)
|
|
|
|
mylar.COMICSORT['LastOrderNo'] = placemnt
|
|
|
|
mylar.COMICSORT['LastOrderID'] = mylar.COMICSORT['SortOrder'][placemnt]['ComicID']
|
2013-03-21 17:09:10 +00:00
|
|
|
return
|
|
|
|
else:
|
|
|
|
# for new series adds, we already know the comicid, so we set the sortorder to an abnormally high #
|
|
|
|
# we DO NOT write to the db to avoid record-locking.
|
|
|
|
# if we get 2 999's we're in trouble though.
|
|
|
|
sortedapp = []
|
|
|
|
if comicorder['LastOrderNo'] == '999':
|
|
|
|
lastorderval = int(comicorder['LastOrderNo']) + 1
|
|
|
|
else:
|
|
|
|
lastorderval = 999
|
|
|
|
sortedapp.append({
|
|
|
|
'ComicID': imported,
|
|
|
|
'ComicOrder': lastorderval
|
|
|
|
})
|
|
|
|
mylar.COMICSORT['SortOrder'] = sortedapp
|
|
|
|
mylar.COMICSORT['LastOrderNo'] = lastorderval
|
|
|
|
mylar.COMICSORT['LastOrderID'] = imported
|
|
|
|
return
|
|
|
|
|
FIX:(#304) Index out of range on recheck, FIX:(#303) Comicvine link updated on details page, FIX:(#302) Query rate (Search Delay) Added as a configuration option, FIX:(#300) Version number error on searching when no version number, FIX:(#297) Manual Rename of Files working, FIX:(#294) 'AU' issue problems should be resolved now, FIX:(#290) V#(year) and Vol#(year) added to filechecking, IMP: ComicVine data use only now as a hidden option (cv_only = 1 in config.ini), IMP: added as options for file naming, IMP: Rough drafting of Annuals (annuals_on = 1 in config.ini), Other fixes..
2013-04-06 09:43:18 +00:00
|
|
|
def fullmonth(monthno):
|
|
|
|
#simple numerical to worded month conversion....
|
|
|
|
basmonths = {'1':'January','2':'February','3':'March','4':'April','5':'May','6':'June','7':'July','8':'August','9':'September','10':'October','11':'November','12':'December'}
|
|
|
|
|
|
|
|
for numbs in basmonths:
|
|
|
|
if numbs in str(int(monthno)):
|
|
|
|
monthconv = basmonths[numbs]
|
|
|
|
|
|
|
|
return monthconv
|
2013-05-06 04:35:33 +00:00
|
|
|
|
|
|
|
def updateComicLocation():
|
|
|
|
import db, logger
|
|
|
|
myDB = db.DBConnection()
|
|
|
|
if mylar.NEWCOM_DIR is not None:
|
|
|
|
logger.info("Performing a one-time mass update to Comic Location")
|
|
|
|
#create the root dir if it doesn't exist
|
|
|
|
if os.path.isdir(mylar.NEWCOM_DIR):
|
|
|
|
logger.info(u"Directory (" + mylar.NEWCOM_DIR + ") already exists! Continuing...")
|
|
|
|
else:
|
|
|
|
logger.info("Directory doesn't exist!")
|
|
|
|
try:
|
|
|
|
os.makedirs(mylar.NEWCOM_DIR)
|
|
|
|
logger.info(u"Directory successfully created at: " + mylar.NEWCOM_DIR)
|
|
|
|
except OSError:
|
2013-05-25 06:18:00 +00:00
|
|
|
logger.error(u"Could not create comicdir : " + mylar.NEWCOM_DIR)
|
2013-05-06 04:35:33 +00:00
|
|
|
return
|
|
|
|
|
|
|
|
dirlist = myDB.select("SELECT * FROM comics")
|
2013-05-25 06:18:00 +00:00
|
|
|
|
2013-05-06 04:35:33 +00:00
|
|
|
if dirlist is not None:
|
|
|
|
for dl in dirlist:
|
2013-05-25 06:18:00 +00:00
|
|
|
|
|
|
|
comversion = dl['ComicVersion']
|
|
|
|
if comversion is None:
|
|
|
|
comversion = 'None'
|
|
|
|
#if comversion is None, remove it so it doesn't populate with 'None'
|
|
|
|
if comversion == 'None':
|
|
|
|
chunk_f_f = re.sub('\$VolumeN','',mylar.FOLDER_FORMAT)
|
|
|
|
chunk_f = re.compile(r'\s+')
|
|
|
|
folderformat = chunk_f.sub(' ', chunk_f_f)
|
|
|
|
else:
|
|
|
|
folderformat = mylar.FOLDER_FORMAT
|
|
|
|
|
|
|
|
values = {'$Series': dl['ComicName'],
|
|
|
|
'$Publisher': re.sub('!','',dl['ComicPublisher']),
|
|
|
|
'$Year': dl['ComicYear'],
|
|
|
|
'$series': dl['ComicName'].lower(),
|
|
|
|
'$publisher': re.sub('!','',dl['ComicPublisher']).lower(),
|
|
|
|
'$VolumeY': 'V' + str(dl['ComicYear']),
|
|
|
|
'$VolumeN': comversion
|
|
|
|
}
|
|
|
|
if mylar.FFTONEWCOM_DIR:
|
|
|
|
#if this is enabled (1) it will apply the Folder_Format to all the new dirs
|
|
|
|
if mylar.FOLDER_FORMAT == '':
|
|
|
|
comlocation = re.sub(mylar.DESTINATION_DIR, mylar.NEWCOM_DIR, dl['ComicLocation'])
|
|
|
|
else:
|
|
|
|
first = replace_all(folderformat, values)
|
|
|
|
comlocation = os.path.join(mylar.NEWCOM_DIR,first)
|
|
|
|
else:
|
|
|
|
comlocation = re.sub(mylar.DESTINATION_DIR, mylar.NEWCOM_DIR, dl['ComicLocation'])
|
|
|
|
|
2013-05-06 04:35:33 +00:00
|
|
|
ctrlVal = {"ComicID": dl['ComicID']}
|
2013-05-25 06:18:00 +00:00
|
|
|
newVal = {"ComicLocation": comlocation}
|
2013-05-06 04:35:33 +00:00
|
|
|
myDB.upsert("Comics", newVal, ctrlVal)
|
2013-05-25 06:18:00 +00:00
|
|
|
logger.fdebug("updated " + dl['ComicName'] + " to : " + comlocation)
|
2013-05-06 04:35:33 +00:00
|
|
|
#set the value to 0 here so we don't keep on doing this...
|
|
|
|
mylar.LOCMOVE = 0
|
|
|
|
mylar.config_write()
|
|
|
|
else:
|
|
|
|
logger.info("No new ComicLocation path specified - not updating.")
|
|
|
|
#raise cherrypy.HTTPRedirect("config")
|
|
|
|
return
|
|
|
|
|
2013-05-15 09:09:43 +00:00
|
|
|
def cleanhtml(raw_html):
|
|
|
|
#cleanr = re.compile('<.*?>')
|
|
|
|
#cleantext = re.sub(cleanr, '', raw_html)
|
|
|
|
#return cleantext
|
|
|
|
from bs4 import BeautifulSoup
|
|
|
|
|
|
|
|
VALID_TAGS = ['div', 'p']
|
|
|
|
|
|
|
|
soup = BeautifulSoup(raw_html)
|
|
|
|
|
|
|
|
for tag in soup.findAll('p'):
|
|
|
|
if tag.name not in VALID_TAGS:
|
|
|
|
tag.replaceWith(tag.renderContents())
|
|
|
|
flipflop = soup.renderContents()
|
|
|
|
print flipflop
|
|
|
|
return flipflop
|