From 1f843d546875154f52d592c657ba45836d26862d Mon Sep 17 00:00:00 2001 From: Laura Liberda Date: Thu, 3 Dec 2020 08:25:22 +0100 Subject: [PATCH] fix package to work on pip installs --- librefi/__init__.py | 29 +++++++++++++++++++++++++++-- librefi/__main__.py | 7 ++----- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/librefi/__init__.py b/librefi/__init__.py index b2a16fb..4aa355c 100644 --- a/librefi/__init__.py +++ b/librefi/__init__.py @@ -1,6 +1,31 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from .librefi import LibreFi +import sys -__all__ = ['LibreFi'] +from .librefi import LibreFi +from .logger import _Logger, LOG_LEVELS +from .utils import LFiError, FxckerError + + +def _real_main(argv=None): + librefi = LibreFi(logger=_Logger, log_level=LOG_LEVELS.DEBUG) + librefi._periodical_check() + + +def main(argv=None): + try: + _real_main(argv) + except LFiError: + sys.exit('ERROR (core): report this to librefi@selfisekai.rocks') + except FxckerError: + sys.exit('ERROR (fxcker): report this to librefi@selfisekai.rocks') + except KeyboardInterrupt: + sys.exit('\nERROR: Interrupted by user') + + +__all__ = [ + 'LibreFi', + 'main', + '_real_main', +] diff --git a/librefi/__main__.py b/librefi/__main__.py index a59dcf9..dd0062e 100644 --- a/librefi/__main__.py +++ b/librefi/__main__.py @@ -9,10 +9,7 @@ if __package__ is None and not hasattr(sys, 'frozen'): path = os.path.realpath(os.path.abspath(__file__)) sys.path.insert(0, os.path.dirname(os.path.dirname(path))) -from librefi import LibreFi -from .logger import _Logger, LOG_LEVELS - -librefi = LibreFi(logger=_Logger, log_level=LOG_LEVELS.DEBUG) +from librefi import main if __name__ == '__main__': - librefi._periodical_check() + main()