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

path resolution for of the day manager

Browse Source
This commit is contained in:
Chuck
2025-09-15 15:16:54 -04:00
parent d0f8785936
commit 3f431a54d4
1 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/of_the_day_manager.py
View File

@@ -61,18 +61,28 @@ class OfTheDayManager:
def _safe_load_bdf_font(filename): def _safe_load_bdf_font(filename):
try: try:
font_path = os.path.abspath(os.path.join(font_dir, filename)) # Try multiple font paths
if not os.path.exists(font_path): font_paths = [
logger.debug(f"Font file not found: {font_path}") os.path.abspath(os.path.join(font_dir, filename)),
# List available fonts for debugging os.path.join(font_dir, filename),
try: os.path.join(current_dir, 'assets', 'fonts', filename),
available_fonts = [f for f in os.listdir(font_dir) if f.endswith('.bdf')] os.path.join(script_dir, '..', 'assets', 'fonts', filename)
logger.debug(f"Available BDF fonts in {font_dir}: {available_fonts}") ]
except:
pass for font_path in font_paths:
return None abs_font_path = os.path.abspath(font_path)
logger.debug(f"Loading BDF font: {font_path}") if os.path.exists(abs_font_path):
return freetype.Face(font_path) logger.debug(f"Loading BDF font: {abs_font_path}")
return freetype.Face(abs_font_path)
logger.debug(f"Font file not found: {filename}")
# List available fonts for debugging
try:
available_fonts = [f for f in os.listdir(font_dir) if f.endswith('.bdf')]
logger.debug(f"Available BDF fonts in {font_dir}: {available_fonts}")
except:
pass
return None
except Exception as e: except Exception as e:
logger.debug(f"Failed to load BDF font '{filename}': {e}") logger.debug(f"Failed to load BDF font '{filename}': {e}")
return None return None
@@ -166,16 +176,17 @@ class OfTheDayManager:
if os.path.isabs(data_file): if os.path.isabs(data_file):
possible_paths.append(data_file) possible_paths.append(data_file)
else: else:
# If data_file already contains 'of_the_day/', use it as is # Always try multiple paths regardless of how data_file is specified
if data_file.startswith('of_the_day/'): possible_paths.extend([
os.path.join(current_dir, data_file), # Current working directory first
os.path.join(script_dir, '..', data_file),
data_file
])
# If data_file doesn't already contain 'of_the_day/', also try with it
if not data_file.startswith('of_the_day/'):
possible_paths.extend([ possible_paths.extend([
os.path.join(current_dir, data_file), # Current working directory first os.path.join(current_dir, 'of_the_day', data_file),
os.path.join(script_dir, '..', data_file),
data_file
])
else:
possible_paths.extend([
os.path.join(current_dir, 'of_the_day', data_file), # Current working directory first
os.path.join(script_dir, '..', 'of_the_day', data_file), os.path.join(script_dir, '..', 'of_the_day', data_file),
os.path.join('of_the_day', data_file) os.path.join('of_the_day', data_file)
]) ])