diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 00000000..c3d0309e
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+custom: ["https://PayPal.Me/calibreweb",]
diff --git a/cps/editbooks.py b/cps/editbooks.py
index 4948c2dc..fcf043a5 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/epub.py b/cps/epub.py
index cbbdcbbd..b436a755 100644
--- a/cps/epub.py
+++ b/cps/epub.py
@@ -25,15 +25,14 @@ from .helper import split_authors
from .constants import BookMeta
-
-def extractCover(zipFile, coverFile, coverpath, tmp_file_name):
- if coverFile is None:
+def extract_cover(zip_file, cover_file, cover_path, tmp_file_name):
+ if cover_file is None:
return None
else:
- zipCoverPath = os.path.join(coverpath, coverFile).replace('\\', '/')
- cf = zipFile.read(zipCoverPath)
+ zip_cover_path = os.path.join(cover_path, cover_file).replace('\\', '/')
+ cf = zip_file.read(zip_cover_path)
prefix = os.path.splitext(tmp_file_name)[0]
- tmp_cover_name = prefix + '.' + os.path.basename(zipCoverPath)
+ tmp_cover_name = prefix + '.' + os.path.basename(zip_cover_path)
image = open(tmp_cover_name, 'wb')
image.write(cf)
image.close()
@@ -47,12 +46,12 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
'dc': 'http://purl.org/dc/elements/1.1/'
}
- epubZip = zipfile.ZipFile(tmp_file_path)
+ epub_zip = zipfile.ZipFile(tmp_file_path)
- txt = epubZip.read('META-INF/container.xml')
+ txt = epub_zip.read('META-INF/container.xml')
tree = etree.fromstring(txt)
cfname = tree.xpath('n:rootfiles/n:rootfile/@full-path', namespaces=ns)[0]
- cf = epubZip.read(cfname)
+ cf = epub_zip.read(cfname)
tree = etree.fromstring(cf)
coverpath = os.path.dirname(cfname)
@@ -86,9 +85,9 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
lang = epub_metadata['language'].split('-', 1)[0].lower()
epub_metadata['language'] = isoLanguages.get_lang3(lang)
- epub_metadata = parse_epbub_series(ns, tree, epub_metadata)
+ epub_metadata = parse_epub_series(ns, tree, epub_metadata)
- coverfile = parse_ebpub_cover(ns, tree, epubZip, coverpath, tmp_file_path)
+ cover_file = parse_epub_cover(ns, tree, epub_zip, coverpath, tmp_file_path)
if not epub_metadata['title']:
title = original_file_name
@@ -100,7 +99,7 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
extension=original_file_extension,
title=title.encode('utf-8').decode('utf-8'),
author=epub_metadata['creator'].encode('utf-8').decode('utf-8'),
- cover=coverfile,
+ cover=cover_file,
description=epub_metadata['description'],
tags=epub_metadata['subject'].encode('utf-8').decode('utf-8'),
series=epub_metadata['series'].encode('utf-8').decode('utf-8'),
@@ -108,37 +107,43 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
languages=epub_metadata['language'],
publisher="")
-def parse_ebpub_cover(ns, tree, epubZip, coverpath, tmp_file_path):
- coversection = tree.xpath("/pkg:package/pkg:manifest/pkg:item[@id='cover-image']/@href", namespaces=ns)
- coverfile = None
- if len(coversection) > 0:
- coverfile = extractCover(epubZip, coversection[0], coverpath, tmp_file_path)
+
+def parse_epub_cover(ns, tree, epub_zip, cover_path, tmp_file_path):
+ cover_section = tree.xpath("/pkg:package/pkg:manifest/pkg:item[@id='cover-image']/@href", namespaces=ns)
+ cover_file = None
+ if len(cover_section) > 0:
+ cover_file = extract_cover(epub_zip, cover_section[0], cover_path, tmp_file_path)
else:
meta_cover = tree.xpath("/pkg:package/pkg:metadata/pkg:meta[@name='cover']/@content", namespaces=ns)
if len(meta_cover) > 0:
- coversection = tree.xpath("/pkg:package/pkg:manifest/pkg:item[@id='"+meta_cover[0]+"']/@href", namespaces=ns)
+ cover_section = tree.xpath(
+ "/pkg:package/pkg:manifest/pkg:item[@id='"+meta_cover[0]+"']/@href", namespaces=ns)
+ if not cover_section:
+ cover_section = tree.xpath(
+ "/pkg:package/pkg:manifest/pkg:item[@properties='" + meta_cover[0] + "']/@href", namespaces=ns)
else:
- coversection = tree.xpath("/pkg:package/pkg:guide/pkg:reference/@href", namespaces=ns)
- if len(coversection) > 0:
- filetype = coversection[0].rsplit('.', 1)[-1]
+ cover_section = tree.xpath("/pkg:package/pkg:guide/pkg:reference/@href", namespaces=ns)
+ if len(cover_section) > 0:
+ filetype = cover_section[0].rsplit('.', 1)[-1]
if filetype == "xhtml" or filetype == "html": # if cover is (x)html format
- markup = epubZip.read(os.path.join(coverpath, coversection[0]))
- markupTree = etree.fromstring(markup)
+ markup = epub_zip.read(os.path.join(cover_path, cover_section[0]))
+ markup_tree = etree.fromstring(markup)
# no matter xhtml or html with no namespace
- imgsrc = markupTree.xpath("//*[local-name() = 'img']/@src")
+ img_src = markup_tree.xpath("//*[local-name() = 'img']/@src")
# Alternative image source
- if not len(imgsrc):
- imgsrc = markupTree.xpath("//attribute::*[contains(local-name(), 'href')]")
- if len(imgsrc):
- # imgsrc maybe startwith "../"" so fullpath join then relpath to cwd
- filename = os.path.relpath(os.path.join(os.path.dirname(os.path.join(coverpath, coversection[0])),
- imgsrc[0]))
- coverfile = extractCover(epubZip, filename, "", tmp_file_path)
+ if not len(img_src):
+ img_src = markup_tree.xpath("//attribute::*[contains(local-name(), 'href')]")
+ if len(img_src):
+ # img_src maybe start with "../"" so fullpath join then relpath to cwd
+ filename = os.path.relpath(os.path.join(os.path.dirname(os.path.join(cover_path, cover_section[0])),
+ img_src[0]))
+ cover_file = extract_cover(epub_zip, filename, "", tmp_file_path)
else:
- coverfile = extractCover(epubZip, coversection[0], coverpath, tmp_file_path)
- return coverfile
+ cover_file = extract_cover(epub_zip, cover_section[0], cover_path, tmp_file_path)
+ return cover_file
+
-def parse_epbub_series(ns, tree, epub_metadata):
+def parse_epub_series(ns, tree, epub_metadata):
series = tree.xpath("/pkg:package/pkg:metadata/pkg:meta[@name='calibre:series']/@content", namespaces=ns)
if len(series) > 0:
epub_metadata['series'] = series[0]
diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py
index 8fd544a8..e610b14b 100644
--- a/cps/tasks/convert.py
+++ b/cps/tasks/convert.py
@@ -116,11 +116,26 @@ class TaskConvert(CalibreTask):
log.info("Book id %d already converted to %s", book_id, format_new_ext)
cur_book = local_db.get_book(book_id)
self.title = cur_book.title
- self.results['path'] = file_path
+ self.results['path'] = cur_book.path
self.results['title'] = self.title
- self._handleSuccess()
- local_db.session.close()
- return os.path.basename(file_path + format_new_ext)
+ new_format = local_db.session.query(db.Data).filter(db.Data.book == book_id)\
+ .filter(db.Data.format == self.settings['new_book_format'].upper()).one_or_none()
+ if not new_format:
+ new_format = db.Data(name=os.path.basename(file_path),
+ book_format=self.settings['new_book_format'].upper(),
+ book=book_id, uncompressed_size=os.path.getsize(file_path + format_new_ext))
+ try:
+ local_db.session.merge(new_format)
+ local_db.session.commit()
+ except SQLAlchemyError as e:
+ local_db.session.rollback()
+ log.error("Database error: %s", e)
+ local_db.session.close()
+ self._handleError(error_message)
+ return
+ self._handleSuccess()
+ local_db.session.close()
+ return os.path.basename(file_path + format_new_ext)
else:
log.info("Book id %d - target format of %s does not exist. Moving forward with convert.",
book_id,
@@ -141,22 +156,25 @@ class TaskConvert(CalibreTask):
if check == 0:
cur_book = local_db.get_book(book_id)
if os.path.isfile(file_path + format_new_ext):
- new_format = db.Data(name=cur_book.data[0].name,
+ new_format = local_db.session.query(db.Data).filter(db.Data.book == book_id) \
+ .filter(db.Data.format == self.settings['new_book_format'].upper()).one_or_none()
+ if not new_format:
+ new_format = db.Data(name=cur_book.data[0].name,
book_format=self.settings['new_book_format'].upper(),
book=book_id, uncompressed_size=os.path.getsize(file_path + format_new_ext))
- try:
- local_db.session.merge(new_format)
- local_db.session.commit()
- if self.settings['new_book_format'].upper() in ['KEPUB', 'EPUB', 'EPUB3']:
- ub_session = init_db_thread()
- remove_synced_book(book_id, True, ub_session)
- ub_session.close()
- except SQLAlchemyError as e:
- local_db.session.rollback()
- log.error("Database error: %s", e)
- local_db.session.close()
- self._handleError(error_message)
- return
+ try:
+ local_db.session.merge(new_format)
+ local_db.session.commit()
+ if self.settings['new_book_format'].upper() in ['KEPUB', 'EPUB', 'EPUB3']:
+ ub_session = init_db_thread()
+ remove_synced_book(book_id, True, ub_session)
+ ub_session.close()
+ except SQLAlchemyError as e:
+ local_db.session.rollback()
+ log.error("Database error: %s", e)
+ local_db.session.close()
+ self._handleError(error_message)
+ return
self.results['path'] = cur_book.path
self.title = cur_book.title
self.results['title'] = self.title
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)