mirror of
https://github.com/janeczku/calibre-web
synced 2024-12-25 09:30:31 +00:00
Merge branch 'master' into Develop
This commit is contained in:
commit
a03c95329c
@ -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
|
||||||
|
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user