NunoSempere/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix allowed formats for comics

Browse Source 
Bugfix editing archived books
This commit is contained in:
OzzieIsaacs 2020-12-09 19:02:10 +01:00
parent 72a02e087c
commit 983e3b2274
3 changed files with 789 additions and 792 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cps/comic.py
View File

@ -52,17 +52,14 @@ except (ImportError, LookupError) as e:
use_rarfile = False use_rarfile = False
use_comic_meta = False use_comic_meta = False
COVER_EXTENSIONS = ['.jpg', '.jpeg', '.png', '.webp', '.bmp'] NO_JPEG_EXTENSIONS = ['.png', '.webp', '.bmp']
COVER_EXTENSIONS = ['.png', '.webp', '.bmp', '.jpg', '.jpeg']
def _cover_processing(tmp_file_name, img, extension): def _cover_processing(tmp_file_name, img, extension):
tmp_cover_name = os.path.join(os.path.dirname(tmp_file_name), 'cover.jpg') tmp_cover_name = os.path.join(os.path.dirname(tmp_file_name), 'cover.jpg')
if use_IM: if use_IM:
# convert to jpg because calibre only supports jpg # convert to jpg because calibre only supports jpg
cover_ext = COVER_EXTENSIONS if extension in NO_JPEG_EXTENSIONS:
cover_ext.remove('.jpeg')
cover_ext.remove('.jpg')
if extension in cover_ext:
with Image(filename=tmp_file_name) as imgc: with Image(filename=tmp_file_name) as imgc:
imgc.format = 'jpeg' imgc.format = 'jpeg'
imgc.transform_colorspace('rgb') imgc.transform_colorspace('rgb')

2
cps/editbooks.py
View File

@ -287,7 +287,7 @@ def delete_book(book_id, book_format, jsonResponse):
def render_edit_book(book_id): def render_edit_book(book_id):
calibre_db.update_title_sort(config) calibre_db.update_title_sort(config)
cc = calibre_db.session.query(db.Custom_Columns).filter(db.Custom_Columns.datatype.notin_(db.cc_exceptions)).all() cc = calibre_db.session.query(db.Custom_Columns).filter(db.Custom_Columns.datatype.notin_(db.cc_exceptions)).all()
book = calibre_db.get_filtered_book(book_id) book = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
if not book: if not book:
flash(_(u"Error opening eBook. File does not exist or file is not accessible"), category="error") flash(_(u"Error opening eBook. File does not exist or file is not accessible"), category="error")
return redirect(url_for("web.index")) return redirect(url_for("web.index"))

1570
test/Calibre-Web TestSummary_Linux.html
View File

File diff suppressed because it is too large Load Diff