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

[web.model] refactoring: String formatting method

Browse Source
This commit is contained in:
Vinicius Moreira
2021-11-24 12:31:51 -03:00
parent 92d90eb9a2
commit 86c61a7c45
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
bauh/gems/web/model.py
View File

@@ -3,9 +3,9 @@ import os
from pathlib import Path from pathlib import Path
from typing import List from typing import List
from bauh.api import user
from bauh.api.abstract.model import SoftwarePackage from bauh.api.abstract.model import SoftwarePackage
from bauh.commons import resource from bauh.commons import resource
from bauh.api import user
from bauh.gems.web import ROOT_DIR from bauh.gems.web import ROOT_DIR
@@ -55,11 +55,11 @@ class WebApplication(SoftwarePackage):
def get_exec_path(self) -> str: def get_exec_path(self) -> str:
if self.installation_dir: if self.installation_dir:
return '{}/{}'.format(self.installation_dir, self.id) return f'{self.installation_dir}/{self.id}'
def get_command(self) -> str: def get_command(self) -> str:
if self.installation_dir: if self.installation_dir:
return '{}{}'.format(self.get_exec_path(), ' --no-sandbox' if user.is_root() else '') return f"{self.get_exec_path()}{' --no-sandbox' if user.is_root() else ''}"
def get_type(self): def get_type(self):
return 'web' return 'web'
@@ -71,14 +71,14 @@ class WebApplication(SoftwarePackage):
return resource.get_path('img/web.svg', ROOT_DIR) return resource.get_path('img/web.svg', ROOT_DIR)
def get_disk_data_path(self) -> str: def get_disk_data_path(self) -> str:
return '{}/data.yml'.format(self.get_disk_cache_path()) return f'{self.get_disk_cache_path()}/data.yml'
def get_disk_icon_path(self) -> str: def get_disk_icon_path(self) -> str:
if self.custom_icon: if self.custom_icon:
return self.custom_icon return self.custom_icon
if self.installation_dir: if self.installation_dir:
return '{}/resources/app/icon.png'.format(self.installation_dir) return f'{self.installation_dir}/resources/app/icon.png'
def is_application(self): def is_application(self):
return True return True
@@ -124,7 +124,7 @@ class WebApplication(SoftwarePackage):
def get_autostart_path(self) -> str: def get_autostart_path(self) -> str:
if self.desktop_entry: if self.desktop_entry:
return '{}/.config/autostart/{}'.format(Path.home(), self.desktop_entry.split('/')[-1]) return f"{Path.home()}/.config/autostart/{self.desktop_entry.split('/')[-1]}"
def set_custom_icon(self, custom_icon: str): def set_custom_icon(self, custom_icon: str):
self.custom_icon = custom_icon self.custom_icon = custom_icon
@@ -134,16 +134,16 @@ class WebApplication(SoftwarePackage):
def get_config_dir(self) -> str: def get_config_dir(self) -> str:
if self.package_name: if self.package_name:
config_dir = '{}/.config/{}'.format(str(Path.home()), self.package_name) config_dir = f'{Path.home()}/.config/{self.package_name}'
if os.path.exists(config_dir): if os.path.exists(config_dir):
return config_dir return config_dir
else: else:
if self.installation_dir: if self.installation_dir:
config_path = '{}/.config'.format(str(Path.home())) config_path = f'{Path.home()}/.config'
if os.path.exists(config_path): if os.path.exists(config_path):
config_dirs = glob.glob('{}/{}-nativefier-*'.format(config_path, self.installation_dir.split('/')[-1])) config_dirs = glob.glob(f"{config_path}/{self.installation_dir.split('/')[-1]}-nativefier-*")
if config_dirs: if config_dirs:
return config_dirs[0] return config_dirs[0]