From 0c3c0c06649629eae615a9db978eb189e03edfe7 Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Sun, 6 Feb 2022 16:33:12 +0100 Subject: [PATCH] Improved logging of book title on upload --- cps/editbooks.py | 4 ++-- cps/tasks/upload.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cps/editbooks.py b/cps/editbooks.py index 4948c2dc..9fce1272 100755 --- a/cps/editbooks.py +++ b/cps/editbooks.py @@ -670,7 +670,7 @@ def upload_single_file(request, book, book_id): # Queue uploader info link = '{}'.format(url_for('web.show_book', book_id=book.id), escape(book.title)) uploadText=_(u"File format %(ext)s added to %(book)s", ext=file_ext.upper(), book=link) - WorkerThread.add(current_user.name, TaskUpload(uploadText)) + WorkerThread.add(current_user.name, TaskUpload(uploadText), escape(book.title)) return uploader.process( saved_filename, *os.path.splitext(requested_file.filename), @@ -1092,7 +1092,7 @@ def upload(): flash(error, category="error") link = '{}'.format(url_for('web.show_book', book_id=book_id), escape(title)) uploadText = _(u"File %(file)s uploaded", file=link) - WorkerThread.add(current_user.name, TaskUpload(uploadText)) + WorkerThread.add(current_user.name, TaskUpload(uploadText, escape(title))) if len(request.files.getlist("btn-upload")) < 2: if current_user.role_edit() or current_user.role_admin(): diff --git a/cps/tasks/upload.py b/cps/tasks/upload.py index 2a667c28..e0bb0094 100644 --- a/cps/tasks/upload.py +++ b/cps/tasks/upload.py @@ -20,11 +20,12 @@ from datetime import datetime from cps.services.worker import CalibreTask, STAT_FINISH_SUCCESS class TaskUpload(CalibreTask): - def __init__(self, taskMessage): + def __init__(self, taskMessage, book_title): super(TaskUpload, self).__init__(taskMessage) self.start_time = self.end_time = datetime.now() self.stat = STAT_FINISH_SUCCESS self.progress = 1 + self.book_title = book_title def run(self, worker_thread): """Upload task doesn't have anything to do, it's simply a way to add information to the task list""" @@ -34,4 +35,4 @@ class TaskUpload(CalibreTask): return "Upload" def __str__(self): - return "Upload {}".format(self.message) + return "Upload {}".format(self.book_title)