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

[web.environment] refactoring: '_download_and_install' renamed to 'install_nodejs'

Browse Source
This commit is contained in:
Vinicius Moreira
2021-12-13 15:54:29 -03:00
parent a0ad89a5e9
commit 60217e9173
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,7 +49,7 @@ class EnvironmentUpdater:
self.task_read_settings_id = 'web_read_settings' self.task_read_settings_id = 'web_read_settings'
self.taskman = taskman self.taskman = taskman
def _download_and_install(self, version: str, version_url: str, watcher: ProcessWatcher) -> bool: def _install_nodejs(self, version: str, version_url: str, watcher: ProcessWatcher) -> bool:
self.logger.info(f"Downloading NodeJS {version}: {version_url}") self.logger.info(f"Downloading NodeJS {version}: {version_url}")
tarf_path = f"{ENV_PATH}/{version_url.split('/')[-1]}" tarf_path = f"{ENV_PATH}/{version_url.split('/')[-1]}"
@@ -129,7 +129,7 @@ class EnvironmentUpdater:
Path(ENV_PATH).mkdir(parents=True, exist_ok=True) Path(ENV_PATH).mkdir(parents=True, exist_ok=True)
if not os.path.exists(NODE_DIR_PATH): if not os.path.exists(NODE_DIR_PATH):
return self._download_and_install(version=version, version_url=version_url, watcher=watcher) return self._install_nodejs(version=version, version_url=version_url, watcher=watcher)
else: else:
installed_version = system.run_cmd('{} --version'.format(NODE_BIN_PATH), print_error=False) installed_version = system.run_cmd('{} --version'.format(NODE_BIN_PATH), print_error=False)
@@ -143,7 +143,7 @@ class EnvironmentUpdater:
if version != installed_version: if version != installed_version:
self.logger.info("The NodeJs installed version is different from the Cloud.") self.logger.info("The NodeJs installed version is different from the Cloud.")
return self._download_and_install(version=version, version_url=version_url, watcher=watcher) return self._install_nodejs(version=version, version_url=version_url, watcher=watcher)
else: else:
self.logger.info("Node is already up to date") self.logger.info("Node is already up to date")
return True return True
@@ -152,7 +152,7 @@ class EnvironmentUpdater:
self.logger.info(f"Removing {NODE_DIR_PATH}") self.logger.info(f"Removing {NODE_DIR_PATH}")
try: try:
shutil.rmtree(NODE_DIR_PATH) shutil.rmtree(NODE_DIR_PATH)
return self._download_and_install(version=version, version_url=version_url, watcher=watcher) return self._install_nodejs(version=version, version_url=version_url, watcher=watcher)
except: except:
self.logger.error(f'Could not delete the dir {NODE_DIR_PATH}') self.logger.error(f'Could not delete the dir {NODE_DIR_PATH}')
return False return False
@@ -452,7 +452,7 @@ class EnvironmentUpdater:
nativefier_data = comp_map.get('nativefier') nativefier_data = comp_map.get('nativefier')
if node_data: if node_data:
if not self._download_and_install(version=node_data.version, version_url=node_data.url, watcher=handler.watcher): if not self._install_nodejs(version=node_data.version, version_url=node_data.url, watcher=handler.watcher):
return False return False
if not self._install_nativefier(version=nativefier_data.version, url=nativefier_data.url, handler=handler): if not self._install_nativefier(version=nativefier_data.version, url=nativefier_data.url, handler=handler):