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

Merge branch 'master' into Develop

Browse Source
This commit is contained in:
Ozzieisaacs 2020-11-30 18:37:14 +01:00
commit 6ad56a0859
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cps/admin.py
View File

@ -55,7 +55,7 @@ feature_support = {
try: try:
import rarfile import rarfile
feature_support['rar'] = True feature_support['rar'] = True
except ImportError: except (ImportError, SyntaxError):
feature_support['rar'] = False feature_support['rar'] = False
try: try:

4
cps/comic.py
View File

@ -38,7 +38,7 @@ try:
use_comic_meta = True use_comic_meta = True
try: try:
from comicapi import __version__ as comic_version from comicapi import __version__ as comic_version
except (ImportError): except ImportError:
comic_version = '' comic_version = ''
except (ImportError, LookupError) as e: except (ImportError, LookupError) as e:
log.debug('Cannot import comicapi, extracting comic metadata will not work: %s', e) log.debug('Cannot import comicapi, extracting comic metadata will not work: %s', e)
@ -47,7 +47,7 @@ except (ImportError, LookupError) as e:
try: try:
import rarfile import rarfile
use_rarfile = True use_rarfile = True
except ImportError as e: except (ImportError, SyntaxError) as e:
log.debug('Cannot import rarfile, extracting cover files from rar files will not work: %s', e) log.debug('Cannot import rarfile, extracting cover files from rar files will not work: %s', e)
use_rarfile = False use_rarfile = False
use_comic_meta = False use_comic_meta = False

2
optional-requirements.txt
View File

@ -31,7 +31,7 @@ rarfile>=2.7
# other # other
natsort>=2.2.0,<7.1.0 natsort>=2.2.0,<7.1.0
git+https://github.com/OzzieIsaacs/comicapi.git@b323fab55e7daba97f90bf59a4bc8de9d9c0a86b#egg=comicapi git+https://github.com/OzzieIsaacs/comicapi.git@7aa91ea95ea7a919df6c6cac817865434a31c228#egg=comicapi
#Kobo integration #Kobo integration
jsonschema>=3.2.0,<3.3.0 jsonschema>=3.2.0,<3.3.0