1
0
mirror of https://github.com/janeczku/calibre-web synced 2024-12-26 01:50:31 +00:00

Check if epub file exists before trying to extract

This commit is contained in:
janeczku 2016-06-17 20:59:44 +02:00
parent bd686ad6ed
commit e42f768909

View File

@ -500,7 +500,11 @@ 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):
flash("Error opening eBook. File does not exist: %s" % epub_file, category="error")
return redirect(request.environ["HTTP_REFERER"])
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 +521,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>")