NunoSempere/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix parsing /Keywords' in doc_info of pdf file with type bytes (fixes #2302)

Browse Source
This commit is contained in:
Ozzie Isaacs 2022-02-01 20:19:14 +01:00
parent 95e0255aa1
commit e0bf829def
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cps/uploader.py
View File

@ -233,7 +233,10 @@ 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:
tags = doc_info['/Keywords'] if isinstance(doc_info['/Keywords'], bytes):
tags = doc_info['/Keywords'].decode('utf-8')
else:
tags = doc_info['/Keywords']
else: else:
title = original_file_name title = original_file_name

2
optional-requirements.txt
View File

@ -33,7 +33,7 @@ rarfile>=2.7
scholarly>=1.2.0,<1.6 scholarly>=1.2.0,<1.6
# 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

@ -87,7 +87,7 @@ metadata =
rarfile>=2.7 rarfile>=2.7
scholarly>=1.2.0,<1.6 scholarly>=1.2.0,<1.6
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