mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2025-10-17 00:27:39 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into Develop

Browse Source 
# Conflicts:
#	cps/web.py
This commit is contained in:
Ozzie Isaacs
2021-12-04 20:56:04 +01:00
parent 1e9d88fa98 3bf173d958
commit cd5711e651
62 changed files with 3821 additions and 3690 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cps/helper.py
View File

@@ -705,7 +705,7 @@ def save_cover(img, book_path):
imgc.format = 'jpeg'
imgc.transform_colorspace("rgb")
img = imgc
except BlobError:
except (BlobError, MissingDelegateError):
log.error("Invalid cover file content")
return False, _("Invalid cover file content")
else:
@@ -882,7 +882,7 @@ def get_cc_columns(filter_config_custom_read=False):
def get_download_link(book_id, book_format, client):
book_format = book_format.split(".")[0]
book = calibre_db.get_filtered_book(book_id)
book = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
if book:
data1 = calibre_db.get_book_format(book.id, book_format.upper())
else: