You've already forked RadioPlayer
mirror of
https://github.com/radio95-rnt/RadioPlayer.git
synced 2026-02-27 14:13:55 +01:00
fix no shuffle and also add reload
This commit is contained in:
165
radioPlayer.py
165
radioPlayer.py
@@ -96,6 +96,18 @@ def get_newest_track(tracks):
|
|||||||
|
|
||||||
return newest_track
|
return newest_track
|
||||||
|
|
||||||
|
def check_control_files():
|
||||||
|
"""Check for control files and return action to take"""
|
||||||
|
if can_delete_file("/tmp/radioPlayer_quit"):
|
||||||
|
os.remove("/tmp/radioPlayer_quit")
|
||||||
|
return "quit"
|
||||||
|
|
||||||
|
if can_delete_file("/tmp/radioPlayer_reload"):
|
||||||
|
os.remove("/tmp/radioPlayer_reload")
|
||||||
|
return "reload"
|
||||||
|
|
||||||
|
return None
|
||||||
|
|
||||||
def play_playlist(playlist_path, custom_playlist: bool=False, play_newest_first=False, do_shuffle=True):
|
def play_playlist(playlist_path, custom_playlist: bool=False, play_newest_first=False, do_shuffle=True):
|
||||||
last_modified_time = get_playlist_modification_time(playlist_path)
|
last_modified_time = get_playlist_modification_time(playlist_path)
|
||||||
tracks = load_playlist(playlist_path)
|
tracks = load_playlist(playlist_path)
|
||||||
@@ -113,7 +125,8 @@ def play_playlist(playlist_path, custom_playlist: bool=False, play_newest_first=
|
|||||||
if do_shuffle: random.shuffle(tracks)
|
if do_shuffle: random.shuffle(tracks)
|
||||||
tracks.insert(0, newest_track)
|
tracks.insert(0, newest_track)
|
||||||
else:
|
else:
|
||||||
random.shuffle(tracks)
|
if do_shuffle:
|
||||||
|
random.shuffle(tracks)
|
||||||
|
|
||||||
for track in tracks:
|
for track in tracks:
|
||||||
current_modified_time = get_playlist_modification_time(playlist_path)
|
current_modified_time = get_playlist_modification_time(playlist_path)
|
||||||
@@ -152,9 +165,13 @@ def play_playlist(playlist_path, custom_playlist: bool=False, play_newest_first=
|
|||||||
|
|
||||||
subprocess.run(['ffplay', '-nodisp', '-hide_banner', '-autoexit', '-loglevel', 'quiet', track_path], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
|
subprocess.run(['ffplay', '-nodisp', '-hide_banner', '-autoexit', '-loglevel', 'quiet', track_path], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
|
||||||
|
|
||||||
if can_delete_file("/tmp/radioPlayer_quit"):
|
# Check control files after each song
|
||||||
os.remove("/tmp/radioPlayer_quit")
|
action = check_control_files()
|
||||||
|
if action == "quit":
|
||||||
exit()
|
exit()
|
||||||
|
elif action == "reload":
|
||||||
|
print("Reload requested, restarting with new arguments...")
|
||||||
|
return "reload"
|
||||||
|
|
||||||
def can_delete_file(filepath):
|
def can_delete_file(filepath):
|
||||||
if not os.path.isfile(filepath):
|
if not os.path.isfile(filepath):
|
||||||
@@ -162,7 +179,8 @@ def can_delete_file(filepath):
|
|||||||
directory = os.path.dirname(os.path.abspath(filepath)) or '.'
|
directory = os.path.dirname(os.path.abspath(filepath)) or '.'
|
||||||
return os.access(directory, os.W_OK | os.X_OK)
|
return os.access(directory, os.W_OK | os.X_OK)
|
||||||
|
|
||||||
def main():
|
def parse_arguments():
|
||||||
|
"""Parse command line arguments and return configuration"""
|
||||||
arg = sys.argv[1] if len(sys.argv) > 1 else None
|
arg = sys.argv[1] if len(sys.argv) > 1 else None
|
||||||
play_newest_first = False
|
play_newest_first = False
|
||||||
do_shuffle = True
|
do_shuffle = True
|
||||||
@@ -176,19 +194,26 @@ def main():
|
|||||||
|
|
||||||
if arg:
|
if arg:
|
||||||
if arg.lower() == "-h":
|
if arg.lower() == "-h":
|
||||||
print("/tmp/radioPlayer_quit")
|
print("Control files:")
|
||||||
print("/tmp/radioPlayer_arg")
|
print(" /tmp/radioPlayer_quit - Quit the player")
|
||||||
|
print(" /tmp/radioPlayer_reload - Reload arguments from /tmp/radioPlayer_arg")
|
||||||
|
print(" /tmp/radioPlayer_arg - Contains arguments to use")
|
||||||
|
print()
|
||||||
|
print("Arguments:")
|
||||||
|
print(" n - Play newest song first")
|
||||||
|
print(" list:playlist;options - Play custom playlist with options")
|
||||||
|
print(" /path/to/file - Play specific file first")
|
||||||
exit(95)
|
exit(95)
|
||||||
elif arg.lower() == "n":
|
elif arg.lower() == "n":
|
||||||
play_newest_first = True
|
play_newest_first = True
|
||||||
print("Newest song will be played first")
|
print("Newest song will be played first")
|
||||||
elif arg.startswith("list:"):
|
elif arg.startswith("list:"):
|
||||||
selected_list = arg.removeprefix("list:")
|
selected_list = arg.removeprefix("list:")
|
||||||
print(f"The list {arg} will be played instead of the daily section lists.")
|
print(f"The list {selected_list.split(';')[0]} will be played instead of the daily section lists.")
|
||||||
for arg in selected_list.split(";"):
|
for option in selected_list.split(";"):
|
||||||
if arg == "n":
|
if option == "n":
|
||||||
play_newest_first = True
|
play_newest_first = True
|
||||||
elif arg == "ns":
|
elif option == "ns":
|
||||||
do_shuffle = False
|
do_shuffle = False
|
||||||
selected_list = selected_list.split(";")[0]
|
selected_list = selected_list.split(";")[0]
|
||||||
elif os.path.isfile(arg):
|
elif os.path.isfile(arg):
|
||||||
@@ -197,67 +222,83 @@ def main():
|
|||||||
else:
|
else:
|
||||||
print(f"Invalid argument or file not found: {arg}")
|
print(f"Invalid argument or file not found: {arg}")
|
||||||
|
|
||||||
if pre_track_path:
|
return arg, play_newest_first, do_shuffle, pre_track_path, selected_list
|
||||||
track_name = os.path.basename(pre_track_path)
|
|
||||||
print(f"Now playing: {track_name}")
|
|
||||||
update_rds(track_name)
|
|
||||||
subprocess.run(['ffplay', '-nodisp', '-hide_banner', '-autoexit', '-loglevel', 'quiet', pre_track_path], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
|
|
||||||
if can_delete_file("/tmp/radioPlayer_quit"):
|
|
||||||
os.remove("/tmp/radioPlayer_quit")
|
|
||||||
exit()
|
|
||||||
|
|
||||||
while True:
|
def main():
|
||||||
if selected_list:
|
while True: # Main reload loop
|
||||||
print("Playing custom list")
|
arg, play_newest_first, do_shuffle, pre_track_path, selected_list = parse_arguments()
|
||||||
play_playlist(selected_list, True, play_newest_first, do_shuffle)
|
|
||||||
continue
|
|
||||||
|
|
||||||
current_hour = get_current_hour()
|
if pre_track_path:
|
||||||
current_day = get_current_day()
|
track_name = os.path.basename(pre_track_path)
|
||||||
|
print(f"Now playing: {track_name}")
|
||||||
|
update_rds(track_name)
|
||||||
|
subprocess.run(['ffplay', '-nodisp', '-hide_banner', '-autoexit', '-loglevel', 'quiet', pre_track_path], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
|
||||||
|
|
||||||
morning_playlist = os.path.join(playlist_dir, current_day, 'morning')
|
action = check_control_files()
|
||||||
day_playlist = os.path.join(playlist_dir, current_day, 'day')
|
if action == "quit":
|
||||||
night_playlist = os.path.join(playlist_dir, current_day, 'night')
|
exit()
|
||||||
late_night_playlist = os.path.join(playlist_dir, current_day, 'late_night')
|
elif action == "reload":
|
||||||
|
print("Reload requested, restarting with new arguments...")
|
||||||
|
continue # Restart the main loop
|
||||||
|
|
||||||
morning_dir = os.path.dirname(morning_playlist)
|
playlist_loop_active = True
|
||||||
day_dir = os.path.dirname(day_playlist)
|
while playlist_loop_active:
|
||||||
night_dir = os.path.dirname(night_playlist)
|
if selected_list:
|
||||||
late_night_dir = os.path.dirname(late_night_playlist)
|
print("Playing custom list")
|
||||||
|
result = play_playlist(selected_list, True, play_newest_first, do_shuffle)
|
||||||
|
if result == "reload":
|
||||||
|
playlist_loop_active = False # Break out to reload
|
||||||
|
continue
|
||||||
|
|
||||||
if not os.path.exists(morning_dir):
|
current_hour = get_current_hour()
|
||||||
print(f"Creating directory: {morning_dir}")
|
current_day = get_current_day()
|
||||||
os.makedirs(morning_dir, exist_ok=True)
|
|
||||||
if not os.path.exists(day_dir):
|
|
||||||
print(f"Creating directory: {day_dir}")
|
|
||||||
os.makedirs(day_dir, exist_ok=True)
|
|
||||||
|
|
||||||
if not os.path.exists(night_dir):
|
morning_playlist = os.path.join(playlist_dir, current_day, 'morning')
|
||||||
print(f"Creating directory: {night_dir}")
|
day_playlist = os.path.join(playlist_dir, current_day, 'day')
|
||||||
os.makedirs(night_dir, exist_ok=True)
|
night_playlist = os.path.join(playlist_dir, current_day, 'night')
|
||||||
|
late_night_playlist = os.path.join(playlist_dir, current_day, 'late_night')
|
||||||
|
|
||||||
if not os.path.exists(late_night_dir):
|
morning_dir = os.path.dirname(morning_playlist)
|
||||||
print(f"Creating directory: {late_night_dir}")
|
day_dir = os.path.dirname(day_playlist)
|
||||||
os.makedirs(late_night_dir, exist_ok=True)
|
night_dir = os.path.dirname(night_playlist)
|
||||||
|
late_night_dir = os.path.dirname(late_night_playlist)
|
||||||
|
|
||||||
for playlist_path in [morning_playlist, day_playlist, night_playlist, late_night_playlist]:
|
if not os.path.exists(morning_dir):
|
||||||
if not os.path.exists(playlist_path):
|
print(f"Creating directory: {morning_dir}")
|
||||||
print(f"Creating empty playlist: {playlist_path}")
|
os.makedirs(morning_dir, exist_ok=True)
|
||||||
with open(playlist_path, 'w') as f:
|
if not os.path.exists(day_dir):
|
||||||
pass
|
print(f"Creating directory: {day_dir}")
|
||||||
|
os.makedirs(day_dir, exist_ok=True)
|
||||||
|
|
||||||
if DAY_START <= current_hour < DAY_END:
|
if not os.path.exists(night_dir):
|
||||||
print(f"Playing {current_day} day playlist...")
|
print(f"Creating directory: {night_dir}")
|
||||||
play_playlist(day_playlist, False, play_newest_first, do_shuffle)
|
os.makedirs(night_dir, exist_ok=True)
|
||||||
elif MORNING_START <= current_hour < MORNING_END:
|
|
||||||
print(f"Playing {current_day} morning playlist...")
|
if not os.path.exists(late_night_dir):
|
||||||
play_playlist(morning_playlist, False, play_newest_first, do_shuffle)
|
print(f"Creating directory: {late_night_dir}")
|
||||||
elif LATE_NIGHT_START <= current_hour < LATE_NIGHT_END:
|
os.makedirs(late_night_dir, exist_ok=True)
|
||||||
print(f"Playing {current_day} late_night playlist...")
|
|
||||||
play_playlist(late_night_playlist, False, play_newest_first, do_shuffle)
|
for playlist_path in [morning_playlist, day_playlist, night_playlist, late_night_playlist]:
|
||||||
else:
|
if not os.path.exists(playlist_path):
|
||||||
print(f"Playing {current_day} night playlist...")
|
print(f"Creating empty playlist: {playlist_path}")
|
||||||
play_playlist(night_playlist, False, play_newest_first, do_shuffle)
|
with open(playlist_path, 'w') as f:
|
||||||
|
pass
|
||||||
|
|
||||||
|
if DAY_START <= current_hour < DAY_END:
|
||||||
|
print(f"Playing {current_day} day playlist...")
|
||||||
|
result = play_playlist(day_playlist, False, play_newest_first, do_shuffle)
|
||||||
|
elif MORNING_START <= current_hour < MORNING_END:
|
||||||
|
print(f"Playing {current_day} morning playlist...")
|
||||||
|
result = play_playlist(morning_playlist, False, play_newest_first, do_shuffle)
|
||||||
|
elif LATE_NIGHT_START <= current_hour < LATE_NIGHT_END:
|
||||||
|
print(f"Playing {current_day} late_night playlist...")
|
||||||
|
result = play_playlist(late_night_playlist, False, play_newest_first, do_shuffle)
|
||||||
|
else:
|
||||||
|
print(f"Playing {current_day} night playlist...")
|
||||||
|
result = play_playlist(night_playlist, False, play_newest_first, do_shuffle)
|
||||||
|
|
||||||
|
if result == "reload":
|
||||||
|
playlist_loop_active = False # Break out to reload
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
|||||||
Reference in New Issue
Block a user