Fixed png/jpg thumbnail generation
This commit is contained in:
parent
f1aba58732
commit
d7f38882f2
36
main.py
36
main.py
@ -125,6 +125,7 @@ def generate():
|
|||||||
files_without_comicinfo = 0
|
files_without_comicinfo = 0
|
||||||
errorcount = 0
|
errorcount = 0
|
||||||
skippedcount = 0
|
skippedcount = 0
|
||||||
|
errormsg = ""
|
||||||
for root, dirs, files in os.walk(os.path.abspath(config.CONTENT_BASE_DIR)):
|
for root, dirs, files in os.walk(os.path.abspath(config.CONTENT_BASE_DIR)):
|
||||||
for file in files:
|
for file in files:
|
||||||
f = os.path.join(root, file)
|
f = os.path.join(root, file)
|
||||||
@ -139,8 +140,9 @@ def generate():
|
|||||||
if force == 'True':
|
if force == 'True':
|
||||||
ext = [i for i, x in enumerate(filelist) if re.search("(?i)\.jpg|png|jpeg$", x)]
|
ext = [i for i, x in enumerate(filelist) if re.search("(?i)\.jpg|png|jpeg$", x)]
|
||||||
cover = s.open(filelist[ext[0]]).read()
|
cover = s.open(filelist[ext[0]]).read()
|
||||||
|
|
||||||
image = Image.open(BytesIO(cover))
|
image = Image.open(BytesIO(cover))
|
||||||
|
rgb_im = image.convert("RGB")
|
||||||
image.thumbnail(config.MAXSIZE,Image.ANTIALIAS)
|
image.thumbnail(config.MAXSIZE,Image.ANTIALIAS)
|
||||||
image.save(config.THUMBNAIL_DIR + "/" + str(CVDB) + ".jpg")
|
image.save(config.THUMBNAIL_DIR + "/" + str(CVDB) + ".jpg")
|
||||||
|
|
||||||
@ -149,18 +151,23 @@ def generate():
|
|||||||
#c.write(cover)
|
#c.write(cover)
|
||||||
#c.close()
|
#c.close()
|
||||||
generated = generated + 1
|
generated = generated + 1
|
||||||
elif Path(config.THUMBNAIL_DIR + "/" + str(CVDB) + ".jpg").exists() == False:
|
if Path(config.THUMBNAIL_DIR + "/" + str(CVDB) + ".jpg").exists() == False:
|
||||||
ext = [i for i, x in enumerate(filelist) if re.search("(?i)\.jpg|png|jpeg$", x)]
|
config._print("generating for " + str(CVDB))
|
||||||
config._print(filelist)
|
try:
|
||||||
config._print(ext)
|
ext = [i for i, x in enumerate(filelist) if re.search("(?i)\.jpg|png|jpeg$", x)]
|
||||||
config._print(filelist[ext[0]])
|
#config._print(filelist)
|
||||||
cover = s.open(filelist[ext[0]]).read()
|
#config._print(ext)
|
||||||
#xyz = [i for i, x in enumerate(filelist) if re.match('*\.py$',x)]
|
#config._print(filelist[ext[0]])
|
||||||
#config._print(xyz)
|
cover = s.open(filelist[ext[0]]).read()
|
||||||
image = Image.open(BytesIO(cover))
|
#xyz = [i for i, x in enumerate(filelist) if re.match('*\.py$',x)]
|
||||||
image.thumbnail(config.MAXSIZE,Image.ANTIALIAS)
|
#config._print(xyz)
|
||||||
image.save(config.THUMBNAIL_DIR + "/" + str(CVDB) + ".jpg")
|
image = Image.open(BytesIO(cover))
|
||||||
generated = generated + 1
|
image.thumbnail(config.MAXSIZE,Image.ANTIALIAS)
|
||||||
|
image.save(config.THUMBNAIL_DIR + "/" + str(CVDB) + ".jpg")
|
||||||
|
generated = generated + 1
|
||||||
|
except Exception as e:
|
||||||
|
errormsg = str(e)
|
||||||
|
print(e)
|
||||||
else:
|
else:
|
||||||
skippedcount = skippedcount + 1
|
skippedcount = skippedcount + 1
|
||||||
else:
|
else:
|
||||||
@ -169,7 +176,8 @@ def generate():
|
|||||||
errorcount = errorcount + 1
|
errorcount = errorcount + 1
|
||||||
config._print("Error (/generate): " + str(e))
|
config._print("Error (/generate): " + str(e))
|
||||||
config._print(f)
|
config._print(f)
|
||||||
return "Forced generation: " + str(force) + "<br>Comics: " + str(comiccount) + "<br>Generated: " + str(generated) + "<br>CBZ files without ComicInfo.xml: " + str(files_without_comicinfo) + "<br>Errors: " + str(errorcount) + "<br>Skipped: " + str(skippedcount)
|
errormsg = str(e)
|
||||||
|
return "Forced generation: " + str(force) + "<br>Comics: " + str(comiccount) + "<br>Generated: " + str(generated) + "<br>CBZ files without ComicInfo.xml: " + str(files_without_comicinfo) + "<br>Errors: " + str(errorcount) + "<br>Skipped: " + str(skippedcount) + "<br>" + errormsg
|
||||||
|
|
||||||
|
|
||||||
@app.route('/import')
|
@app.route('/import')
|
||||||
|
@ -70,7 +70,7 @@ class Entry(object):
|
|||||||
else:
|
else:
|
||||||
config._print("No Writer found: " + str(data.select('Writer')))
|
config._print("No Writer found: " + str(data.select('Writer')))
|
||||||
|
|
||||||
#self.cover = "/image/" + extras.get_cvdb(data.select('Notes')) + ".jpg"
|
self.cover = "/image/" + extras.get_cvdb(data.select('Notes')) + ".jpg"
|
||||||
#if data.select('Title') != []:
|
#if data.select('Title') != []:
|
||||||
# self.title = data.select('Title')[0]
|
# self.title = data.select('Title')[0]
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user