From 3386dbad68bed3e238b89521d19e644fefc9cdc5 Mon Sep 17 00:00:00 2001 From: Vinicius Moreira Date: Mon, 13 Dec 2021 16:14:02 -0300 Subject: [PATCH] [web] improvmenet: always retrieving the nativefier URL from the environment settings --- bauh/gems/web/__init__.py | 1 - bauh/gems/web/environment.py | 9 ++------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/bauh/gems/web/__init__.py b/bauh/gems/web/__init__.py index 5fa04dad..be6eb598 100644 --- a/bauh/gems/web/__init__.py +++ b/bauh/gems/web/__init__.py @@ -34,7 +34,6 @@ SUGGESTIONS_CACHE_TS_FILE = map_timestamp_file(SUGGESTIONS_CACHE_FILE) CONFIG_FILE = f'{CONFIG_DIR}/web.yml' ENVIRONMENT_SETTINGS_CACHED_FILE = f'{WEB_CACHE_DIR}/environment.yml' ENVIRONMENT_SETTINGS_TS_FILE = f'{WEB_CACHE_DIR}/environment.ts' -NATIVEFIER_BASE_URL = 'https://github.com/nativefier/nativefier/archive/v{version}.tar.gz' def get_icon_path() -> str: diff --git a/bauh/gems/web/environment.py b/bauh/gems/web/environment.py index fbe3e3ca..d654451a 100644 --- a/bauh/gems/web/environment.py +++ b/bauh/gems/web/environment.py @@ -22,7 +22,7 @@ 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_CACHE_DIR, ELECTRON_DOWNLOAD_URL, ELECTRON_SHA256_URL, URL_ENVIRONMENT_SETTINGS, NPM_BIN_PATH, NODE_PATHS, \ nativefier, ELECTRON_WIDEVINE_URL, ELECTRON_WIDEVINE_SHA256_URL, \ - ENVIRONMENT_SETTINGS_CACHED_FILE, ENVIRONMENT_SETTINGS_TS_FILE, get_icon_path, NATIVEFIER_BASE_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 @@ -412,12 +412,7 @@ class EnvironmentUpdater: return True def _map_nativefier_file(self, nativefier_settings: dict) -> EnvironmentComponent: - base_url = nativefier_settings.get('url') - if not base_url: - self.logger.warning(f"'url' not found in nativefier environment settings. Using hardcoded URL '{NATIVEFIER_BASE_URL}'") - base_url = NATIVEFIER_BASE_URL - - url = base_url.format(version=nativefier_settings['version']) + url = nativefier_settings['url'].format(version=nativefier_settings['version']) return EnvironmentComponent(name=f"nativefier@{nativefier_settings['version']}", url=url, size=self.http_client.get_content_length(url),