radio95/RadioPlayer
0
1
Fork 0
mirror of https://github.com/radio95-rnt/RadioPlayer.git synced 2026-02-26 21:53:54 +01:00
Code Issues Activity

remove start_newest_first

Browse Source
This commit is contained in:
KubaPro010
2025-09-27 20:09:47 +02:00
parent 7f0161c75e
commit 0e37ff1ac8
1 changed files with 13 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
radioPlayer.py
View File

@@ -208,23 +208,6 @@ def load_playlist(playlist_path):
logger.error(f"Playlist not found: {playlist_path}") logger.error(f"Playlist not found: {playlist_path}")
return [] return []
def get_newest_track(tracks):
if not tracks: return None
newest_track = None
newest_time = 0
for track in tracks:
track_path = os.path.abspath(os.path.expanduser(track))
try:
mod_time = os.path.getmtime(track_path)
if mod_time > newest_time:
newest_time = mod_time
newest_track = track
except OSError: continue
return newest_track
def check_if_playlist_modifed(playlist_path: str, custom_playlist: bool = False): def check_if_playlist_modifed(playlist_path: str, custom_playlist: bool = False):
current_day, current_hour = Time.get_day_hour() current_day, current_hour = Time.get_day_hour()
morning_playlist_path = os.path.join(playlist_dir, current_day, 'morning') morning_playlist_path = os.path.join(playlist_dir, current_day, 'morning')
@@ -249,7 +232,7 @@ def check_if_playlist_modifed(playlist_path: str, custom_playlist: bool = False)
logger.info("Time changed to night hours, switching playlist...") logger.info("Time changed to night hours, switching playlist...")
return True return True
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, do_shuffle=True):
last_modified_time = Time.get_playlist_modification_time(playlist_path) last_modified_time = Time.get_playlist_modification_time(playlist_path)
tracks = load_playlist(playlist_path) tracks = load_playlist(playlist_path)
if not tracks: if not tracks:
@@ -257,18 +240,9 @@ def play_playlist(playlist_path, custom_playlist: bool=False, play_newest_first=
time.sleep(15) time.sleep(15)
return return
if do_shuffle: random.seed() if do_shuffle:
random.seed()
# Normal playlist preparation random.shuffle(tracks)
if play_newest_first:
newest_track = get_newest_track(tracks)
if newest_track:
logger.info(f"Playing newest track first: {os.path.basename(newest_track)}")
tracks.remove(newest_track)
if do_shuffle: random.shuffle(tracks)
tracks.insert(0, newest_track)
else:
if do_shuffle: random.shuffle(tracks)
playlist: list[tuple[str, bool, bool, bool]] = [] # name, fade in, fade out, official playlist: list[tuple[str, bool, bool, bool]] = [] # name, fade in, fade out, official
last_jingiel = True last_jingiel = True
@@ -325,7 +299,6 @@ def can_delete_file(filepath):
def parse_arguments(): def parse_arguments():
"""Parse command line arguments and return configuration""" """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
do_shuffle = True do_shuffle = True
pre_track_path = None pre_track_path = None
selected_list = None selected_list = None
@@ -337,7 +310,6 @@ def parse_arguments():
print(" /tmp/radioPlayer_arg - Contains arguments to use") print(" /tmp/radioPlayer_arg - Contains arguments to use")
print() print()
print("Arguments:") print("Arguments:")
print(" n - Play newest song first")
print(" list:playlist;options - Play custom playlist with options") print(" list:playlist;options - Play custom playlist with options")
print(" /path/to/file - Play specific file first") print(" /path/to/file - Play specific file first")
print() print()
@@ -349,27 +321,23 @@ def parse_arguments():
os.remove("/tmp/radioPlayer_arg") os.remove("/tmp/radioPlayer_arg")
if arg: if arg:
if arg.lower() == "n": if arg.startswith("list:"):
play_newest_first = True
logger.info("Newest song will be played first")
elif arg.startswith("list:"):
selected_list = arg.removeprefix("list:") selected_list = arg.removeprefix("list:")
logger.info(f"The list {selected_list.split(';')[0]} will be played instead of the daily section lists.") logger.info(f"The list {selected_list.split(';')[0]} will be played instead of the daily section lists.")
for option in selected_list.split(";"): for option in selected_list.split(";"):
if option == "n": play_newest_first = True if option == "s": do_shuffle = False
elif option == "ns": 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):
pre_track_path = arg pre_track_path = arg
logger.info(f"Will play requested song first: {arg}") logger.info(f"Will play requested song first: {arg}")
else: logger.error(f"Invalid argument or file not found: {arg}") else: logger.error(f"Invalid argument or file not found: {arg}")
return play_newest_first, do_shuffle, pre_track_path, selected_list return do_shuffle, pre_track_path, selected_list
def main(): def main():
try: try:
while True: while True:
play_newest_first, do_shuffle, pre_track_path, selected_list = parse_arguments() do_shuffle, pre_track_path, selected_list = parse_arguments()
if pre_track_path: if pre_track_path:
track_name = os.path.basename(pre_track_path) track_name = os.path.basename(pre_track_path)
@@ -387,7 +355,7 @@ def main():
while play_loop: while play_loop:
if selected_list: if selected_list:
logger.info("Playing custom list") logger.info("Playing custom list")
result = play_playlist(selected_list, True, play_newest_first, do_shuffle) result = play_playlist(selected_list, True, do_shuffle)
if result == "reload": play_loop = False if result == "reload": play_loop = False
continue continue
@@ -415,16 +383,16 @@ def main():
if DAY_START <= current_hour < DAY_END: if DAY_START <= current_hour < DAY_END:
logger.info(f"Playing {current_day} day playlist...") logger.info(f"Playing {current_day} day playlist...")
result = play_playlist(day_playlist, False, play_newest_first, do_shuffle) result = play_playlist(day_playlist, False, do_shuffle)
elif MORNING_START <= current_hour < MORNING_END: elif MORNING_START <= current_hour < MORNING_END:
logger.info(f"Playing {current_day} morning playlist...") logger.info(f"Playing {current_day} morning playlist...")
result = play_playlist(morning_playlist, False, play_newest_first, do_shuffle) result = play_playlist(morning_playlist, False, do_shuffle)
elif LATE_NIGHT_START <= current_hour < LATE_NIGHT_END: elif LATE_NIGHT_START <= current_hour < LATE_NIGHT_END:
logger.info(f"Playing {current_day} late_night playlist...") logger.info(f"Playing {current_day} late_night playlist...")
result = play_playlist(late_night_playlist, False, play_newest_first, do_shuffle) result = play_playlist(late_night_playlist, False, do_shuffle)
else: else:
logger.info(f"Playing {current_day} night playlist...") logger.info(f"Playing {current_day} night playlist...")
result = play_playlist(night_playlist, False, play_newest_first, do_shuffle) result = play_playlist(night_playlist, False, do_shuffle)
if exit_pending: exit() if exit_pending: exit()
elif reload_pending: elif reload_pending: