diff --git a/core/Constants.py b/core/Constants.py index 7eaae50..20dc285 100644 --- a/core/Constants.py +++ b/core/Constants.py @@ -13,6 +13,7 @@ class Constants: # appimage home APPDIR_HOME: Final[str] = os.environ.get('APPDIR', fallback_non_appimage) + print(f"APPDIR_HOME is {APPDIR_HOME}") # ticketing group: TICKET_API_BASE_URL: Final[str] = os.environ.get( diff --git a/core/services/helpers/manage_assets.py b/core/services/helpers/manage_assets.py index f1d7052..ff26392 100644 --- a/core/services/helpers/manage_assets.py +++ b/core/services/helpers/manage_assets.py @@ -1,20 +1,28 @@ +from core.Constants import Constants +from core.errors.logger import logger + import shutil import os -from core.Constants import Constants def assets_folder_setup(): initial_appimage_assets = f"{Constants.APPDIR_HOME}/assets" current_assets_folder = f"{Constants.HV_DATA_HOME}/assets" - print(f"initial_appimage_assets is {initial_appimage_assets}") - - # Step 1: Check if folder exists if os.path.exists(current_assets_folder): return True - else: - try: - # Step 2: Copy over from initial AppImage if not: - shutil.copytree(initial_appimage_assets, current_assets_folder) - return True - except: - return False + + try: + os.makedirs(current_assets_folder, exist_ok=True) + for item in os.listdir(initial_appimage_assets): + src = os.path.join(initial_appimage_assets, item) + dst = os.path.join(current_assets_folder, item) + if os.path.isdir(src): + shutil.copytree(src, dst) + else: + shutil.copy2(src, dst) + return True + except Exception as e: + logger.error(f"initial_appimage_assets is {initial_appimage_assets}") + logger.error(f"current_assets_folder is {current_assets_folder}") + logger.error(f"ERROR: {e}") + return False