From 2b17bf4114365fab9c986050d06d657ab7d669fc Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Tue, 23 Mar 2021 18:57:04 +0100 Subject: [PATCH] Update tests Fixes upload book --- cps/db.py | 2 ++ cps/epub.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cps/db.py b/cps/db.py index 7a4660f4..6e5dfbbf 100644 --- a/cps/db.py +++ b/cps/db.py @@ -636,6 +636,8 @@ class CalibreDB(): query = query.outerjoin(join[0], join[1]).outerjoin(join[2]) elif len(join) == 2: query = query.outerjoin(join[0], join[1]) + elif len(join) == 1: + query = query.outerjoin(join[0]) query = query.filter(db_filter)\ .filter(self.common_filters(allow_show_archived)) entries = list() diff --git a/cps/epub.py b/cps/epub.py index 428ce839..998dbfa6 100644 --- a/cps/epub.py +++ b/cps/epub.py @@ -87,7 +87,7 @@ 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(tree, epub_metadata) + epub_metadata = parse_epbub_series(ns, tree, epub_metadata) coverfile = parse_ebpub_cover(ns, tree, epubZip, coverpath, tmp_file_path) @@ -139,7 +139,7 @@ def parse_ebpub_cover(ns, tree, epubZip, coverpath, tmp_file_path): coverfile = extractCover(epubZip, coversection[0], coverpath, tmp_file_path) return coverfile -def parse_epbub_series(tree, epub_metadata): +def parse_epbub_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]