From 5e74d79359da48eaae2c784f346ac8f9f2c3c50f Mon Sep 17 00:00:00 2001 From: Vinicius Moreira Date: Thu, 11 Jul 2019 15:55:22 -0300 Subject: [PATCH] refactoring app name and improving CHANGELOG.md --- CHANGELOG.md | 8 ++++---- fpakman/app.py | 10 ++++------ fpakman/view/qt/about.py | 4 ++-- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8fa4af78..d85866ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,11 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [0.3.1] ### Improvements -- Console output now is optional and not shown by default. -- Cleaning search bar when 'Refresh' is clicked. -- Full Flatpak database is not loaded during initialization (management panel is quickly available for the user) +- Console output now is optional and not shown by default +- Search bar is cleaned when 'Refresh' is clicked +- Full Flatpak database is not loaded during initialization: speeds up the process and reduces memory usage - Applications data not available offline are now retrieved from Flathub API on demand and cached in memory and disk (only installed) -- In-memory cached data have an expiration time and are cleaned overtime to reduce memory usage. +- In-memory cached data have an expiration time and are cleaned overtime to reduce memory usage - Code was refactored to support other types of packaging in the future (e.g: snap) ### Fixes: diff --git a/fpakman/app.py b/fpakman/app.py index 65389f89..2ec1d15c 100755 --- a/fpakman/app.py +++ b/fpakman/app.py @@ -6,7 +6,7 @@ from PyQt5.QtGui import QIcon from PyQt5.QtWidgets import QApplication from colorama import Fore -from fpakman import __version__ +from fpakman import __version__, __app_name__ from fpakman.core import resource from fpakman.core.disk import DiskCacheLoaderFactory from fpakman.core.structure import prepare_folder_structure @@ -16,18 +16,16 @@ from fpakman.util.cache import Cache from fpakman.util.memory import CacheCleaner from fpakman.view.qt.systray import TrayIcon -app_name = 'fpakman' - def log_msg(msg: str, color: int = None): if color is None: - print('[{}] {}'.format(app_name, msg)) + print('[{}] {}'.format(__app_name__, msg)) else: - print('{}[{}] {}{}'.format(color, app_name, msg, Fore.RESET)) + print('{}[{}] {}{}'.format(color, __app_name__, msg, Fore.RESET)) -parser = argparse.ArgumentParser(prog=app_name, description="GUI for Flatpak applications management") +parser = argparse.ArgumentParser(prog=__app_name__, description="GUI for Flatpak applications management") parser.add_argument('-v', '--version', action='version', version='%(prog)s {}'.format(__version__)) parser.add_argument('-e', '--cache-exp', action="store", default=int(os.getenv('FPAKMAN_CACHE_EXPIRATION', 60 * 60)), type=int, help='cached API data expiration time in SECONDS. Default: %(default)s') parser.add_argument('-ie', '--icon-exp', action="store", default=int(os.getenv('FPAKMAN_ICON_EXPIRATION', 60 * 5)), type=int, help='cached icons expiration time in SECONDS. Default: %(default)s') diff --git a/fpakman/view/qt/about.py b/fpakman/view/qt/about.py index b9e319db..87810957 100644 --- a/fpakman/view/qt/about.py +++ b/fpakman/view/qt/about.py @@ -2,7 +2,7 @@ from PyQt5.QtCore import Qt from PyQt5.QtGui import QPixmap from PyQt5.QtWidgets import QVBoxLayout, QDialog, QLabel -from fpakman import __version__ +from fpakman import __version__, __app_name__ from fpakman.core import resource PROJECT_URL = 'https://github.com/vinifmor/fpakman' @@ -22,7 +22,7 @@ class AboutDialog(QDialog): label_logo.setAlignment(Qt.AlignCenter) layout.addWidget(label_logo) - label_name = QLabel('fpakman ( {} {} )'.format(locale_keys['flatpak.info.version'].lower(), __version__)) + label_name = QLabel('{} ( {} {} )'.format(__app_name__, locale_keys['flatpak.info.version'].lower(), __version__)) label_name.setStyleSheet('font-weight: bold;') label_name.setAlignment(Qt.AlignCenter) layout.addWidget(label_name)