search and install

fpakman/core/controller.py

@@ -1,5 +1,5 @@
 from datetime import datetime, timedelta
-from threading import Lock, Thread
+from threading import Lock
 from typing import List
 
 import requests
@@ -19,17 +19,12 @@ class FlatpakManager:
         self.lock_db_read = Lock()
         self.lock_read = Lock()
 
-    # TODO remove if not necessary for future releases
-    def load_full_database_async(self):
-        Thread(target=self.load_full_database, daemon=True).start()
-
-    # TODO remove if not necessary for future releases
     def load_full_database(self):
 
         self.lock_db_read.acquire()
 
         try:
-            res = self.http_session.get(__FLATHUB_API_URL__ + '/apps')
+            res = self.http_session.get(__FLATHUB_API_URL__ + '/apps', timeout=30)
 
             if res.status_code == 200:
                 for app in res.json():
@@ -40,7 +35,7 @@ class FlatpakManager:
     def _request_app_data(self, app_id: str):
 
         try:
-            res = self.http_session.get('{}/apps/{}'.format(__FLATHUB_API_URL__, app_id), timeout=60)
+            res = self.http_session.get('{}/apps/{}'.format(__FLATHUB_API_URL__, app_id), timeout=30)
 
             if res.status_code == 200:
                 return res.json()
@@ -50,6 +45,58 @@ class FlatpakManager:
             print("Could not retrieve app data for id '{}'. Timeout".format(app_id))
             return None
 
+    def _fill_api_data(self, app: dict):
+
+        api_data = self.cache_apps.get(app['id'])
+
+        if (not app['runtime'] and not api_data) or (api_data and api_data.get('expires_at') and api_data['expires_at'] <= datetime.utcnow()):  # if api data is not cached or expired, tries to retrieve it
+            api_data = self._request_app_data(app['id'])
+
+            if api_data:
+                api_data['expires_at'] = datetime.utcnow() + timedelta(seconds=self.cache_expire)
+                self.cache_apps[app['id']] = api_data
+
+        if not api_data:
+            for attr in ('latest_version', 'icon', 'description'):
+                if attr not in app:
+                    app[attr] = None
+        else:
+            app['latest_version'] = api_data.get('currentReleaseVersion')
+            app['icon'] = api_data.get('iconMobileUrl')
+
+            for attr in ('name', 'description'):
+                if not app.get(attr):
+                    app[attr] = api_data.get(attr)
+
+            if app['icon'].startswith('/'):
+                app['icon'] = __FLATHUB_URL__ + app['icon']
+
+    def search(self, word: str) -> List[dict]:
+
+        res = []
+        apps_found = flatpak.search(word)
+
+        if apps_found:
+
+            already_read = set()
+            installed_apps = self.read_installed()
+
+            if installed_apps:
+                for app in apps_found:
+                    for installed_app in installed_apps:
+                        if app['id'] == installed_app['id']:
+                            res.append(installed_app)
+                            already_read.add(app['id'])
+
+            for app in apps_found:
+                if app['id'] not in already_read:
+                    app['update'] = False
+                    app['installed'] = False
+                    self._fill_api_data(app)
+                    res.append(app)
+
+        return res
+
     def read_installed(self) -> List[dict]:
 
         self.lock_read.acquire()
@@ -63,25 +110,9 @@ class FlatpakManager:
                 available_updates = flatpak.list_updates_as_str()
 
                 for app in installed:
-
-                    app_data = self.cache_apps.get(app['id'])
-
-                    if (not app['runtime'] and not app_data) or (app_data and app_data['expires_at'] <= datetime.utcnow()):  # if data is not cached or expired, tries to retrieve it
-                        app_data = self._request_app_data(app['id'])
-                        app_data['expires_at'] = datetime.utcnow() + timedelta(seconds=self.cache_expire)
-                        self.cache_apps[app['id']] = app_data
-
-                    if not app_data:
-                        app['latest_version'] = None
-                        app['icon'] = None
-                    else:
-                        app['latest_version'] = app_data['currentReleaseVersion']
-                        app['icon'] = app_data['iconMobileUrl']
-
-                        if app['icon'].startswith('/'):
-                            app['icon'] = __FLATHUB_URL__ + app['icon']
-
+                    self._fill_api_data(app)
                     app['update'] = app['id'] in available_updates
+                    app['installed'] = True
 
             return installed
 

fpakman/core/flatpak.py

@@ -147,3 +147,67 @@ def get_app_commits_data(app_ref: str, origin: str) -> List[dict]:
             commit = {}
 
     return commits
+
+
+def search(word: str) -> List[dict]:
+    cli_version = get_version()
+
+    res = system.run_cmd('{} search {}'.format(BASE_CMD, word))
+
+    found = []
+
+    split_res = res.split('\n')
+
+    if split_res and split_res[0].lower() != 'no matches found':
+        for info in split_res:
+            if info:
+                info_list = info.split('\t')
+
+                if cli_version >= '1.3.0':
+                    version = info_list[3].strip()
+                    found.append({
+                        'name': info_list[0].strip(),
+                        'description': info_list[1].strip(),
+                        'id': info_list[2].strip(),
+                        'version': version,
+                        'latest_version': version,
+                        'branch': info_list[4].strip(),
+                        'origin': info_list[5].strip(),
+                        'runtime': False,
+                        'arch': None,  # unknown at this moment,
+                        'ref': None  # unknown at this moment
+                    })
+                elif cli_version >= '1.2.0':
+                    desc = info_list[0].split('-')
+                    version = info_list[2].strip()
+                    found.append({
+                        'name': desc[0].strip(),
+                        'description': desc[1].strip(),
+                        'id': info_list[1].strip(),
+                        'version': version,
+                        'latest_version': version,
+                        'branch': info_list[3].strip(),
+                        'origin': info_list[4].strip(),
+                        'runtime': False,
+                        'arch': None,  # unknown at this moment,
+                        'ref': None  # unknown at this moment
+                    })
+                else:
+                    version = info_list[1].strip()
+                    found.append({
+                        'name': '',
+                        'description': info_list[4].strip(),
+                        'id': info_list[0].strip(),
+                        'version': version,
+                        'latest_version': version,
+                        'branch': info_list[2].strip(),
+                        'origin': info_list[3].strip(),
+                        'runtime': False,
+                        'arch': None,  # unknown at this moment,
+                        'ref': None  # unknown at this moment
+                    })
+    return found
+
+
+def install_and_stream(app_id: str, origin: str):
+    return system.stream_cmd([BASE_CMD, 'install', origin, app_id, '-y'])

fpakman/core/system.py

@@ -1,6 +1,9 @@
+import os
 import subprocess
 from typing import List
 
+from fpakman.core import resource
+
 
 def run_cmd(cmd: str, expected_code: int = 0, ignore_return_code: bool = False) -> str:
     res = subprocess.run(cmd, shell=True, stdout=subprocess.PIPE, env={'LANG': 'en'})
@@ -9,3 +12,8 @@ def run_cmd(cmd: str, expected_code: int = 0, ignore_return_code: bool = False)
 
 def stream_cmd(cmd: List[str]):
     return subprocess.Popen(cmd, stdout=subprocess.PIPE, env={'LANG': 'en'}).stdout
+
+
+def notify_user(msg: str, icon_path: str = resource.get_path('img/flathub_45.svg')):
+    if bool(os.getenv('FPAKMAN_UPDATE_NOTIFICATION', 1)):
+        os.system("notify-send {} '{}'".format("-i {}".format(icon_path) if icon_path else '', msg))

fpakman/core/util.py

@@ -2,6 +2,9 @@ import locale
 
 from fpakman.core import resource
 import glob
+import re
+
+HTML_RE = re.compile(r'<[^>]+>')
 
 
 def get_locale_keys(key: str = None):
@@ -38,3 +41,7 @@ def get_locale_keys(key: str = None):
             locale_obj[keyval[0].strip()] = keyval[1].strip()
 
     return locale_obj
+
+
+def strip_html(string: str):
+    return HTML_RE.sub('', string)