Commit 62f9120a authored by janeczku's avatar janeczku

Merge branch 'zip-check'

parents bd686ad6 e42f7689
...@@ -500,7 +500,10 @@ def read_book(book_id): ...@@ -500,7 +500,10 @@ def read_book(book_id):
os.mkdir(book_dir) os.mkdir(book_dir)
for data in book.data: for data in book.data:
if data.format.lower() == "epub": if data.format.lower() == "epub":
zfile = zipfile.ZipFile(os.path.join(config.DB_ROOT, book.path, data.name) + ".epub") epub_file = os.path.join(config.DB_ROOT, book.path, data.name) + ".epub"
if not os.path.isfile(epub_file):
raise ValueError('Error opening eBook. File does not exist: ', epub_file)
zfile = zipfile.ZipFile(epub_file)
for name in zfile.namelist(): for name in zfile.namelist():
(dirName, fileName) = os.path.split(name) (dirName, fileName) = os.path.split(name)
newDir = os.path.join(book_dir, dirName) newDir = os.path.join(book_dir, dirName)
...@@ -517,6 +520,7 @@ def read_book(book_id): ...@@ -517,6 +520,7 @@ def read_book(book_id):
fd.write(zfile.read(name)) fd.write(zfile.read(name))
fd.close() fd.close()
zfile.close() zfile.close()
break
return render_template('read.html', bookid=book_id, title="Read a Book") return render_template('read.html', bookid=book_id, title="Read a Book")
@app.route("/download/<int:book_id>/<format>") @app.route("/download/<int:book_id>/<format>")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment