mirror of
https://github.com/spalencsar/bearhub.git
synced 2026-07-07 00:04:15 +02:00
Release 0.10.7-bearhub.6
Complete M1 identity work, fix runtime URL regressions, repair the test suite, add CI, migrate packaging/AppImage branding to Bearhub, and document the Qt6/PySide6 migration plan.
This commit is contained in:
@@ -2,7 +2,6 @@ import os
|
||||
from pathlib import Path
|
||||
from typing import Optional
|
||||
|
||||
from bauh import __app_name__
|
||||
from bauh.api.paths import CONFIG_DIR, TEMP_DIR, CACHE_DIR, BINARIES_DIR, SHARED_FILES_DIR
|
||||
from bauh.commons import resource
|
||||
|
||||
@@ -13,7 +12,7 @@ CONFIG_FILE = f'{CONFIG_DIR}/appimage.yml'
|
||||
APPIMAGE_CONFIG_DIR = f'{CONFIG_DIR}/appimage'
|
||||
UPDATES_IGNORED_FILE = f'{APPIMAGE_CONFIG_DIR}/updates_ignored.txt'
|
||||
SYMLINKS_DIR = BINARIES_DIR
|
||||
URL_COMPRESSED_DATABASES = f'https://raw.githubusercontent.com/vinifmor/{__app_name__}-files/master/appimage/dbs.tar.gz'
|
||||
URL_COMPRESSED_DATABASES = 'https://raw.githubusercontent.com/vinifmor/bauh-files/master/appimage/dbs.tar.gz'
|
||||
APPIMAGE_CACHE_DIR = f'{CACHE_DIR}/appimage'
|
||||
DATABASE_APPS_FILE = f'{APPIMAGE_CACHE_DIR}/apps.db'
|
||||
DATABASE_RELEASES_FILE = f'{APPIMAGE_CACHE_DIR}/releases.db'
|
||||
|
||||
@@ -12,6 +12,7 @@ from typing import Set, Type, List, Tuple, Optional, Iterable, Generator
|
||||
|
||||
from colorama import Fore
|
||||
|
||||
from bauh import __app_name__
|
||||
from bauh.api.abstract.context import ApplicationContext
|
||||
from bauh.api.abstract.controller import SoftwareManager, SearchResult, UpgradeRequirements, UpgradeRequirement, \
|
||||
TransactionResult, SoftwareAction, SettingsView, SettingsController
|
||||
@@ -721,7 +722,7 @@ class AppImageManager(SoftwareManager, SettingsController):
|
||||
return TransactionResult.fail()
|
||||
|
||||
def _gen_desktop_entry_path(self, app: AppImage) -> str:
|
||||
return f'{DESKTOP_ENTRIES_DIR}/bauh_appimage_{app.get_clean_name()}.desktop'
|
||||
return f'{DESKTOP_ENTRIES_DIR}/{__app_name__}_appimage_{app.get_clean_name()}.desktop'
|
||||
|
||||
def is_enabled(self) -> bool:
|
||||
return self.enabled
|
||||
@@ -855,14 +856,14 @@ class AppImageManager(SoftwareManager, SettingsController):
|
||||
for f in glob.glob(f'{APPIMAGE_SHARED_DIR}/*.db'):
|
||||
try:
|
||||
if logs:
|
||||
print(f'[bauh][appimage] Deleting {f}')
|
||||
print(f'[{__app_name__}][appimage] Deleting {f}')
|
||||
os.remove(f)
|
||||
|
||||
if logs:
|
||||
print(f'{Fore.YELLOW}[bauh][appimage] {f} deleted{Fore.RESET}')
|
||||
print(f'{Fore.YELLOW}[{__app_name__}][appimage] {f} deleted{Fore.RESET}')
|
||||
except Exception:
|
||||
if logs:
|
||||
print(f'{Fore.RED}[bauh][appimage] An exception has happened when deleting {f}{Fore.RESET}')
|
||||
print(f'{Fore.RED}[{__app_name__}][appimage] An exception has happened when deleting {f}{Fore.RESET}')
|
||||
traceback.print_exc()
|
||||
|
||||
def get_settings(self) -> Optional[Generator[SettingsView, None, None]]:
|
||||
@@ -1092,7 +1093,7 @@ class AppImageManager(SoftwareManager, SettingsController):
|
||||
@property
|
||||
def app_repository(self) -> str:
|
||||
if self._app_repository is None:
|
||||
self._app_repository = f"https://github.com/vinifmor/{self.context.app_name}"
|
||||
self._app_repository = 'https://github.com/spalencsar/bearhub'
|
||||
|
||||
return self._app_repository
|
||||
|
||||
|
||||
@@ -1,15 +1,14 @@
|
||||
import os
|
||||
from typing import Optional
|
||||
|
||||
from bauh import __app_name__
|
||||
from bauh.api.paths import CONFIG_DIR, TEMP_DIR, CACHE_DIR, get_temp_dir
|
||||
from bauh.commons import resource
|
||||
|
||||
ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
|
||||
ARCH_CACHE_DIR = f'{CACHE_DIR}/arch'
|
||||
CATEGORIES_FILE_PATH = f'{ARCH_CACHE_DIR}/categories.txt'
|
||||
URL_CATEGORIES_FILE = f'https://raw.githubusercontent.com/vinifmor/{__app_name__}-files/master/arch/categories.txt'
|
||||
URL_GPG_SERVERS = f'https://raw.githubusercontent.com/vinifmor/{__app_name__}-files/master/arch/gpgservers.txt'
|
||||
URL_CATEGORIES_FILE = 'https://raw.githubusercontent.com/vinifmor/bauh-files/master/arch/categories.txt'
|
||||
URL_GPG_SERVERS = 'https://raw.githubusercontent.com/vinifmor/bauh-files/master/arch/gpgservers.txt'
|
||||
ARCH_CONFIG_DIR = f'{CONFIG_DIR}/arch'
|
||||
CUSTOM_MAKEPKG_FILE = f'{ARCH_CONFIG_DIR}/makepkg.conf'
|
||||
AUR_INDEX_FILE = f'{ARCH_CACHE_DIR}/aur/index.txt'
|
||||
|
||||
@@ -13,6 +13,7 @@ from typing import Optional
|
||||
|
||||
import requests
|
||||
|
||||
from bauh import __app_name__
|
||||
from bauh.api.abstract.context import ApplicationContext
|
||||
from bauh.api.abstract.handler import TaskManager
|
||||
from bauh.commons.boot import CreateConfigFile
|
||||
@@ -361,7 +362,7 @@ class ArchCompilationOptimizer(Thread):
|
||||
self.taskman.update_progress(self.task_id, 80, None)
|
||||
|
||||
if custom_makepkg and optimizations:
|
||||
generated_by = '# <generated by bauh>\n'
|
||||
generated_by = f'# <generated by {__app_name__}>\n'
|
||||
custom_makepkg = custom_makepkg + '\n' + generated_by + '\n'.join(optimizations) + '\n'
|
||||
|
||||
with open(CUSTOM_MAKEPKG_FILE, 'w+') as f:
|
||||
|
||||
@@ -15,6 +15,7 @@ import yaml
|
||||
from colorama import Fore
|
||||
from requests import Response
|
||||
|
||||
from bauh import __app_name__
|
||||
from bauh.api.abstract.context import ApplicationContext
|
||||
from bauh.api.abstract.controller import SoftwareManager, SearchResult, UpgradeRequirements, TransactionResult, \
|
||||
SoftwareAction, SettingsView, SettingsController
|
||||
@@ -1149,15 +1150,15 @@ class WebApplicationManager(SoftwareManager, SettingsController):
|
||||
def clear_data(self, logs: bool = True):
|
||||
if os.path.exists(ENV_PATH):
|
||||
if logs:
|
||||
print('[bauh][web] Deleting directory {}'.format(ENV_PATH))
|
||||
print('[{}][web] Deleting directory {}'.format(__app_name__, ENV_PATH))
|
||||
|
||||
try:
|
||||
shutil.rmtree(ENV_PATH)
|
||||
if logs:
|
||||
print('{}[bauh][web] Directory {} deleted{}'.format(Fore.YELLOW, ENV_PATH, Fore.RESET))
|
||||
print('{}[{}][web] Directory {} deleted{}'.format(Fore.YELLOW, __app_name__, ENV_PATH, Fore.RESET))
|
||||
except Exception:
|
||||
if logs:
|
||||
print('{}[bauh][web] An exception has happened when deleting {}{}'.format(Fore.RED, ENV_PATH,
|
||||
print('{}[{}][web] An exception has happened when deleting {}{}'.format(Fore.RED, __app_name__, ENV_PATH,
|
||||
Fore.RESET))
|
||||
traceback.print_exc()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user