Compare commits

..

3 Commits

Author SHA1 Message Date
1468b1932f Fix crash on startup
Add publishers.json to pip package
Add exception handling to prevent crash
2022-05-19 20:13:59 -07:00
74d95b6a50 Add typing_extensions 2022-05-19 18:17:22 -07:00
d33fb6ef31 Fix build errors
Add wordninja to requirements.txt
Fix typing to allow unrar-cffi to be optional
2022-05-19 18:08:05 -07:00
5 changed files with 15 additions and 5 deletions

View File

@ -537,7 +537,7 @@ class RarArchiver(UnknownArchiver):
return namelist
def get_rar_obj(self) -> Optional[rarfile.RarFile]:
def get_rar_obj(self) -> "Optional[rarfile.RarFile]":
try:
rarc = rarfile.RarFile(str(self.path))
except (OSError, IOError) as e:

View File

@ -275,4 +275,7 @@ publishers: dict[str, ImprintDict] = {}
def load_publishers() -> None:
update_publishers(json.loads((pathlib.Path(__file__).parent / "data" / "publishers.json").read_text("utf-8")))
try:
update_publishers(json.loads((pathlib.Path(__file__).parent / "data" / "publishers.json").read_text("utf-8")))
except Exception:
logger.exception("Failed to load publishers.json; The are no publishers or imprints loaded")

View File

@ -87,6 +87,10 @@ try:
qt_exception_hook = UncaughtHook()
from comictaggerlib.taggerwindow import TaggerWindow
except ImportError as e:
def show_exception_box(log_msg: str):
pass
logger.error(str(e))
qt_available = False
@ -101,8 +105,9 @@ def update_publishers() -> None:
if json_file.exists():
try:
utils.update_publishers(json.loads(json_file.read_text("utf-8")))
except Exception:
except Exception as e:
logger.exception("Failed to load publishers from %s", json_file)
show_exception_box(str(e))
def ctmain() -> None:

View File

@ -5,4 +5,6 @@ requests==2.*
pathvalidate
pycountry
py7zr
text2digits
text2digits
typing_extensions
wordninja

View File

@ -55,7 +55,7 @@ setup(
url="https://github.com/comictagger/comictagger",
packages=["comictaggerlib", "comicapi"],
package_data={
"comictaggerlib": ["ui/*", "graphics/*"],
"comictaggerlib": ["ui/*", "graphics/*", "data/*"],
},
entry_points=dict(console_scripts=["comictagger=comictaggerlib.main:ctmain"]),
classifiers=[