Merge branch Develop into thumbnails

cps/tasks/upload.py

@@ -1,4 +1,20 @@
-from __future__ import division, print_function, unicode_literals
+# -*- coding: utf-8 -*-
+
+#  This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#    Copyright (C) 2020 pwr
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 from datetime import datetime
 from cps.services.worker import CalibreTask, STAT_FINISH_SUCCESS
@@ -17,6 +33,9 @@ class TaskUpload(CalibreTask):
     def name(self):
         return "Upload"
 
+    def __str__(self):
+        return "Upload {}".format(self.message)
+
     @property
     def is_cancellable(self):
         return False