Jonathan/calibre-web
1
0
Fork 0
mirror of https://github.com/JonathanHerrewijnen/calibre-web.git synced 2024-11-10 21:24:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Develop

Browse Source
This commit is contained in:
Ozzie Isaacs 2022-02-01 20:31:03 +01:00
commit a03c95329c
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cps/uploader.py
View File

@ -233,6 +233,9 @@ def pdf_meta(tmp_file_path, original_file_name, original_file_extension):
if subject == '': if subject == '':
subject = doc_info.subject subject = doc_info.subject
if tags == '' and '/Keywords' in doc_info: if tags == '' and '/Keywords' in doc_info:
if isinstance(doc_info['/Keywords'], bytes):
tags = doc_info['/Keywords'].decode('utf-8')
else:
tags = doc_info['/Keywords'] tags = doc_info['/Keywords']
else: else:
title = original_file_name title = original_file_name

2
optional-requirements.txt
View File

@ -38,7 +38,7 @@ beautifulsoup4>=4.0.1,<4.2.0
cchardet>=2.0.0,<2.2.0 cchardet>=2.0.0,<2.2.0
# Comics # Comics
natsort>=2.2.0,<8.1.0 natsort>=2.2.0,<8.2.0
comicapi>=2.2.0,<2.3.0 comicapi>=2.2.0,<2.3.0
# Kobo integration # Kobo integration

2
setup.cfg
View File

@ -92,7 +92,7 @@ metadata =
beautifulsoup4>=4.0.1,<4.2.0 beautifulsoup4>=4.0.1,<4.2.0
cchardet>=2.0.0,<2.2.0 cchardet>=2.0.0,<2.2.0
comics = comics =
natsort>=2.2.0,<8.1.0 natsort>=2.2.0,<8.2.0
comicapi>=2.2.0,<2.3.0 comicapi>=2.2.0,<2.3.0
kobo = kobo =
jsonschema>=3.2.0,<4.5.0 jsonschema>=3.2.0,<4.5.0