diff --git a/dangerzone/cli.py b/dangerzone/cli.py index 7f2f85f..bceb6f8 100644 --- a/dangerzone/cli.py +++ b/dangerzone/cli.py @@ -5,9 +5,8 @@ import click import colorama from colorama import Fore, Style # type: ignore -from .util import install_container, display_banner -from .common import Common -from .container import convert +from dangerzone import container +from dangerzone.common import Common import dangerzone.util as dzutil @@ -23,7 +22,7 @@ def print_header(s): def cli_main(output_filename, ocr_lang, filename): colorama.init(autoreset=True) common = Common() - display_banner() + dzutil.display_banner() # Validate filename valid = True @@ -85,7 +84,7 @@ def cli_main(output_filename, ocr_lang, filename): return # Ensure container is installed - install_container() + dzutil.install_container() # Convert the document print_header("Converting document to safe PDF") @@ -102,7 +101,7 @@ def cli_main(output_filename, ocr_lang, filename): except: click.echo(f"Invalid JSON returned from container: {line}") - if convert( + if container.convert( common.input_filename, common.output_filename, ocr_lang, diff --git a/dangerzone/gui/__init__.py b/dangerzone/gui/__init__.py index 608b064..d890a27 100644 --- a/dangerzone/gui/__init__.py +++ b/dangerzone/gui/__init__.py @@ -9,10 +9,10 @@ import uuid import colorama -from .application import Application -from .gui_common import GuiCommon -from .main_window import MainWindow -from .systray import SysTray +from dangerzone.gui.application import Application +from dangerzone.gui.gui_common import GuiCommon +from dangerzone.gui.main_window import MainWindow +from dangerzone.gui.systray import SysTray @click.command() diff --git a/dangerzone/gui/gui_common.py b/dangerzone/gui/gui_common.py index 7cbff8b..4925c73 100644 --- a/dangerzone/gui/gui_common.py +++ b/dangerzone/gui/gui_common.py @@ -6,8 +6,8 @@ import pipes from PySide6 import QtGui from colorama import Fore -from . import Application -from .settings import Settings +from dangerzone.gui import Application +from dangerzone.gui.settings import Settings if platform.system() == "Linux": from xdg.DesktopEntry import DesktopEntry # type: ignore diff --git a/dangerzone/gui/main_window.py b/dangerzone/gui/main_window.py index 06ac7c6..c7f6d03 100644 --- a/dangerzone/gui/main_window.py +++ b/dangerzone/gui/main_window.py @@ -9,10 +9,10 @@ from PySide6.QtGui import QIcon from colorama import Style, Fore import dangerzone.util as dzutil -from . import GuiCommon -from ..common import Common -from ..container import convert -from ..util import install_container +from dangerzone.gui import GuiCommon +from dangerzone.common import Common +from dangerzone.container import convert +from dangerzone.util import install_container class MainWindow(QtWidgets.QMainWindow):