refactoring to use ApplicationContext

This commit is contained in:
Vinicius Moreira
2019-08-30 13:06:24 -03:00
parent 60fc6d8872
commit 71959e8e04
4 changed files with 25 additions and 36 deletions

View File

@@ -2,11 +2,12 @@ import sys
from PyQt5.QtGui import QIcon
from PyQt5.QtWidgets import QApplication
from bauh_api.abstract.controller import ApplicationContext
from bauh_api.util.cache import Cache
from bauh_api.util.disk import DiskCacheLoaderFactory
from bauh_api.util.http import HttpClient
from bauh import __version__, __app_name__, app_args
from bauh import __version__, __app_name__, app_args, ROOT_DIR
from bauh.core import resource, extensions
from bauh.core.controller import GenericSoftwareManager
from bauh.util import util
@@ -16,22 +17,18 @@ from bauh.view.qt.window import ManageWindow
args = app_args.read()
locale_keys = util.get_locale_keys(args.locale)
http_client = HttpClient()
i18n = util.get_locale_keys(args.locale)
caches, cache_map = [], {}
managers = extensions.load_managers(caches=caches,
cache_map=cache_map,
locale_keys=locale_keys,
http_client=http_client,
app_args=args)
context = ApplicationContext(i18n=i18n, http_client=HttpClient(), args=args, app_root_dir=ROOT_DIR)
managers = extensions.load_managers(caches=caches, cache_map=cache_map, context=context)
icon_cache = Cache(expiration_time=args.icon_exp)
caches.append(icon_cache)
disk_loader_factory = DiskCacheLoaderFactory(disk_cache=args.disk_cache, cache_map=cache_map)
manager = GenericSoftwareManager(managers, disk_loader_factory=disk_loader_factory, app_args=args, locale_keys=locale_keys)
manager = GenericSoftwareManager(managers, disk_loader_factory=disk_loader_factory, context=context)
manager.prepare()
app = QApplication(sys.argv)
@@ -39,7 +36,7 @@ app.setApplicationName(__app_name__)
app.setApplicationVersion(__version__)
app.setWindowIcon(QIcon(resource.get_path('img/logo.svg')))
manage_window = ManageWindow(locale_keys=locale_keys,
manage_window = ManageWindow(locale_keys=i18n,
manager=manager,
icon_cache=icon_cache,
disk_cache=args.disk_cache,
@@ -48,7 +45,7 @@ manage_window = ManageWindow(locale_keys=locale_keys,
suggestions=args.sugs)
if args.tray:
trayIcon = TrayIcon(locale_keys=locale_keys,
trayIcon = TrayIcon(locale_keys=i18n,
manager=manager,
manage_window=manage_window,
check_interval=args.check_interval,