From 6d4d6aceaf37cf07aaaf233dbe4ab78b49fc1c95 Mon Sep 17 00:00:00 2001 From: trasba Date: Sun, 16 Sep 2018 19:43:47 +0200 Subject: [PATCH 1/2] Update optional-requirements.txt changed optional requirement from lxml==3.7.2 to >=3.8.0 ebook-convert is not working properly with a version < 3.8.0 --- optional-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/optional-requirements.txt b/optional-requirements.txt index 22accfc1..154612b3 100644 --- a/optional-requirements.txt +++ b/optional-requirements.txt @@ -15,6 +15,6 @@ six==1.10.0 goodreads>=0.3.2 python-Levenshtein>=0.12.0 # other -lxml==3.7.2 +lxml>=3.8.0 rarfile>=2.7 natsort>=2.2.0 From 3fa41d0e4aa4f4d1f03fd068f231bee6964e07f2 Mon Sep 17 00:00:00 2001 From: trasba Date: Mon, 17 Sep 2018 21:55:41 +0200 Subject: [PATCH 2/2] added formats for upload and conversion added formats for upload and conversion (html, rtf, odt) --- cps/web.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cps/web.py b/cps/web.py index 2de1bbd3..877909a1 100644 --- a/cps/web.py +++ b/cps/web.py @@ -108,8 +108,8 @@ current_milli_time = lambda: int(round(time.time() * 1000)) gdrive_watch_callback_token = 'target=calibreweb-watch_files' EXTENSIONS_UPLOAD = {'txt', 'pdf', 'epub', 'mobi', 'azw', 'azw3', 'cbr', 'cbz', 'cbt', 'djvu', 'prc', 'doc', 'docx', - 'fb2'} -EXTENSIONS_CONVERT = {'pdf', 'epub', 'mobi', 'azw3', 'docx', 'rtf', 'fb2', 'lit', 'lrf', 'txt'} + 'fb2', 'html', 'rtf', 'odt'} +EXTENSIONS_CONVERT = {'pdf', 'epub', 'mobi', 'azw3', 'docx', 'rtf', 'fb2', 'lit', 'lrf', 'txt', 'html', 'rtf', 'odt'} # EXTENSIONS_READER = set(['txt', 'pdf', 'epub', 'zip', 'cbz', 'tar', 'cbt'] + (['rar','cbr'] if rar_support else []))