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

[api] refactoring: adding AUTOSTART_DIR constant to 'paths' module

Browse Source
This commit is contained in:
Vinicius Moreira
2021-11-24 14:14:04 -03:00
parent 0c11c4c166
commit 530a5019e2
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- caching: `/var/cache/bauh` - caching: `/var/cache/bauh`
- configuration: `/etc/bauh` - configuration: `/etc/bauh`
- temp dir: `/tmp/bauh@root` (`/tmp/bauh@$USER` for non root users) - temp dir: `/tmp/bauh@root` (`/tmp/bauh@$USER` for non root users)
- autostart: `/etc/xdg/autostart` (only used by the Web gem at the moment)
- UI - UI
- settings panel: - settings panel:

1
bauh/api/paths.py
View File

@@ -10,3 +10,4 @@ USER_THEMES_PATH = '{}/.local/share/bauh/themes'.format(str(Path.home()))
DESKTOP_ENTRIES_DIR = '{}/.local/share/applications'.format(str(Path.home())) DESKTOP_ENTRIES_DIR = '{}/.local/share/applications'.format(str(Path.home()))
TEMP_DIR = f'/tmp/{__app_name__}@{getuser()}' TEMP_DIR = f'/tmp/{__app_name__}@{getuser()}'
LOGS_DIR = f'{TEMP_DIR}/logs' LOGS_DIR = f'{TEMP_DIR}/logs'
AUTOSTART_DIR = f'/etc/xdg/autostart' if user.is_root() else f'{Path.home()}/.config/autostart'

5
bauh/gems/web/controller.py
View File

@@ -26,7 +26,7 @@ from bauh.api.abstract.model import SoftwarePackage, CustomSoftwareAction, Packa
SuggestionPriority, PackageStatus SuggestionPriority, PackageStatus
from bauh.api.abstract.view import MessageType, MultipleSelectComponent, InputOption, SingleSelectComponent, \ from bauh.api.abstract.view import MessageType, MultipleSelectComponent, InputOption, SingleSelectComponent, \
SelectViewType, TextInputComponent, FormComponent, FileChooserComponent, ViewComponent, PanelComponent SelectViewType, TextInputComponent, FormComponent, FileChooserComponent, ViewComponent, PanelComponent
from bauh.api.paths import DESKTOP_ENTRIES_DIR from bauh.api.paths import DESKTOP_ENTRIES_DIR, AUTOSTART_DIR
from bauh.commons import resource from bauh.commons import resource
from bauh.commons.boot import CreateConfigFile from bauh.commons.boot import CreateConfigFile
from bauh.commons.html import bold from bauh.commons.html import bold
@@ -763,8 +763,7 @@ class WebApplicationManager(SoftwareManager):
pkg.desktop_entry = desktop_entry_path pkg.desktop_entry = desktop_entry_path
if '--tray=start-in-tray' in install_options: if '--tray=start-in-tray' in install_options:
autostart_dir = '{}/.config/autostart'.format(Path.home()) Path(AUTOSTART_DIR).mkdir(parents=True, exist_ok=True)
Path(autostart_dir).mkdir(parents=True, exist_ok=True)
with open(pkg.get_autostart_path(), 'w+') as f: with open(pkg.get_autostart_path(), 'w+') as f:
f.write(entry_content) f.write(entry_content)

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

@@ -6,6 +6,7 @@ from typing import List
from bauh import __app_name__ from bauh import __app_name__
from bauh.api import user from bauh.api import user
from bauh.api.abstract.model import SoftwarePackage from bauh.api.abstract.model import SoftwarePackage
from bauh.api.paths import AUTOSTART_DIR
from bauh.commons import resource from bauh.commons import resource
from bauh.gems.web import ROOT_DIR from bauh.gems.web import ROOT_DIR
@@ -125,7 +126,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 f"{Path.home()}/.config/autostart/{self.desktop_entry.split('/')[-1]}" return f"{AUTOSTART_DIR}/{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