saret/Lector
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make dependency checks less... crashy

Browse Source
This commit is contained in:
BasioMeusPuga
2019-03-03 07:56:05 -05:00
parent d6df28c503
commit c8fe0ba8b6
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lector/sorter.py
View File

@@ -43,10 +43,6 @@ else:
from PyQt5 import QtCore, QtGui from PyQt5 import QtCore, QtGui
from lector import database from lector import database
from lector.parsers.epub import ParseEPUB
from lector.parsers.mobi import ParseMOBI
from lector.parsers.fb2 import ParseFB2
from lector.parsers.comicbooks import ParseCOMIC from lector.parsers.comicbooks import ParseCOMIC
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -69,7 +65,11 @@ else:
# python-lxml - Required for everything except comics # python-lxml - Required for everything except comics
lxml_check = importlib.util.find_spec('lxml') lxml_check = importlib.util.find_spec('lxml')
xmltodict_check = importlib.util.find_spec('xmltodict') xmltodict_check = importlib.util.find_spec('xmltodict')
if lxml_check: if lxml_check and xmltodict_check:
from lector.parsers.epub import ParseEPUB
from lector.parsers.mobi import ParseMOBI
from lector.parsers.fb2 import ParseFB2
lxml_dependent = { lxml_dependent = {
'epub': ParseEPUB, 'epub': ParseEPUB,
'mobi': ParseMOBI, 'mobi': ParseMOBI,
@@ -81,7 +81,7 @@ if lxml_check:
'fb2.zip': ParseFB2} 'fb2.zip': ParseFB2}
sorter.update(lxml_dependent) sorter.update(lxml_dependent)
else: else:
critical_sting = 'python-lxml / xmltodict is not installed. Only comics will load.' critical_sting = 'lxml / xmltodict is not installed. Only comics will load.'
print(critical_sting) print(critical_sting)
logger.critical(critical_sting) logger.critical(critical_sting)