mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2024-11-25 02:57:22 +00:00
Code Issues Releases Wiki Activity

Enable scheduled side deleting of thumbnails of deleted books

Browse Source
This commit is contained in:
Ozzie Isaacs 2022-04-24 11:14:39 +02:00
parent bf049d8240
commit bc96ff9a39
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cps/schedule.py
View File

@ -21,7 +21,7 @@ import datetime
from . import config, constants from . import config, constants
from .services.background_scheduler import BackgroundScheduler from .services.background_scheduler import BackgroundScheduler
from .tasks.database import TaskReconnectDatabase from .tasks.database import TaskReconnectDatabase
from .tasks.thumbnail import TaskGenerateCoverThumbnails, TaskGenerateSeriesThumbnails from .tasks.thumbnail import TaskGenerateCoverThumbnails, TaskGenerateSeriesThumbnails, TaskClearCoverThumbnailCache
from .services.worker import WorkerThread from .services.worker import WorkerThread
@ -35,6 +35,7 @@ def get_scheduled_tasks(reconnect=True):
# Generate all missing book cover thumbnails # Generate all missing book cover thumbnails
if config.schedule_generate_book_covers: if config.schedule_generate_book_covers:
tasks.append([lambda: TaskGenerateCoverThumbnails(), 'generate book covers']) tasks.append([lambda: TaskGenerateCoverThumbnails(), 'generate book covers'])
tasks.append([lambda: TaskClearCoverThumbnailCache(0), 'delete superfluous book covers'])
# Generate all missing series thumbnails # Generate all missing series thumbnails
if config.schedule_generate_series_covers: if config.schedule_generate_series_covers:

16
cps/tasks/thumbnail.py
View File

@ -16,7 +16,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
from __future__ import division, print_function, unicode_literals
import os import os
from urllib.request import urlopen from urllib.request import urlopen
@ -449,18 +448,24 @@ class TaskClearCoverThumbnailCache(CalibreTask):
super(TaskClearCoverThumbnailCache, self).__init__(task_message) super(TaskClearCoverThumbnailCache, self).__init__(task_message)
self.log = logger.create() self.log = logger.create()
self.book_id = book_id self.book_id = book_id
self.calibre_db = db.CalibreDB(expire_on_commit=False)
self.app_db_session = ub.get_new_session_instance() self.app_db_session = ub.get_new_session_instance()
self.cache = fs.FileSystem() self.cache = fs.FileSystem()
def run(self, worker_thread): def run(self, worker_thread):
if self.app_db_session: if self.app_db_session:
if self.book_id > 0: # make sure all thumbnails aren't getting deleted due to a bug if self.book_id == 0: # delete superfluous thumbnails
thumbnails = (self.calibre_db.session.query(ub.Thumbnail)
.join(db.Books, ub.Thumbnail.entity_id == db.Books.id, isouter=True)
.filter(db.Books.id == None)
.all())
elif self.book_id > 0: # make sure single book is selected
thumbnails = self.get_thumbnails_for_book(self.book_id) thumbnails = self.get_thumbnails_for_book(self.book_id)
if self.book_id < 0:
self.delete_all_thumbnails()
else:
for thumbnail in thumbnails: for thumbnail in thumbnails:
self.delete_thumbnail(thumbnail) self.delete_thumbnail(thumbnail)
else:
self.delete_all_thumbnails()
self._handleSuccess() self._handleSuccess()
self.app_db_session.remove() self.app_db_session.remove()
@ -472,7 +477,6 @@ class TaskClearCoverThumbnailCache(CalibreTask):
.all() .all()
def delete_thumbnail(self, thumbnail): def delete_thumbnail(self, thumbnail):
# thumbnail.expiration = datetime.utcnow()
try: try:
self.cache.delete_cache_file(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS) self.cache.delete_cache_file(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS)
self.app_db_session \ self.app_db_session \