spalencsar/bearhub
1
0
Fork 0
mirror of https://github.com/spalencsar/bearhub.git synced 2026-07-09 05:14:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

[web] improvement -> preveting cached environment without the nativefier URL to crash the application

Browse Source
This commit is contained in:
Vinicius Moreira
2021-02-01 09:34:21 -03:00
parent 6767875127
commit 90a1c28960
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bauh/gems/web/__init__.py
View File

@@ -34,6 +34,7 @@ SUGGESTIONS_CACHE_TS_FILE = map_timestamp_file(SUGGESTIONS_CACHE_FILE)
CONFIG_FILE = '{}/web.yml'.format(CONFIG_PATH) CONFIG_FILE = '{}/web.yml'.format(CONFIG_PATH)
ENVIRONMENT_SETTINGS_CACHED_FILE = '{}/environment.yml'.format(WEB_CACHE_PATH) ENVIRONMENT_SETTINGS_CACHED_FILE = '{}/environment.yml'.format(WEB_CACHE_PATH)
ENVIRONMENT_SETTINGS_TS_FILE = '{}/environment.ts'.format(WEB_CACHE_PATH) ENVIRONMENT_SETTINGS_TS_FILE = '{}/environment.ts'.format(WEB_CACHE_PATH)
NATIVEFIER_BASE_URL = 'https://github.com/nativefier/nativefier/archive/v{version}.tar.gz'
def get_icon_path() -> str: def get_icon_path() -> str:

11
bauh/gems/web/environment.py
View File

@@ -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, \ 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, \ ELECTRON_PATH, ELECTRON_DOWNLOAD_URL, ELECTRON_SHA256_URL, URL_ENVIRONMENT_SETTINGS, NPM_BIN_PATH, NODE_PATHS, \
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 ENVIRONMENT_SETTINGS_CACHED_FILE, ENVIRONMENT_SETTINGS_TS_FILE, get_icon_path, NATIVEFIER_BASE_URL
from bauh.gems.web.model import WebApplication from bauh.gems.web.model import WebApplication
from bauh.view.util.translation import I18n from bauh.view.util.translation import I18n
@@ -176,7 +176,7 @@ class EnvironmentUpdater:
def _install_nativefier(self, version: str, url: str, handler: ProcessHandler) -> bool: def _install_nativefier(self, version: str, url: str, handler: ProcessHandler) -> bool:
self.logger.info("Checking if nativefier@{} exists".format(version)) self.logger.info("Checking if nativefier@{} exists".format(version))
if not self.http_client.exists(url): if not url or not self.http_client.exists(url):
self.logger.warning("The file {} seems not to exist".format(url)) self.logger.warning("The file {} seems not to exist".format(url))
handler.watcher.show_message(title=self.i18n['message.file.not_exist'], handler.watcher.show_message(title=self.i18n['message.file.not_exist'],
body=self.i18n['message.file.not_exist.body'].format(bold(url)), body=self.i18n['message.file.not_exist.body'].format(bold(url)),
@@ -448,7 +448,12 @@ class EnvironmentUpdater:
return True return True
def _map_nativefier_file(self, nativefier_settings: dict) -> EnvironmentComponent: def _map_nativefier_file(self, nativefier_settings: dict) -> EnvironmentComponent:
url = nativefier_settings['url'].format(version=nativefier_settings['version']) base_url = nativefier_settings.get('url')
if not base_url:
self.logger.warning("'url' not found in nativefier environment settings. Using hardcoded URL '{}'".format(NATIVEFIER_BASE_URL))
base_url = NATIVEFIER_BASE_URL
url = base_url.format(version=nativefier_settings['version'])
return EnvironmentComponent(name='nativefier@{}'.format(nativefier_settings['version']), return EnvironmentComponent(name='nativefier@{}'.format(nativefier_settings['version']),
url=url, url=url,
size=self.http_client.get_content_length(url), size=self.http_client.get_content_length(url),