diff --git a/bauh/gems/appimage/__init__.py b/bauh/gems/appimage/__init__.py index a301da6f..6a7583d4 100644 --- a/bauh/gems/appimage/__init__.py +++ b/bauh/gems/appimage/__init__.py @@ -14,13 +14,13 @@ APPIMAGE_CONFIG_DIR = f'{CONFIG_DIR}/appimage' UPDATES_IGNORED_FILE = f'{APPIMAGE_CONFIG_DIR}/updates_ignored.txt' SYMLINKS_DIR = '{}/.local/bin'.format(str(Path.home())) URL_COMPRESSED_DATABASES = 'https://raw.githubusercontent.com/vinifmor/bauh-files/master/appimage/dbs.tar.gz' -APPIMAGE_CACHE_PATH = f'{CACHE_DIR}/appimage' -DATABASE_APPS_FILE = f'{APPIMAGE_CACHE_PATH}/apps.db' -DATABASE_RELEASES_FILE = f'{APPIMAGE_CACHE_PATH}/releases.db' -DATABASES_TS_FILE = f'{APPIMAGE_CACHE_PATH}/dbs.ts' +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' +DATABASES_TS_FILE = f'{APPIMAGE_CACHE_DIR}/dbs.ts' DESKTOP_ENTRIES_PATH = '{}/.local/share/applications'.format(str(Path.home())) -SUGGESTIONS_CACHED_FILE = f'{APPIMAGE_CACHE_PATH}/suggestions.txt' -SUGGESTIONS_CACHED_TS_FILE = f'{APPIMAGE_CACHE_PATH}/suggestions.ts' +SUGGESTIONS_CACHED_FILE = f'{APPIMAGE_CACHE_DIR}/suggestions.txt' +SUGGESTIONS_CACHED_TS_FILE = f'{APPIMAGE_CACHE_DIR}/suggestions.ts' DOWNLOAD_DIR = f'{TEMP_DIR}/appimage/download' diff --git a/bauh/gems/appimage/controller.py b/bauh/gems/appimage/controller.py index ba4e6e37..362dce96 100644 --- a/bauh/gems/appimage/controller.py +++ b/bauh/gems/appimage/controller.py @@ -29,7 +29,7 @@ from bauh.commons.html import bold from bauh.commons.system import SystemProcess, new_subprocess, ProcessHandler, run_cmd, SimpleProcess from bauh.gems.appimage import query, INSTALLATION_PATH, LOCAL_PATH, ROOT_DIR, \ APPIMAGE_CONFIG_DIR, UPDATES_IGNORED_FILE, util, get_default_manual_installation_file_dir, DATABASE_APPS_FILE, \ - DATABASE_RELEASES_FILE, DESKTOP_ENTRIES_PATH, APPIMAGE_CACHE_PATH, get_icon_path, DOWNLOAD_DIR + DATABASE_RELEASES_FILE, DESKTOP_ENTRIES_PATH, APPIMAGE_CACHE_DIR, get_icon_path, DOWNLOAD_DIR from bauh.gems.appimage.config import AppImageConfigManager from bauh.gems.appimage.model import AppImage from bauh.gems.appimage.util import replace_desktop_entry_exec_command @@ -733,7 +733,7 @@ class AppImageManager(SoftwareManager): return updates def list_warnings(self, internet_available: bool) -> List[str]: - dbfiles = glob.glob(f'{APPIMAGE_CACHE_PATH}/*.db') + dbfiles = glob.glob(f'{APPIMAGE_CACHE_DIR}/*.db') if not dbfiles or len({f for f in (DATABASE_APPS_FILE, DATABASE_RELEASES_FILE) if f in dbfiles}) != 2: return [self.i18n['appimage.warning.missing_db_files'].format(appimage=bold('AppImage'))] diff --git a/bauh/gems/appimage/worker.py b/bauh/gems/appimage/worker.py index 09d708cf..3ffe0f92 100644 --- a/bauh/gems/appimage/worker.py +++ b/bauh/gems/appimage/worker.py @@ -17,14 +17,14 @@ from bauh.api.http import HttpClient from bauh.commons.boot import CreateConfigFile from bauh.commons.html import bold from bauh.gems.appimage import get_icon_path, INSTALLATION_PATH, SYMLINKS_DIR, util, DATABASES_TS_FILE, \ - APPIMAGE_CACHE_PATH, DATABASE_APPS_FILE, DATABASE_RELEASES_FILE, URL_COMPRESSED_DATABASES, SUGGESTIONS_FILE, \ + APPIMAGE_CACHE_DIR, DATABASE_APPS_FILE, DATABASE_RELEASES_FILE, URL_COMPRESSED_DATABASES, SUGGESTIONS_FILE, \ SUGGESTIONS_CACHED_TS_FILE, SUGGESTIONS_CACHED_FILE from bauh.gems.appimage.model import AppImage from bauh.view.util.translation import I18n class DatabaseUpdater(Thread): - COMPRESS_FILE_PATH = f'{APPIMAGE_CACHE_PATH}/db.tar.gz' + COMPRESS_FILE_PATH = f'{APPIMAGE_CACHE_DIR}/db.tar.gz' def __init__(self, i18n: I18n, http_client: HttpClient, logger: logging.Logger, taskman: TaskManager, watcher: Optional[ProcessWatcher] = None, appimage_config: Optional[dict] = None, create_config: Optional[CreateConfigFile] = None): @@ -52,10 +52,10 @@ class DatabaseUpdater(Thread): self.logger.info("No expiration time configured for the AppImage database") return True - files = {*glob.glob(f'{APPIMAGE_CACHE_PATH}/*')} + files = {*glob.glob(f'{APPIMAGE_CACHE_DIR}/*')} if not files: - self.logger.warning(f'No database files on {APPIMAGE_CACHE_PATH}') + self.logger.warning(f'No database files on {APPIMAGE_CACHE_DIR}') return True if DATABASES_TS_FILE not in files: @@ -105,7 +105,7 @@ class DatabaseUpdater(Thread): self.logger.warning('Could not download the database file {}'.format(URL_COMPRESSED_DATABASES)) return False - Path(APPIMAGE_CACHE_PATH).mkdir(parents=True, exist_ok=True) + Path(APPIMAGE_CACHE_DIR).mkdir(parents=True, exist_ok=True) with open(self.COMPRESS_FILE_PATH, 'wb+') as f: f.write(res.content) @@ -113,7 +113,7 @@ class DatabaseUpdater(Thread): self.logger.info("Database file saved at {}".format(self.COMPRESS_FILE_PATH)) self._update_task_progress(50, self.i18n['appimage.update_database.deleting_old']) - old_db_files = glob.glob(f'{APPIMAGE_CACHE_PATH}/*.db') + old_db_files = glob.glob(f'{APPIMAGE_CACHE_DIR}/*.db') if old_db_files: self.logger.info('Deleting old database files') @@ -127,7 +127,7 @@ class DatabaseUpdater(Thread): try: tf = tarfile.open(self.COMPRESS_FILE_PATH) - tf.extractall(APPIMAGE_CACHE_PATH) + tf.extractall(APPIMAGE_CACHE_DIR) self.logger.info('Successfully uncompressed file {}'.format(self.COMPRESS_FILE_PATH)) except: self.logger.error('Could not extract file {}'.format(self.COMPRESS_FILE_PATH))