rick/LEDMatrix
1
0
Fork 0
mirror of https://github.com/ChuckBuilds/LEDMatrix.git synced 2026-04-10 21:03:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

change of the day file path detection

Browse Source
This commit is contained in:
Chuck
2025-09-15 18:33:27 -04:00
parent 9200c9cab3
commit 49346f9a6d
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/of_the_day_manager.py
View File

@@ -65,7 +65,7 @@ class OfTheDayManager:
font_paths = [ font_paths = [
os.path.abspath(os.path.join(font_dir, filename)), os.path.abspath(os.path.join(font_dir, filename)),
os.path.join(font_dir, filename), os.path.join(font_dir, filename),
os.path.join(current_dir, 'assets', 'fonts', filename), os.path.join(script_dir, '..', 'assets', 'fonts', filename),
os.path.join(script_dir, '..', 'assets', 'fonts', filename) os.path.join(script_dir, '..', 'assets', 'fonts', filename)
] ]
@@ -171,24 +171,41 @@ class OfTheDayManager:
# Try multiple possible paths for data files # Try multiple possible paths for data files
script_dir = os.path.dirname(os.path.abspath(__file__)) script_dir = os.path.dirname(os.path.abspath(__file__))
current_dir = os.getcwd() current_dir = os.getcwd()
project_root = os.path.dirname(script_dir) # Go up one level from src/ to project root
possible_paths = [] possible_paths = []
logger.debug(f"Script directory: {script_dir}")
logger.debug(f"Current working directory: {current_dir}")
logger.debug(f"Project root directory: {project_root}")
logger.debug(f"Data file from config: {data_file}")
if os.path.isabs(data_file): if os.path.isabs(data_file):
possible_paths.append(data_file) possible_paths.append(data_file)
else: else:
# Always try multiple paths regardless of how data_file is specified # Always try multiple paths regardless of how data_file is specified
possible_paths.extend([ possible_paths.extend([
os.path.join(current_dir, data_file), # Current working directory first os.path.join(current_dir, data_file), # Current working directory first
os.path.join(script_dir, '..', data_file), os.path.join(project_root, data_file), # Project root directory
data_file os.path.join(script_dir, '..', data_file), # Relative to script directory
data_file # Direct path
]) ])
# If data_file doesn't already contain 'of_the_day/', also try with it # If data_file doesn't already contain 'of_the_day/', also try with it
if not data_file.startswith('of_the_day/'): if not data_file.startswith('of_the_day/'):
possible_paths.extend([ possible_paths.extend([
os.path.join(current_dir, 'of_the_day', data_file), os.path.join(current_dir, 'of_the_day', os.path.basename(data_file)),
os.path.join(script_dir, '..', 'of_the_day', data_file), os.path.join(project_root, 'of_the_day', os.path.basename(data_file)),
os.path.join('of_the_day', data_file) os.path.join(script_dir, '..', 'of_the_day', os.path.basename(data_file)),
os.path.join('of_the_day', os.path.basename(data_file))
])
else:
# If data_file already contains 'of_the_day/', try extracting just the filename
filename = os.path.basename(data_file)
possible_paths.extend([
os.path.join(current_dir, 'of_the_day', filename),
os.path.join(project_root, 'of_the_day', filename),
os.path.join(script_dir, '..', 'of_the_day', filename),
os.path.join('of_the_day', filename)
]) ])
# Debug: Show all paths before deduplication # Debug: Show all paths before deduplication