fix: Ubuntu 19.04 pip3 install issue

This commit is contained in:
Vinicius Moreira
2019-09-18 10:39:29 -03:00
parent ce43a09ea7
commit e52616e0e5
4 changed files with 58 additions and 54 deletions

1
.gitignore vendored
View File

@@ -5,3 +5,4 @@ __pycache__
*.orig *.orig
dist dist
*.egg-info *.egg-info
build

View File

@@ -38,6 +38,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Fixes: ### Fixes:
- cached Flatpak app current version - cached Flatpak app current version
- disk loader not filling all requested cached data from the disk - disk loader not filling all requested cached data from the disk
- [Ubuntu 19.04 pip3 install issue] (https://github.com/vinifmor/bauh/issues/3)
### Code ### Code
- Code was internally modularized as: **api** (conceptual classes used to create custom software managers), **gems** (software managers), **commons** (common classes shared between the **view** and **gems**), **view** (UI code) - Code was internally modularized as: **api** (conceptual classes used to create custom software managers), **gems** (software managers), **commons** (common classes shared between the **view** and **gems**), **view** (UI code)

View File

@@ -14,68 +14,70 @@ from bauh.view.qt.window import ManageWindow
from bauh.view.util.cache import CacheCleaner, DefaultMemoryCacheFactory from bauh.view.util.cache import CacheCleaner, DefaultMemoryCacheFactory
from bauh.view.util.disk import DefaultDiskCacheLoaderFactory from bauh.view.util.disk import DefaultDiskCacheLoaderFactory
args = app_args.read()
logger = logs.new_logger(__app_name__, bool(args.logs))
app_args.validate(args, logger)
i18n = util.get_locale_keys(args.locale) def main():
args = app_args.read()
logger = logs.new_logger(__app_name__, bool(args.logs))
app_args.validate(args, logger)
cache_cleaner = CacheCleaner() i18n = util.get_locale_keys(args.locale)
cache_factory = DefaultMemoryCacheFactory(expiration_time=args.cache_exp, cleaner=cache_cleaner)
icon_cache = cache_factory.new(args.icon_exp)
context = ApplicationContext(i18n=i18n, cache_cleaner = CacheCleaner()
http_client=HttpClient(logger), cache_factory = DefaultMemoryCacheFactory(expiration_time=args.cache_exp, cleaner=cache_cleaner)
disk_cache=args.disk_cache, icon_cache = cache_factory.new(args.icon_exp)
download_icons=args.download_icons,
app_root_dir=ROOT_DIR,
cache_factory=cache_factory,
disk_loader_factory=DefaultDiskCacheLoaderFactory(disk_cache_enabled=args.disk_cache, logger=logger),
logger=logger)
user_config = config.read()
app = QApplication(sys.argv) context = ApplicationContext(i18n=i18n,
app.setApplicationName(__app_name__) http_client=HttpClient(logger),
app.setApplicationVersion(__version__) disk_cache=args.disk_cache,
app.setWindowIcon(QIcon(resource.get_path('img/logo.svg'))) download_icons=args.download_icons,
app_root_dir=ROOT_DIR,
cache_factory=cache_factory,
disk_loader_factory=DefaultDiskCacheLoaderFactory(disk_cache_enabled=args.disk_cache, logger=logger),
logger=logger)
user_config = config.read()
if user_config.style: app = QApplication(sys.argv)
app.setStyle(user_config.style) app.setApplicationName(__app_name__)
else: app.setApplicationVersion(__version__)
if app.style().objectName().lower() not in {'fusion', 'breeze'}: app.setWindowIcon(QIcon(resource.get_path('img/logo.svg')))
app.setStyle('Fusion')
managers = gems.load_managers(context=context, locale=args.locale, enabled_gems=user_config.enabled_gems if user_config.enabled_gems else None) if user_config.style:
app.setStyle(user_config.style)
else:
if app.style().objectName().lower() not in {'fusion', 'breeze'}:
app.setStyle('Fusion')
manager = GenericSoftwareManager(managers, context=context, app_args=args) managers = gems.load_managers(context=context, locale=args.locale, enabled_gems=user_config.enabled_gems if user_config.enabled_gems else None)
manager.prepare()
manage_window = ManageWindow(i18n=i18n, manager = GenericSoftwareManager(managers, context=context, app_args=args)
manager.prepare()
manage_window = ManageWindow(i18n=i18n,
manager=manager,
icon_cache=icon_cache,
disk_cache=args.disk_cache,
download_icons=bool(args.download_icons),
screen_size=app.primaryScreen().size(),
suggestions=args.sugs,
display_limit=args.max_displayed,
config=user_config,
context=context)
if args.tray:
tray_icon = TrayIcon(locale_keys=i18n,
manager=manager, manager=manager,
icon_cache=icon_cache, manage_window=manage_window,
disk_cache=args.disk_cache, check_interval=args.check_interval,
download_icons=bool(args.download_icons), update_notification=bool(args.update_notification),)
screen_size=app.primaryScreen().size(), manage_window.set_tray_icon(tray_icon)
suggestions=args.sugs, tray_icon.show()
display_limit=args.max_displayed,
config=user_config,
context=context)
if args.tray: if args.show_panel:
tray_icon = TrayIcon(locale_keys=i18n, tray_icon.show_manage_window()
manager=manager, else:
manage_window=manage_window, manage_window.refresh_apps()
check_interval=args.check_interval, manage_window.show()
update_notification=bool(args.update_notification),)
manage_window.set_tray_icon(tray_icon)
tray_icon.show()
if args.show_panel: cache_cleaner.start()
tray_icon.show_manage_window()
else:
manage_window.refresh_apps()
manage_window.show()
cache_cleaner.start() sys.exit(app.exec_())
sys.exit(app.exec_())

View File

@@ -35,7 +35,7 @@ setup(
install_requires=requirements, install_requires=requirements,
entry_points={ entry_points={
"console_scripts": [ "console_scripts": [
"{name}={name}.app".format(name=NAME) "{name}={name}.app:main".format(name=NAME)
] ]
}, },
include_package_data=True, include_package_data=True,