diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c0c367a..322d6f26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [0.9.14] 2021 +### Improvements +- Web + - nativefier URL moved to [bauh-files](https://github.com/vinifmor/bauh-files/blob/master/web/env/v1/environment.yml) + ### Fixes - Installation setup - wrong style resources paths diff --git a/bauh/gems/web/__init__.py b/bauh/gems/web/__init__.py index 633e27c3..b3898cf2 100644 --- a/bauh/gems/web/__init__.py +++ b/bauh/gems/web/__init__.py @@ -32,7 +32,6 @@ SEARCH_INDEX_FILE = '{}/index.yml'.format(WEB_CACHE_PATH) SUGGESTIONS_CACHE_FILE = '{}/suggestions.yml'.format(WEB_CACHE_PATH) SUGGESTIONS_CACHE_TS_FILE = map_timestamp_file(SUGGESTIONS_CACHE_FILE) CONFIG_FILE = '{}/web.yml'.format(CONFIG_PATH) -URL_NATIVEFIER = 'https://github.com/nativefier/nativefier/archive/v{version}.tar.gz' ENVIRONMENT_SETTINGS_CACHED_FILE = '{}/environment.yml'.format(WEB_CACHE_PATH) ENVIRONMENT_SETTINGS_TS_FILE = '{}/environment.ts'.format(WEB_CACHE_PATH) diff --git a/bauh/gems/web/environment.py b/bauh/gems/web/environment.py index a7812952..07d23fa8 100644 --- a/bauh/gems/web/environment.py +++ b/bauh/gems/web/environment.py @@ -21,7 +21,7 @@ from bauh.commons.html import bold from bauh.commons.system import SimpleProcess, ProcessHandler 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, \ - nativefier, URL_NATIVEFIER, ELECTRON_WIDEVINE_URL, ELECTRON_WIDEVINE_SHA256_URL, \ + nativefier, ELECTRON_WIDEVINE_URL, ELECTRON_WIDEVINE_SHA256_URL, \ ENVIRONMENT_SETTINGS_CACHED_FILE, ENVIRONMENT_SETTINGS_TS_FILE, get_icon_path from bauh.gems.web.model import WebApplication from bauh.view.util.translation import I18n @@ -173,10 +173,9 @@ class EnvironmentUpdater: return installed - def _install_nativefier(self, version: str, handler: ProcessHandler) -> bool: + def _install_nativefier(self, version: str, url: str, handler: ProcessHandler) -> bool: self.logger.info("Checking if nativefier@{} exists".format(version)) - url = URL_NATIVEFIER.format(version=version) if not self.http_client.exists(url): self.logger.warning("The file {} seems not to exist".format(url)) handler.watcher.show_message(title=self.i18n['message.file.not_exist'], @@ -449,7 +448,7 @@ class EnvironmentUpdater: return True def _map_nativefier_file(self, nativefier_settings: dict) -> EnvironmentComponent: - url = URL_NATIVEFIER.format(version=nativefier_settings['version']) + url = nativefier_settings['url'].format(version=nativefier_settings['version']) return EnvironmentComponent(name='nativefier@{}'.format(nativefier_settings['version']), url=url, size=self.http_client.get_content_length(url), @@ -496,10 +495,10 @@ class EnvironmentUpdater: if not self._download_and_install(version=node_data.version, version_url=node_data.url, watcher=handler.watcher): return False - if not self._install_nativefier(version=nativefier_data.version, handler=handler): + if not self._install_nativefier(version=nativefier_data.version, url=nativefier_data.url, handler=handler): return False else: - if nativefier_data and not self._install_nativefier(version=nativefier_data.version, handler=handler): + if nativefier_data and not self._install_nativefier(version=nativefier_data.version, url=nativefier_data.url, handler=handler): return False electron_data = comp_map.get('electron')