From 9955e348a03331ff019b30a06cc3f61cda8e305f Mon Sep 17 00:00:00 2001 From: Oskar Manhart <52569953+oskardotglobal@users.noreply.github.com> Date: Sat, 3 Aug 2024 16:28:13 +0200 Subject: [PATCH] Revert "feat: resize images directly at cover endpoint" This reverts commit ba383643f50b2672884a465a139207513482ee05. --- cps/helper.py | 30 ++++++++---------------------- cps/templates/image.html | 4 ++-- cps/web.py | 24 ------------------------ 3 files changed, 10 insertions(+), 48 deletions(-) diff --git a/cps/helper.py b/cps/helper.py index 37ee7bb2..004e1b0e 100644 --- a/cps/helper.py +++ b/cps/helper.py @@ -30,12 +30,10 @@ import requests import unidecode from uuid import uuid4 -from flask import send_from_directory, make_response, abort, url_for, Response, redirect +from flask import send_from_directory, make_response, abort, url_for, Response from flask_babel import gettext as _ from flask_babel import lazy_gettext as N_ from flask_babel import get_locale -from flask_image_resizer import resized_img_src - from .cw_login import current_user from sqlalchemy.sql.expression import true, false, and_, or_, text, func from sqlalchemy.exc import InvalidRequestError, OperationalError @@ -751,8 +749,6 @@ def get_book_cover_with_uuid(book_uuid, resolution=None): def get_book_cover_internal(book, resolution=None): - """returns an optimized version of the cover, unless using google drive""" - if book and book.has_cover: # Send the book cover thumbnail if it exists in cache @@ -761,13 +757,8 @@ def get_book_cover_internal(book, resolution=None): if thumbnail: cache = fs.FileSystem() if cache.get_cache_file_exists(thumbnail.filename, CACHE_TYPE_THUMBNAILS): - return redirect(resized_img_src( - os.path.join( - cache.get_cache_file_dir(thumbnail.filename, CACHE_TYPE_THUMBNAILS), - thumbnail.filename - ), - format="webp" - )) + return send_from_directory(cache.get_cache_file_dir(thumbnail.filename, CACHE_TYPE_THUMBNAILS), + thumbnail.filename) # Send the book cover from Google Drive if configured if config.config_use_google_drive: @@ -786,9 +777,9 @@ def get_book_cover_internal(book, resolution=None): # Send the book cover from the Calibre directory else: - cover_file_path = os.path.join(config.get_book_path(), book.path, "cover.jpg") - if os.path.isfile(cover_file_path): - return redirect(resized_img_src(cover_file_path, format="webp")) + cover_file_path = os.path.join(config.get_book_path(), book.path) + if os.path.isfile(os.path.join(cover_file_path, "cover.jpg")): + return send_from_directory(cover_file_path, "cover.jpg") else: return get_cover_on_failure() else: @@ -829,13 +820,8 @@ def get_series_cover_internal(series_id, resolution=None): if thumbnail: cache = fs.FileSystem() if cache.get_cache_file_exists(thumbnail.filename, CACHE_TYPE_THUMBNAILS): - return redirect(resized_img_src( - os.path.join( - cache.get_cache_file_dir(thumbnail.filename, CACHE_TYPE_THUMBNAILS), - thumbnail.filename - ), - format="webp" - )) + return send_from_directory(cache.get_cache_file_dir(thumbnail.filename, CACHE_TYPE_THUMBNAILS), + thumbnail.filename) return get_series_thumbnail_on_failure(series_id, resolution) diff --git a/cps/templates/image.html b/cps/templates/image.html index f84fa12b..088e6b99 100644 --- a/cps/templates/image.html +++ b/cps/templates/image.html @@ -4,7 +4,7 @@ {% set srcset = book|get_cover_srcset %} {{ image_alt }} @@ -15,7 +15,7 @@ {% set srcset = series|get_series_srcset %} {{ book_title }} diff --git a/cps/web.py b/cps/web.py index fa15b3fc..2519ebd5 100644 --- a/cps/web.py +++ b/cps/web.py @@ -29,8 +29,6 @@ from flask import request, redirect, send_from_directory, make_response, flash, from flask import session as flask_session from flask_babel import gettext as _ from flask_babel import get_locale -from flask_image_resizer import resized_img_src - from .cw_login import login_user, logout_user, current_user from flask_limiter import RateLimitExceeded from flask_limiter.util import get_remote_address @@ -1149,17 +1147,6 @@ def category_list(): @web.route("/cover//") @login_required_if_no_ano def get_cover(book_id, resolution=None): - return redirect( - resized_img_src( - url_for("web.get_raw_cover", book_id=book_id, resolution=resolution) - ) - ) - - -@web.route("/raw_cover/") -@web.route("/raw_cover//") -@login_required_if_no_ano -def get_raw_cover(book_id, resolution=None): resolutions = { 'og': constants.COVER_THUMBNAIL_ORIGINAL, 'sm': constants.COVER_THUMBNAIL_SMALL, @@ -1174,17 +1161,6 @@ def get_raw_cover(book_id, resolution=None): @web.route("/series_cover//") @login_required_if_no_ano def get_series_cover(series_id, resolution=None): - return redirect( - resized_img_src( - url_for("web.get_raw_series_cover", series_id=series_id, resolution=resolution) - ) - ) - - -@web.route("/raw_series_cover/") -@web.route("/raw_series_cover//") -@login_required_if_no_ano -def get_raw_series_cover(series_id, resolution=None): resolutions = { 'og': constants.COVER_THUMBNAIL_ORIGINAL, 'sm': constants.COVER_THUMBNAIL_SMALL,