fix built-in function overwrite

pull/519/head
inflrscns 7 years ago
parent 7cbdd0fd0a
commit 1c7396896b

@ -307,12 +307,12 @@ def get_sorted_author(value):
return value2 return value2
def delete_book(book, calibrepath, format=None): def delete_book(book, calibrepath, book_format=None):
if "/" in book.path: if "/" in book.path:
path = os.path.join(calibrepath, book.path) path = os.path.join(calibrepath, book.path)
if format: if book_format:
for file in os.listdir(path): for file in os.listdir(path):
if file.upper().endswith("."+format): if file.upper().endswith("."+book_format):
os.remove(os.path.join(path, file)) os.remove(os.path.join(path, file))
else: else:
shutil.rmtree(path, ignore_errors=True) shutil.rmtree(path, ignore_errors=True)

@ -21,7 +21,7 @@
{% for file in book.data %} {% for file in book.data %}
<p> <p>
<label>{{file.format}} ({{ file.uncompressed_size|filesizeformat }})</label> <label>{{file.format}} ({{ file.uncompressed_size|filesizeformat }})</label>
<a href="{{ url_for('delete_book_format', book_id=book.id, format=file.format) }}" class="btn-sm btn btn-danger" type="button">{{_('Delete')}}</a> <a href="{{ url_for('delete_book_format', book_id=book.id, book_format=file.format) }}" class="btn-sm btn btn-danger" type="button">{{_('Delete')}}</a>
</p> </p>
{% endfor %} {% endfor %}
</div> </div>

@ -1476,14 +1476,14 @@ def stats():
categorycounter=categorys, seriecounter=series, title=_(u"Statistics")) categorycounter=categorys, seriecounter=series, title=_(u"Statistics"))
@app.route("/delete/<int:book_id>/<string:format>/") @app.route("/delete/<int:book_id>/<string:book_format>/")
@login_required @login_required
def delete_book_format(book_id, format): def delete_book_format(book_id, book_format):
if current_user.role_delete_books(): if current_user.role_delete_books():
book = db.session.query(db.Books).filter(db.Books.id == book_id).first() book = db.session.query(db.Books).filter(db.Books.id == book_id).first()
if book: if book:
helper.delete_book(book, config.config_calibre_dir, format=format) helper.delete_book(book, config.config_calibre_dir, book_format=book_format)
db.session.query(db.Data).filter(db.Data.book == book.id).filter(db.Data.format == format).delete() db.session.query(db.Data).filter(db.Data.book == book.id).filter(db.Data.format == book_format).delete()
db.session.commit() db.session.commit()
else: else:
# book not found # book not found

Loading…
Cancel
Save