Merge branch 'staging' into modules

# Conflicts:
#	fpakman/app.py
#	fpakman/core/flatpak/worker.py

CHANGELOG.md

@@ -15,7 +15,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - suggestions are now retrieved asynchronously taking 45% less time.
 - search response takes an average of 20% less time ( reaching 35% for several results )
 - app boot takes 98% less time when snapd is installed, but disabled
-### Fixes:
+- FPAKMAN_TRAY (--tray) is not enabled by default (0).
+### Fixes
+- not showing correctly the latest flatpak app versions when bringing the search results
 - [flatpak dependency](https://github.com/vinifmor/fpakman/issues/36)
 
 ## [0.5.0] - 2019-08-06

README.md

@@ -67,7 +67,7 @@ You can change some application settings via environment variables or arguments
 - **FPAKMAN_DISK_CACHE**: enables / disables disk cache. When disk cache is enabled, the installed applications data are loaded faster. Use **0** (disable) or **1** (enable, default).
 - **FPAKMAN_DOWNLOAD_ICONS**: Enables / disables app icons download. It may improve the application speed depending on how applications data are being retrieved. Use **0** (disable) or **1** (enable, default).
 - **FPAKMAN_CHECK_PACKAGING_ONCE**: If the available supported packaging types should be checked ONLY once. It improves the application speed if enabled, but can generate errors if you uninstall any packaging technology while using it, and every time a supported packaging type is installed it will only be available after a restart. Use **0** (disable, default) or **1** (enable).
-- **FPAKMAN_TRAY**: If the tray icon and update-check daemon should be created. Use **0** (disable) or **1** (enable, default).
+- **FPAKMAN_TRAY**: If the tray icon and update-check daemon should be created. Use **0** (disable, default) or **1** (enable).
 - **FPAKMAN_SUGGESTIONS**: If application suggestions should be displayed if no app is installed (runtimes do not count as apps). Use **0** (disable) or **1** (enable, default).
 
 ### How to improve the application performance

aur/panel_entry.py

@@ -1,4 +1,5 @@
 # Generates a .desktop file based on the current python version. Used for AUR installation
+import os
 import sys
 
 desktop_file = """
@@ -7,11 +8,15 @@ Type = Application
 Name = fpakman
 Categories = System;
 Comment = Manage your Flatpak / Snap applications
-Exec = /usr/bin/fpakman --tray=0
-Icon = /usr/lib/python{version}/site-packages/fpakman/resources/img/logo.svg
+Exec = {path}
+Icon = {lib_path}/python{version}/site-packages/fpakman/resources/img/logo.svg
 """
 
 py_version = "{}.{}".format(sys.version_info.major, sys.version_info.minor)
 
+fpakman_cmd = os.getenv('FPAKMAN_PATH', '/usr/bin/fpakman')
+
 with open('fpakman.desktop', 'w+') as f:
-    f.write(desktop_file.format(version=py_version))
+    f.write(desktop_file.format(lib_path=os.getenv('FPAKMAN_LIB_PATH', '/usr/lib'),
+                                version=py_version,
+                                path=fpakman_cmd))

aur/tray_entry.py

@@ -1,17 +1,26 @@
 # Generates a .desktop file based on the current python version. Used for AUR installation
+import os
 import sys
 
 desktop_file = """
 [Desktop Entry]
 Type = Application
-Name = fpakman ( tray )
+Name = fpakman (tray)
 Categories = System;
 Comment = Manage your Flatpak / Snap applications
-Exec = /usr/bin/fpakman
-Icon = /usr/lib/python{version}/site-packages/fpakman/resources/img/logo.svg
+Exec = {path}
+Icon = {lib_path}/python{version}/site-packages/fpakman/resources/img/logo.svg
 """
 
 py_version = "{}.{}".format(sys.version_info.major, sys.version_info.minor)
 
+fpakman_cmd = os.getenv('FPAKMAN_PATH', '/usr/bin/fpakman') + ' --tray=1'
+
 with open('fpakman_tray.desktop', 'w+') as f:
-    f.write(desktop_file.format(version=py_version))
+    f.write(desktop_file.format(lib_path=os.getenv('FPAKMAN_LIB_PATH', '/usr/lib'),
+                                version=py_version,
+                                path=fpakman_cmd))
+
+
+with open('fpakman-tray', 'w') as f:
+    f.write(fpakman_cmd)

fpakman/app_args.py

@@ -39,7 +39,7 @@ def read() -> Namespace:
     parser.add_argument('-co', '--check-packaging-once', action="store",
                         default=os.getenv('FPAKMAN_CHECK_PACKAGING_ONCE', 0), choices=[0, 1], type=int,
                         help='If the available supported packaging types should be checked ONLY once. It improves the application speed if enabled, but can generate errors if you uninstall any packaging technology while using it, and every time a supported packaging type is installed it will only be available after a restart. Default: %(default)s')
-    parser.add_argument('--tray', action="store", default=os.getenv('FPAKMAN_TRAY', 1), choices=[0, 1], type=int,
+    parser.add_argument('--tray', action="store", default=os.getenv('FPAKMAN_TRAY', 0), choices=[0, 1], type=int,
                         help='If the tray icon and update-check daemon should be created. Default: %(default)s')
     parser.add_argument('--sugs', action="store", default=os.getenv('FPAKMAN_SUGGESTIONS', 1), choices=[0, 1], type=int, help='If app suggestions should be displayed if no app is installed (runtimes do not count as apps). Default: %(default)s')
     args = parser.parse_args()

fpakman/view/qt/apps_table.py

@@ -316,7 +316,7 @@ class AppsTable(QTableWidget):
             label_version.setStyleSheet("color: #4EC306; font-weight: bold")
             tooltip = self.window.locale_keys['version.installed_outdated']
 
-        if app_v.model.base_data.version and app_v.model.base_data.latest_version and app_v.model.base_data.version < app_v.model.base_data.latest_version:
+        if app_v.model.installed and app_v.model.base_data.version and app_v.model.base_data.latest_version and app_v.model.base_data.version < app_v.model.base_data.latest_version:
             tooltip = '{}. {}: {}'.format(tooltip, self.window.locale_keys['version.latest'], app_v.model.base_data.latest_version)
             label_version.setText(label_version.text() + ' > {}'.format(app_v.model.base_data.latest_version))