[wgem] fix icon path definition and caching | param --reset cleaning the web environment as well

bauh/gems/web/__init__.py

@@ -6,12 +6,12 @@ from bauh.api.constants import HOME_PATH, DESKTOP_ENTRIES_DIR
 ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
 WEB_PATH = '{}/.local/share/bauh/web'.format(Path.home())
 INSTALLED_PATH = '{}/installed'.format(WEB_PATH)
-BIN_PATH = '{}/runtime'.format(WEB_PATH)
-NODE_DIR_PATH = '{}/node'.format(BIN_PATH)
+ENV_PATH = '{}/env'.format(WEB_PATH)
+NODE_DIR_PATH = '{}/node'.format(ENV_PATH)
 NODE_PATHS = {NODE_DIR_PATH + '/bin'}
 NODE_BIN_PATH = '{}/bin/node'.format(NODE_DIR_PATH)
 NPM_BIN_PATH = '{}/bin/npm'.format(NODE_DIR_PATH)
-NODE_MODULES_PATH = '{}/node_modules'.format(BIN_PATH)
+NODE_MODULES_PATH = '{}/node_modules'.format(ENV_PATH)
 NATIVEFIER_BIN_PATH = '{}/.bin/nativefier'.format(NODE_MODULES_PATH)
 ELECTRON_PATH = '{}/.cache/electron'.format(HOME_PATH)
 ELECTRON_DOWNLOAD_URL = 'https://github.com/electron/electron/releases/download/v{version}/electron-v{version}-linux-{arch}.zip'

bauh/gems/web/controller.py

@@ -11,6 +11,7 @@ from threading import Thread
 from typing import List, Type, Set, Tuple
 
 import yaml
+from colorama import Fore
 
 from bauh.api.abstract.context import ApplicationContext
 from bauh.api.abstract.controller import SoftwareManager, SearchResult
@@ -22,7 +23,8 @@ from bauh.api.abstract.view import MessageType, MultipleSelectComponent, InputOp
 from bauh.api.constants import DESKTOP_ENTRIES_DIR
 from bauh.commons.html import bold
 from bauh.commons.system import ProcessHandler, get_dir_size, get_human_size_str
-from bauh.gems.web import INSTALLED_PATH, nativefier, DESKTOP_ENTRY_PATH_PATTERN, URL_FIX_PATTERN, environment
+from bauh.gems.web import INSTALLED_PATH, nativefier, DESKTOP_ENTRY_PATH_PATTERN, URL_FIX_PATTERN, environment, \
+    ENV_PATH
 from bauh.gems.web.environment import EnvironmentUpdater
 from bauh.gems.web.model import WebApplication
 
@@ -478,3 +480,14 @@ class WebApplicationManager(SoftwareManager):
 
     def get_screenshots(self, pkg: SoftwarePackage) -> List[str]:
         pass
+
+    def clear_data(self):
+        if os.path.exists(ENV_PATH):
+            print('[bauh][web] Deleting directory {}'.format(ENV_PATH))
+
+            try:
+                shutil.rmtree(ENV_PATH)
+                print('{}[bauh][web] Directory {} deleted{}'.format(Fore.YELLOW, ENV_PATH, Fore.RESET))
+            except:
+                print('{}[bauh][web] An exception has happened when deleting {}{}'.format(Fore.RED, ENV_PATH, Fore.RESET))
+                traceback.print_exc()

bauh/gems/web/environment.py

@@ -13,7 +13,7 @@ from bauh.api.http import HttpClient
 from bauh.commons import system
 from bauh.commons.html import bold
 from bauh.commons.system import SimpleProcess, ProcessHandler, run_cmd
-from bauh.gems.web import BIN_PATH, NODE_DIR_PATH, NODE_BIN_PATH, NODE_MODULES_PATH, NATIVEFIER_BIN_PATH, \
+from bauh.gems.web import ENV_PATH, NODE_DIR_PATH, NODE_BIN_PATH, NODE_MODULES_PATH, NATIVEFIER_BIN_PATH, \
     ELECTRON_PATH, ELECTRON_DOWNLOAD_URL, ELECTRON_SHA256_URL, URL_ENVIRONMENT_SETTINGS, NPM_BIN_PATH, NODE_PATHS
 from bauh.view.util.translation import I18n
 
@@ -29,8 +29,8 @@ class EnvironmentUpdater:
     def _download_and_install(self, version: str, version_url: str, watcher: ProcessWatcher) -> bool:
         self.logger.info("Downloading NodeJS {}: {}".format(version, version_url))
 
-        tarf_path = '{}/{}'.format(BIN_PATH, version_url.split('/')[-1])
-        downloaded = self.file_downloader.download(version_url, watcher=watcher, output_path=tarf_path, cwd=BIN_PATH)
+        tarf_path = '{}/{}'.format(ENV_PATH, version_url.split('/')[-1])
+        downloaded = self.file_downloader.download(version_url, watcher=watcher, output_path=tarf_path, cwd=ENV_PATH)
 
         if not downloaded:
             self.logger.error("Could not download '{}'. Aborting...".format(version_url))
@@ -38,9 +38,9 @@ class EnvironmentUpdater:
         else:
             try:
                 tf = tarfile.open(tarf_path)
-                tf.extractall(path=BIN_PATH)
+                tf.extractall(path=ENV_PATH)
 
-                extracted_file = '{}/{}'.format(BIN_PATH, tf.getnames()[0])
+                extracted_file = '{}/{}'.format(ENV_PATH, tf.getnames()[0])
 
                 os.rename(extracted_file, NODE_DIR_PATH)
                 return True
@@ -55,7 +55,7 @@ class EnvironmentUpdater:
                         self.logger.error('Could not delete file {}'.format(tarf_path))
 
     def update_node(self, version: str, version_url: str, watcher: ProcessWatcher = None) -> bool:
-        Path(BIN_PATH).mkdir(parents=True, exist_ok=True)
+        Path(ENV_PATH).mkdir(parents=True, exist_ok=True)
 
         if not os.path.exists(NODE_DIR_PATH):
             return self._download_and_install(version=version, version_url=version_url, watcher=watcher)
@@ -92,7 +92,7 @@ class EnvironmentUpdater:
         if handler and handler.watcher:
             handler.watcher.change_substatus(self.i18n['web.environment.install'].format(bold('nativefier')))
 
-        proc = SimpleProcess([NPM_BIN_PATH, 'install', 'nativefier@{}'.format(version)], cwd=BIN_PATH, extra_paths=NODE_PATHS)
+        proc = SimpleProcess([NPM_BIN_PATH, 'install', 'nativefier@{}'.format(version)], cwd=ENV_PATH, extra_paths=NODE_PATHS)
 
         if handler:
             installed = handler.handle_simple(proc)[0]

bauh/gems/web/model.py

@@ -51,8 +51,9 @@ class WebApplication(SoftwarePackage):
     def get_disk_icon_path(self) -> str:
         if self.custom_icon:
             return self.custom_icon
-        else:
-            super(WebApplication, self).get_disk_icon_path()
+
+        if self.installation_dir:
+            return '{}/resources/app/icon.png'.format(self.installation_dir)
 
     def is_application(self):
         return True