FrederikBaerentsen/ComicOPDS
1
0
Fork 0
Code Issues 9 Pull Requests Projects Releases Wiki Activity

Compare commits

base: FrederikBaerentsen:d7f38882f2ce1935acc06d35817fd9f0c6f5c1e3
Branches Tags
FrederikBaerentsen:master
..
compare: FrederikBaerentsen:8c69a958def4c14a930e568692c98e30e2d6ed26
Branches Tags
FrederikBaerentsen:master

No commits in common. "d7f38882f2ce1935acc06d35817fd9f0c6f5c1e3" and "8c69a958def4c14a930e568692c98e30e2d6ed26" have entirely different histories.
d7f38882f2 ... 8c69a958de

4 changed files with 23 additions and 41 deletions
Show Stats Expand all files Collapse all files

2
.gitignore vendored
View File

@ -3,5 +3,3 @@ __pycache__/
.env .env
deploy.sh deploy.sh
env env
thumbnails
*.db

18
main.py
View File

@ -125,7 +125,6 @@ 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)
@ -142,7 +141,6 @@ def generate():
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")
@ -151,13 +149,11 @@ def generate():
#c.write(cover) #c.write(cover)
#c.close() #c.close()
generated = generated + 1 generated = generated + 1
if Path(config.THUMBNAIL_DIR + "/" + str(CVDB) + ".jpg").exists() == False: elif Path(config.THUMBNAIL_DIR + "/" + str(CVDB) + ".jpg").exists() == False:
config._print("generating for " + str(CVDB))
try:
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)]
#config._print(filelist) config._print(filelist)
#config._print(ext) config._print(ext)
#config._print(filelist[ext[0]]) config._print(filelist[ext[0]])
cover = s.open(filelist[ext[0]]).read() cover = s.open(filelist[ext[0]]).read()
#xyz = [i for i, x in enumerate(filelist) if re.match('*\.py$',x)] #xyz = [i for i, x in enumerate(filelist) if re.match('*\.py$',x)]
#config._print(xyz) #config._print(xyz)
@ -165,9 +161,6 @@ def generate():
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")
generated = generated + 1 generated = generated + 1
except Exception as e:
errormsg = str(e)
print(e)
else: else:
skippedcount = skippedcount + 1 skippedcount = skippedcount + 1
else: else:
@ -176,8 +169,7 @@ 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)
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)
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')

20
opds/entry.py
View File

@ -53,7 +53,6 @@ class Entry(object):
#print(">>entry.py") #print(">>entry.py")
#print(kwargs) #print(kwargs)
print(kwargs["title"])
#print(kwargs["links"][0].get("rpath")) #print(kwargs["links"][0].get("rpath"))
#print("--end entry.py") #print("--end entry.py")
try: try:
@ -61,8 +60,8 @@ class Entry(object):
f=self.links[0].get("rpath")+"/"+self.title+".cbz" f=self.links[0].get("rpath")+"/"+self.title+".cbz"
if os.path.exists(f): if os.path.exists(f):
s = zipfile.ZipFile(f) s = zipfile.ZipFile(f)
self.size = extras.get_size(f, 'mb') #self.size = extras.get_size(f, 'mb')
data=BeautifulSoup(s.open('ComicInfo.xml').read(), features="html.parser") data=BeautifulSoup(s.open('ComicInfo.xml').read(), "xml")
#self.cover=s.open('P00001.jpg').read() #self.cover=s.open('P00001.jpg').read()
if data.select('Writer') != []: if data.select('Writer') != []:
@ -70,17 +69,10 @@ 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') != []:
# self.title = data.select('Title')[0]
# print(data.select('Title')[0])
title = data.select('Title')[0].text.replace("&","&amp;")
kwargs["title"] = title
print(title)
if data.select('Summary') != []: if data.select('Summary') != []:
#print(data.select('Summary')[0].text) self.summary = data.select('Summary')[0].text
self.summary = data.select('Summary')[0]
else: else:
config._print("No Summary found: " + str(data.select('Summary'))) config._print("No Summary found: " + str(data.select('Summary')))
@ -92,12 +84,12 @@ class Entry(object):
if data.select('Series')[0].text in kwargs["links"][0].get("rpath"): if data.select('Series')[0].text in kwargs["links"][0].get("rpath"):
releasedate=data.select('Year')[0].text+"-"+data.select('Month')[0].text.zfill(2)+"-"+data.select('Day')[0].text.zfill(2) releasedate=data.select('Year')[0].text+"-"+data.select('Month')[0].text.zfill(2)+"-"+data.select('Day')[0].text.zfill(2)
try: try:
self.title = "#"+data.select('Number')[0].text.zfill(2) + ": " + title + " (" + releasedate + ") [" + str(self.size) + "MB]" self.title = "#"+data.select('Number')[0].text.zfill(2) + ": " + data.select('Title')[0].text + " (" + releasedate + ") [" + str(self.size) + "MB]"
except: except:
self.title = "#"+data.select('Number')[0].text.zfill(2) + " (" + releasedate + ") [" + str(self.size) + "MB]" self.title = "#"+data.select('Number')[0].text.zfill(2) + " (" + releasedate + ") [" + str(self.size) + "MB]"
#print(self.title) #print(self.title)
else: else:
self.title = title self.title = kwargs["title"]
else: else:
self.title = kwargs["title"] self.title = kwargs["title"]

2
opds/templates/catalog.opds.jinja2
View File

@ -27,7 +27,7 @@
<entry> <entry>
<title>{{ entry.title }}</title> <title>{{ entry.title }}</title>
<id>{{ entry.id }}</id> <id>{{ entry.id }}</id>
<summary type="text">{{ entry.summary }}</summary> m!-- <summary type="text">{{ entry.summary }}</summary> -->
{% for author in entry.authors %} {% for author in entry.authors %}
<author> <author>
<name>{{ author }}</name> <name>{{ author }}</name>