0
1
mirror of https://github.com/radio95-rnt/RadioPlayer.git synced 2026-02-26 13:52:00 +01:00

some changes

This commit is contained in:
Kuba
2025-10-31 23:21:02 +01:00
parent ad05b2076c
commit cccf4a2965
2 changed files with 11 additions and 9 deletions

View File

@@ -1,8 +1,6 @@
from modules import InterModuleCommunication
from . import ActiveModifier, log95, Track
import os
import subprocess
import datetime
import os, subprocess, glob, datetime
from .advisor import MORNING_START, DAY_END
@@ -29,6 +27,9 @@ class Module(ActiveModifier):
if not self.playlist: return track
if not os.path.exists("/tmp/radioPlayer_toplay"): open("/tmp/radioPlayer_toplay", "a").close()
with open("/tmp/radioPlayer_toplay", "r") as f: songs = [s.strip() for s in f.readlines() if s.strip()]
songs[:] = [f for s in songs for f in glob.glob(s) if os.path.isfile(f)] # expand glob
if len(songs):
song = songs.pop(0)

View File

@@ -3,9 +3,7 @@ DEBUG = False
import time
import os, subprocess, importlib.util, types
import sys, signal, threading, glob
import unidecode
from dataclasses import dataclass
import log95, libcache
import libcache
from pathlib import Path
from modules import *
@@ -115,13 +113,13 @@ def handle_sigint(signum, frame):
else:
logger.warning("Force-Quit pending")
procman.stop_all()
exit(0)
raise SystemExit
signal.signal(signal.SIGINT, handle_sigint)
def load_filelines(path):
try:
with open(path, 'r') as f: return [unidecode.unidecode(line.strip()) for line in f.readlines() if unidecode.unidecode(line.strip())]
with open(path, 'r') as f: return [line.strip() for line in f.readlines() if line.strip()]
except FileNotFoundError:
logger.error(f"Playlist not found: {path}")
return []
@@ -259,7 +257,10 @@ def main():
module.__package__ = MODULES_PACKAGE
if not spec.loader: continue
spec.loader.exec_module(module)
try: spec.loader.exec_module(module)
except Exception as e:
logger.error(f"Failed loading {module_name} due to {e}")
continue
if md := getattr(module, "module", None):
if isinstance(md, list): simple_modules.extend(md)