From 6554d2062fdfbdcea76b36649cf65c7b12968d34 Mon Sep 17 00:00:00 2001 From: Vinicius Moreira Date: Mon, 29 Jul 2019 12:09:41 -0300 Subject: [PATCH] fixes --- fpakman/app.py | 18 ++++-------------- fpakman/core/controller.py | 3 ++- fpakman/view/qt/apps_table.py | 2 +- fpakman/view/qt/systray.py | 4 ++-- fpakman/view/qt/thread.py | 7 +++---- fpakman/view/qt/view_model.py | 3 ++- fpakman/view/qt/window.py | 5 +++-- 7 files changed, 17 insertions(+), 25 deletions(-) diff --git a/fpakman/app.py b/fpakman/app.py index 6d795dde..4445f443 100755 --- a/fpakman/app.py +++ b/fpakman/app.py @@ -1,7 +1,6 @@ import argparse import os import sys -from pathlib import Path import requests from PyQt5.QtGui import QIcon @@ -12,9 +11,6 @@ from fpakman import __version__, __app_name__ from fpakman.core import resource from fpakman.core.controller import GenericApplicationManager from fpakman_api.util.disk import DiskCacheLoaderFactory -from fpakman.core.flatpak.constants import FLATPAK_CACHE_PATH -from fpakman.core.flatpak.controller import FlatpakManager -from fpakman.core.flatpak.model import FlatpakApplication from fpakman.util import util from fpakman.util.cache import Cache from fpakman.util.memory import CacheCleaner @@ -58,12 +54,6 @@ if args.check_interval <= 0: log_msg("'check-interval' set as '{}'. It must be >= 0. Aborting...".format(args.check_interval), Fore.RED) exit(1) -if not args.flatpak: - log_msg("'flatpak' is disabled.", Fore.YELLOW) - -if not args.snap: - log_msg("'snap' is disabled.", Fore.YELLOW) - if args.update_notification == 0: log_msg('updates notifications are disabled', Fore.YELLOW) @@ -80,8 +70,8 @@ caches = [] cache_map = {} managers = [] -if args.flatpak: - pass +# if args.flatpak: +# pass # flatpak_api_cache = Cache(expiration_time=args.cache_exp) # cache_map[FlatpakApplication] = flatpak_api_cache # managers.append(FlatpakManager(app_args=args, api_cache=flatpak_api_cache, disk_cache=args.disk_cache, http_session=http_session, locale_keys=locale_keys)) @@ -90,8 +80,8 @@ if args.flatpak: # if args.disk_cache: # Path(FLATPAK_CACHE_PATH).mkdir(parents=True, exist_ok=True) -if args.snap: - pass +# if args.snap: +# pass # snap_api_cache = Cache(expiration_time=args.cache_exp) # cache_map[SnapApplication] = snap_api_cache # managers.append(SnapManager(app_args=args, disk_cache=args.disk_cache, api_cache=snap_api_cache, http_session=http_session, locale_keys=locale_keys)) diff --git a/fpakman/core/controller.py b/fpakman/core/controller.py index 1fa36cd3..85787584 100755 --- a/fpakman/core/controller.py +++ b/fpakman/core/controller.py @@ -7,13 +7,14 @@ from fpakman_api.util.disk import DiskCacheLoader from fpakman_api.util.disk import DiskCacheLoaderFactory from fpakman_api.util.system import FpakmanProcess +from fpakman import ROOT_DIR from fpakman.util.cache import Cache class GenericApplicationManager(ApplicationManager): def __init__(self, managers: List[ApplicationManager], disk_loader_factory: DiskCacheLoaderFactory, app_args: Namespace): - super(ApplicationManager, self).__init__(cache_factory=None, locale_keys=None) + super(GenericApplicationManager, self).__init__(app_args=app_args, cache_factory=None, locale_keys=None, fpakman_root_dir=ROOT_DIR, http_session=None) self.managers = managers self.map = {m.get_app_type(): m for m in self.managers} self.disk_loader_factory = disk_loader_factory diff --git a/fpakman/view/qt/apps_table.py b/fpakman/view/qt/apps_table.py index e4e547a6..dd0f4409 100644 --- a/fpakman/view/qt/apps_table.py +++ b/fpakman/view/qt/apps_table.py @@ -7,9 +7,9 @@ from PyQt5.QtGui import QPixmap, QIcon, QCursor from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkRequest from PyQt5.QtWidgets import QTableWidget, QTableView, QMenu, QAction, QTableWidgetItem, QToolButton, QWidget, \ QHeaderView, QLabel, QHBoxLayout +from fpakman_api.abstract.model import ApplicationStatus from fpakman.core import resource -from fpakman.core.model import ApplicationStatus from fpakman.util.cache import Cache from fpakman.view.qt import dialog from fpakman.view.qt.view_model import ApplicationView, ApplicationViewStatus diff --git a/fpakman/view/qt/systray.py b/fpakman/view/qt/systray.py index df4f0450..1878b6cd 100755 --- a/fpakman/view/qt/systray.py +++ b/fpakman/view/qt/systray.py @@ -5,11 +5,11 @@ from typing import List from PyQt5.QtCore import QThread, pyqtSignal, QCoreApplication, Qt from PyQt5.QtGui import QIcon from PyQt5.QtWidgets import QSystemTrayIcon, QMenu +from fpakman_api.abstract.model import ApplicationUpdate from fpakman import __app_name__ -from fpakman.core import resource, system +from fpakman.core import resource from fpakman.core.controller import ApplicationManager -from fpakman.core.model import ApplicationUpdate from fpakman.view.qt.about import AboutDialog from fpakman.view.qt.window import ManageWindow diff --git a/fpakman/view/qt/thread.py b/fpakman/view/qt/thread.py index ab2dbbb2..58e484fb 100644 --- a/fpakman/view/qt/thread.py +++ b/fpakman/view/qt/thread.py @@ -1,15 +1,14 @@ -import subprocess import time from datetime import datetime, timedelta from typing import List import requests from PyQt5.QtCore import QThread, pyqtSignal +from fpakman_api.abstract.model import ApplicationStatus +from fpakman_api.exception import NoInternetException +from fpakman_api.util.system import FpakmanProcess from fpakman.core.controller import ApplicationManager -from fpakman.core.exception import NoInternetException -from fpakman.core.model import ApplicationStatus -from fpakman.core.system import FpakmanProcess from fpakman.util.cache import Cache from fpakman.view.qt import dialog from fpakman.view.qt.view_model import ApplicationView diff --git a/fpakman/view/qt/view_model.py b/fpakman/view/qt/view_model.py index 4b34c024..ac49610f 100644 --- a/fpakman/view/qt/view_model.py +++ b/fpakman/view/qt/view_model.py @@ -1,6 +1,7 @@ from enum import Enum -from fpakman.core.model import Application, ApplicationStatus +from fpakman_api.abstract.model import ApplicationStatus, Application + from fpakman.util import util diff --git a/fpakman/view/qt/window.py b/fpakman/view/qt/window.py index 0c92c8b7..cc07a52e 100755 --- a/fpakman/view/qt/window.py +++ b/fpakman/view/qt/window.py @@ -6,10 +6,11 @@ from PyQt5.QtCore import QEvent, Qt from PyQt5.QtGui import QIcon, QWindowStateChangeEvent, QPixmap from PyQt5.QtWidgets import QWidget, QVBoxLayout, QApplication, QCheckBox, QHeaderView, QToolButton, QToolBar, \ QSizePolicy, QLabel, QPlainTextEdit, QLineEdit, QProgressBar, QHBoxLayout +from fpakman_api.abstract.model import Application +from fpakman_api.util import system -from fpakman.core import resource, system +from fpakman.core import resource from fpakman.core.controller import ApplicationManager -from fpakman.core.model import Application from fpakman.util.cache import Cache from fpakman.view.qt.apps_table import AppsTable from fpakman.view.qt.history import HistoryDialog