diff --git a/bauh/app.py b/bauh/app.py index f688b38e..39652824 100755 --- a/bauh/app.py +++ b/bauh/app.py @@ -3,12 +3,12 @@ import sys from PyQt5.QtGui import QIcon from PyQt5.QtWidgets import QApplication from bauh_api.abstract.controller import ApplicationContext -from bauh_api.util.http import HttpClient +from bauh_api.http import HttpClient from bauh import __version__, __app_name__, app_args, ROOT_DIR -from bauh.core import resource, extensions +from bauh.core import extensions from bauh.core.controller import GenericSoftwareManager -from bauh.util import util, logs +from bauh.util import util, logs, resource from bauh.util.cache import DefaultMemoryCacheFactory, CacheCleaner from bauh.util.disk import DefaultDiskCacheLoaderFactory from bauh.view.qt.systray import TrayIcon diff --git a/bauh/core/extensions.py b/bauh/core/extensions.py index d7b9c648..1c1ea698 100644 --- a/bauh/core/extensions.py +++ b/bauh/core/extensions.py @@ -8,7 +8,7 @@ from bauh_api.abstract.controller import SoftwareManager, ApplicationContext from bauh import __app_name__ from bauh.util import util -ignore_modules = {'{}_api'.format(__app_name__)} +ignore_modules = {'{}_api'.format(__app_name__), '{}_commons'.format(__app_name__)} ext_pattern = '{}_'.format(__app_name__) diff --git a/bauh/util/cache.py b/bauh/util/cache.py index 9e822257..5683a1e6 100644 --- a/bauh/util/cache.py +++ b/bauh/util/cache.py @@ -1,7 +1,6 @@ import datetime import time from threading import Lock, Thread -from typing import List from bauh_api.abstract.cache import MemoryCache, MemoryCacheFactory diff --git a/bauh/util/html.py b/bauh/util/html.py new file mode 100644 index 00000000..696973b9 --- /dev/null +++ b/bauh/util/html.py @@ -0,0 +1,7 @@ +import re + +HTML_RE = re.compile(r'<[^>]+>') + + +def strip_html(string: str): + return HTML_RE.sub('', string) diff --git a/bauh/core/resource.py b/bauh/util/resource.py similarity index 100% rename from bauh/core/resource.py rename to bauh/util/resource.py diff --git a/bauh/util/util.py b/bauh/util/util.py index f6999540..aaa4072f 100644 --- a/bauh/util/util.py +++ b/bauh/util/util.py @@ -1,11 +1,9 @@ import glob import locale +import os -from bauh_api.util import system -from bauh_api.util.resource import get_path - -from bauh import ROOT_DIR, __app_name__ -from bauh.core import resource +from bauh import __app_name__ +from bauh.util import resource def get_locale_keys(key: str = None, locale_dir: str = resource.get_path('locale')): @@ -42,5 +40,5 @@ def get_locale_keys(key: str = None, locale_dir: str = resource.get_path('locale return locale_obj -def notify_user(msg: str, icon_path: str = get_path('img/logo.svg', ROOT_DIR)): - system.notify_user(msg=msg, app_name=__app_name__, icon_path=icon_path) +def notify_user(msg: str, icon_path: str = resource.get_path('img/logo.svg')): + os.system("notify-send -a {} {} '{}'".format(__app_name__, "-i {}".format(icon_path) if icon_path else '', msg)) diff --git a/bauh/view/qt/about.py b/bauh/view/qt/about.py index 7c3899d1..85856d42 100644 --- a/bauh/view/qt/about.py +++ b/bauh/view/qt/about.py @@ -3,7 +3,7 @@ from PyQt5.QtGui import QPixmap from PyQt5.QtWidgets import QVBoxLayout, QDialog, QLabel from bauh import __version__, __app_name__ -from bauh.core import resource +from bauh.util import resource PROJECT_URL = 'https://github.com/vinifmor/' + __app_name__ LICENSE_URL = 'https://raw.githubusercontent.com/vinifmor/{}/master/LICENSE'.format(__app_name__) diff --git a/bauh/view/qt/apps_table.py b/bauh/view/qt/apps_table.py index 2f6a60ce..056ff15b 100644 --- a/bauh/view/qt/apps_table.py +++ b/bauh/view/qt/apps_table.py @@ -9,9 +9,9 @@ from PyQt5.QtWidgets import QTableWidget, QTableView, QMenu, QAction, QTableWidg QHeaderView, QLabel, QHBoxLayout, QPushButton, QToolBar from bauh_api.abstract.cache import MemoryCache from bauh_api.abstract.model import PackageStatus -from bauh_api.util.html import strip_html -from bauh.core import resource +from bauh.util import resource +from bauh.util.html import strip_html from bauh.view.qt import dialog from bauh.view.qt.view_model import PackageView, PackageViewStatus diff --git a/bauh/view/qt/dialog.py b/bauh/view/qt/dialog.py index 66bdba05..1f2f9e9f 100644 --- a/bauh/view/qt/dialog.py +++ b/bauh/view/qt/dialog.py @@ -4,7 +4,7 @@ from PyQt5.QtGui import QIcon from PyQt5.QtWidgets import QMessageBox, QLabel, QWidget, QHBoxLayout from bauh_api.abstract.view import MessageType -from bauh.core import resource +from bauh.util import resource MSG_TYPE_MAP = { MessageType.ERROR: QMessageBox.Critical, diff --git a/bauh/view/qt/info.py b/bauh/view/qt/info.py index 0cf7f824..4459f539 100644 --- a/bauh/view/qt/info.py +++ b/bauh/view/qt/info.py @@ -4,7 +4,7 @@ from PyQt5.QtWidgets import QDialog, QVBoxLayout, QGroupBox, \ QLineEdit, QLabel, QGridLayout, QPushButton, QPlainTextEdit, QToolBar from bauh_api.abstract.cache import MemoryCache -from bauh_api.util.html import strip_html +from bauh.util.html import strip_html IGNORED_ATTRS = {'name', '__app__'} diff --git a/bauh/view/qt/systray.py b/bauh/view/qt/systray.py index bca65616..979d2968 100755 --- a/bauh/view/qt/systray.py +++ b/bauh/view/qt/systray.py @@ -8,9 +8,8 @@ from PyQt5.QtWidgets import QSystemTrayIcon, QMenu from bauh_api.abstract.model import PackageUpdate from bauh import __app_name__ -from bauh.core import resource from bauh_api.abstract.controller import SoftwareManager -from bauh.util import util +from bauh.util import util, resource from bauh.view.qt.about import AboutDialog from bauh.view.qt.window import ManageWindow diff --git a/bauh/view/qt/window.py b/bauh/view/qt/window.py index da208a99..3383b499 100755 --- a/bauh/view/qt/window.py +++ b/bauh/view/qt/window.py @@ -11,8 +11,7 @@ from bauh_api.abstract.controller import SoftwareManager from bauh_api.abstract.model import SoftwarePackage, PackageAction from bauh_api.abstract.view import MessageType -from bauh.core import resource -from bauh.util import util +from bauh.util import util, resource from bauh.view.qt import dialog, commons from bauh.view.qt.about import AboutDialog from bauh.view.qt.apps_table import AppsTable, UpdateToggleButton diff --git a/requirements.txt b/requirements.txt index d7cdacb5..1a1074da 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ pyqt5>=5.12 -bauh_api==0.1.0 \ No newline at end of file +bauh_api>=0.1.0<0.2 \ No newline at end of file