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

[appimage] refactoring: APPIMAGE_CACHE_PATH renamed to APPIMAGE_CACHE_DIR

Browse Source
This commit is contained in:
Vinicius Moreira
2021-11-25 16:11:34 -03:00
parent 06035bb97e
commit 9bfecc5131
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bauh/gems/appimage/worker.py
View File

@@ -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))