From 83d07147e677fe0bd231d669edd5111e408f190c Mon Sep 17 00:00:00 2001 From: kyos Date: Sun, 30 Jul 2017 00:18:29 +0200 Subject: [PATCH 1/2] Added new metadata getter for epub files that include series and series_index information --- cps/epub.py | 16 ++++++++++++++-- cps/web.py | 19 +++++++++++++++---- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/cps/epub.py b/cps/epub.py index 50714b6f..d76a28c6 100644 --- a/cps/epub.py +++ b/cps/epub.py @@ -68,6 +68,18 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension): else: epub_metadata['language'] = "" + series = tree.xpath("/pkg:package/pkg:metadata/pkg:meta[@name='calibre:series']/@content", namespaces=ns) + if len(series) > 0: + epub_metadata['series'] = series[0] + else: + epub_metadata['series'] = '' + + series_id = tree.xpath("/pkg:package/pkg:metadata/pkg:meta[@name='calibre:series_index']/@content", namespaces=ns) + if len(series_id) > 0: + epub_metadata['series_id'] = series_id[0] + else: + epub_metadata['series_id'] = '1' + coversection = tree.xpath("/pkg:package/pkg:manifest/pkg:item[@id='cover-image']/@href", namespaces=ns) coverfile = None if len(coversection) > 0: @@ -102,6 +114,6 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension): cover=coverfile, description=epub_metadata['description'], tags="", - series="", - series_id="", + series=epub_metadata['series'].encode('utf-8').decode('utf-8'), + series_id=epub_metadata['series_id'].encode('utf-8').decode('utf-8'), languages=epub_metadata['language']) diff --git a/cps/web.py b/cps/web.py index 4ab23f40..a13fa643 100755 --- a/cps/web.py +++ b/cps/web.py @@ -2907,7 +2907,8 @@ def upload(): title = meta.title author = meta.author - + series = meta.series + series_index = meta.series_id title_dir = helper.get_valid_filename(title, False) author_dir = helper.get_valid_filename(author, False) data_name = title_dir @@ -2946,6 +2947,14 @@ def upload(): db_author = db.Authors(author, helper.get_sorted_author(author), "") db.session.add(db_author) + db_series = None + is_series = db.session.query(db.Series).filter(db.Series.name == series).first() + if is_series: + db_series = is_series + elif series != '': + db_series = db.Series(series, "") + db.session.add(db_series) + # add language actually one value in list input_language = meta.languages db_language = None @@ -2959,9 +2968,11 @@ def upload(): db.session.add(db_language) # combine path and normalize path from windows systems path = os.path.join(author_dir, title_dir).replace('\\', '/') - db_book = db.Books(title, "", db_author.sort, datetime.datetime.now(), datetime.datetime(101, 1, 1), 1, - datetime.datetime.now(), path, has_cover, db_author, [], db_language) + db_book = db.Books(title, "", db_author.sort, datetime.datetime.now(), datetime.datetime(101, 1, 1), + series_index, datetime.datetime.now(), path, has_cover, db_author, [], db_language) db_book.authors.append(db_author) + if db_series: + db_book.series.append(db_series) if db_language is not None: db_book.languages.append(db_language) db_data = db.Data(db_book, meta.extension.upper()[1:], file_size, data_name) @@ -2996,4 +3007,4 @@ def start_gevent(): from gevent.wsgi import WSGIServer global gevent_server gevent_server = WSGIServer(('', ub.config.config_port), app) - gevent_server.serve_forever() + gevent_server.serve_forever() \ No newline at end of file From aab32ceee9dd3f4927211adbba4a194cab6536e4 Mon Sep 17 00:00:00 2001 From: kyos Date: Sun, 30 Jul 2017 00:30:21 +0200 Subject: [PATCH 2/2] Set series_index to 1 when no series_index is provided --- cps/web.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cps/web.py b/cps/web.py index a13fa643..de547700 100755 --- a/cps/web.py +++ b/cps/web.py @@ -2915,6 +2915,9 @@ def upload(): filepath = config.config_calibre_dir + os.sep + author_dir + os.sep + title_dir saved_filename = filepath + os.sep + data_name + meta.extension + if series_index == '': + series_index = 1 + if not os.path.exists(filepath): try: os.makedirs(filepath)