mirror of
https://github.com/Yuvi9587/Kemono-Downloader.git
synced 2025-12-29 16:14:44 +00:00
Update assets.py
This commit is contained in:
@@ -5,9 +5,6 @@ import sys
|
|||||||
# --- PyQt5 Imports ---
|
# --- PyQt5 Imports ---
|
||||||
from PyQt5.QtGui import QIcon
|
from PyQt5.QtGui import QIcon
|
||||||
|
|
||||||
# --- Asset Management ---
|
|
||||||
|
|
||||||
# This global variable will cache the icon so we don't have to load it from disk every time.
|
|
||||||
_app_icon_cache = None
|
_app_icon_cache = None
|
||||||
|
|
||||||
def get_app_icon_object():
|
def get_app_icon_object():
|
||||||
@@ -22,17 +19,11 @@ def get_app_icon_object():
|
|||||||
if _app_icon_cache and not _app_icon_cache.isNull():
|
if _app_icon_cache and not _app_icon_cache.isNull():
|
||||||
return _app_icon_cache
|
return _app_icon_cache
|
||||||
|
|
||||||
# Declare a single variable to hold the base directory path.
|
|
||||||
app_base_dir = ""
|
app_base_dir = ""
|
||||||
|
|
||||||
# Determine the project's base directory, whether running from source or as a bundled app
|
|
||||||
if getattr(sys, 'frozen', False):
|
if getattr(sys, 'frozen', False):
|
||||||
# The application is frozen (e.g., with PyInstaller).
|
|
||||||
# The base directory is the one containing the executable.
|
|
||||||
app_base_dir = os.path.dirname(sys.executable)
|
app_base_dir = os.path.dirname(sys.executable)
|
||||||
else:
|
else:
|
||||||
# The application is running from a .py file.
|
|
||||||
# This path navigates up from src/ui/assets.py to the project root.
|
|
||||||
app_base_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
|
app_base_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
|
||||||
|
|
||||||
icon_path = os.path.join(app_base_dir, 'assets', 'Kemono.ico')
|
icon_path = os.path.join(app_base_dir, 'assets', 'Kemono.ico')
|
||||||
@@ -40,7 +31,6 @@ def get_app_icon_object():
|
|||||||
if os.path.exists(icon_path):
|
if os.path.exists(icon_path):
|
||||||
_app_icon_cache = QIcon(icon_path)
|
_app_icon_cache = QIcon(icon_path)
|
||||||
else:
|
else:
|
||||||
# If the icon isn't found, especially in a frozen app, check the _MEIPASS directory as a fallback.
|
|
||||||
if getattr(sys, 'frozen', False) and hasattr(sys, '_MEIPASS'):
|
if getattr(sys, 'frozen', False) and hasattr(sys, '_MEIPASS'):
|
||||||
fallback_icon_path = os.path.join(sys._MEIPASS, 'assets', 'Kemono.ico')
|
fallback_icon_path = os.path.join(sys._MEIPASS, 'assets', 'Kemono.ico')
|
||||||
if os.path.exists(fallback_icon_path):
|
if os.path.exists(fallback_icon_path):
|
||||||
|
|||||||
Reference in New Issue
Block a user