[improvement][appimage] new initialization task that checks if the installed AppImage files have symlinks associated with

bauh/gems/appimage/controller.py

@@ -29,10 +29,10 @@ from bauh.commons.config import save_config
 from bauh.commons.html import bold
 from bauh.commons.system import SystemProcess, new_subprocess, ProcessHandler, run_cmd, SimpleProcess
 from bauh.gems.appimage import query, INSTALLATION_PATH, LOCAL_PATH, SUGGESTIONS_FILE, CONFIG_FILE, ROOT_DIR, \
-    CONFIG_DIR, UPDATES_IGNORED_FILE, SYMLINKS_DIR
+    CONFIG_DIR, UPDATES_IGNORED_FILE, util
 from bauh.gems.appimage.config import read_config
 from bauh.gems.appimage.model import AppImage
-from bauh.gems.appimage.worker import DatabaseUpdater
+from bauh.gems.appimage.worker import DatabaseUpdater, SymlinksVerifier
 
 DB_APPS_PATH = '{}/{}'.format(str(Path.home()), '.local/share/bauh/appimage/apps.db')
 DB_RELEASES_PATH = '{}/{}'.format(str(Path.home()), '.local/share/bauh/appimage/releases.db')
@@ -50,7 +50,7 @@ class AppImageManager(SoftwareManager):
         super(AppImageManager, self).__init__(context=context)
         self.i18n = context.i18n
         self.api_cache = context.cache_factory.new()
-        context.disk_loader_factory.map(AppImageManager, self.api_cache)
+        context.disk_loader_factory.map(AppImage, self.api_cache)
         self.enabled = True
         self.http_client = context.http_client
         self.logger = context.logger
@@ -413,12 +413,6 @@ class AppImageManager(SoftwareManager):
                 if f.endswith('.desktop'):
                     return f
 
-    def _find_appimage_file(self, folder: str) -> str:
-        for r, d, files in os.walk(folder):
-            for f in files:
-                if f.lower().endswith('.appimage'):
-                    return '{}/{}'.format(folder, f)
-
     def _find_icon_file(self, folder: str) -> str:
         for r, d, files in os.walk(folder):
             for f in files:
@@ -524,8 +518,7 @@ class AppImageManager(SoftwareManager):
                     except:
                         traceback.print_exc()
 
-                    self._add_symlink(pkg, file_path, watcher)
-
+                    SymlinksVerifier.create_symlink(app=pkg, file_path=file_path, logger=self.logger, watcher=watcher)
                     return TransactionResult(success=True, installed=[pkg], removed=[])
                 else:
                     watcher.show_message(title=self.i18n['error'],
@@ -539,59 +532,6 @@ class AppImageManager(SoftwareManager):
         handler.handle(SystemProcess(new_subprocess(['rm', '-rf', out_dir])))
         return TransactionResult.fail()
 
-    def _add_symlink(self, app: AppImage, file_path: str, watcher: ProcessWatcher = None):
-        possible_names = (app.name.lower(), '{}-appimage'.format(app.name.lower()))
-
-        if os.path.exists(SYMLINKS_DIR) and not os.path.isdir(SYMLINKS_DIR):
-            self.logger.warning("'{}' is not a directory. It will not be possible to create a symlink for '{}'".format(SYMLINKS_DIR, app.name))
-            return
-
-        available_system_dirs = (SYMLINKS_DIR, *(l for l in ('/usr/bin', '/usr/local/bin') if os.path.isdir(l)))
-
-        # checking if the link already exists:
-
-        available_name = None
-        for name in possible_names:
-            available_name = name
-            for sysdir in available_system_dirs:
-                if os.path.exists('{}/{}'.format(sysdir, name)):
-                    available_name = None
-                    break
-
-            if available_name:
-                break
-
-        if not available_name:
-            msg = "It was not possible to create a symlink for '{}' because the names {} are already available on the system".format(app.name,
-                                                                                                                                     possible_names)
-            self.logger.warning(msg)
-            if watcher:
-                watcher.print('[warning] {}'.format(msg))
-        else:
-            try:
-                Path(SYMLINKS_DIR).mkdir(parents=True, exist_ok=True)
-            except:
-                self.logger.error("Could not create symlink directory '{}'".format(SYMLINKS_DIR))
-                return
-
-            symlink_path = '{}/{}'.format(SYMLINKS_DIR, available_name)
-
-            try:
-                os.symlink(src=file_path, dst=symlink_path)
-                app.symlink = symlink_path
-
-                msg = "symlink successfully created at {}".format(symlink_path)
-                self.logger.info(msg)
-
-                if watcher:
-                    watcher.print(msg)
-            except:
-                msg = "Could not create the symlink '{}'".format(symlink_path)
-                self.logger.error(msg)
-
-                if watcher:
-                    watcher.print('[error] {}'.format(msg))
-
     def _gen_desktop_entry_path(self, app: AppImage) -> str:
         return '{}/bauh_appimage_{}.desktop'.format(DESKTOP_ENTRIES_PATH, app.name.lower())
 
@@ -624,6 +564,9 @@ class AppImageManager(SoftwareManager):
         elif internet_available:
             updater.download_databases()  # only once
 
+        symlink_check = SymlinksVerifier(taskman=task_manager, i18n=self.i18n, logger=self.logger)
+        symlink_check.start()
+
     def list_updates(self, internet_available: bool) -> List[PackageUpdate]:
         res = self.read_installed(disk_loader=None, internet_available=internet_available)
 
@@ -692,7 +635,7 @@ class AppImageManager(SoftwareManager):
     def launch(self, pkg: AppImage):
         installation_dir = pkg.get_disk_cache_path()
         if os.path.exists(installation_dir):
-            appimag_path = self._find_appimage_file(installation_dir)
+            appimag_path = util.find_appimage_file(installation_dir)
 
             if appimag_path:
                 subprocess.Popen([appimag_path])