mirror of
https://github.com/radio95-rnt/RadioPlayer.git
synced 2026-07-29 15:29:14 +02:00
swap order of jingle/remover
This commit is contained in:
+1
-1
@@ -58,7 +58,7 @@ class Module2(PlayerModule):
|
|||||||
return self._imc.send(self, "activemod", {"action": "add_to_toplay", "songs": [f"!{jingle}"], "top": bool(data)})
|
return self._imc.send(self, "activemod", {"action": "add_to_toplay", "songs": [f"!{jingle}"], "top": bool(data)})
|
||||||
|
|
||||||
module = Module2()
|
module = Module2()
|
||||||
playlistmod = Module(), 2
|
playlistmod = Module(), 3
|
||||||
|
|
||||||
# This is free and unencumbered software released into the public domain.
|
# This is free and unencumbered software released into the public domain.
|
||||||
|
|
||||||
|
|||||||
+8
-15
@@ -11,20 +11,14 @@ def get_day():
|
|||||||
return t.day + (t.month * 100)
|
return t.day + (t.month * 100)
|
||||||
|
|
||||||
def load_played():
|
def load_played():
|
||||||
if not PLAYED_FILE.exists():
|
if not PLAYED_FILE.exists(): return
|
||||||
return
|
|
||||||
lines = PLAYED_FILE.read_text().splitlines()
|
lines = PLAYED_FILE.read_text().splitlines()
|
||||||
if not lines:
|
if not lines: return
|
||||||
return
|
try: saved_day = int(lines[0])
|
||||||
try:
|
except ValueError: return
|
||||||
saved_day = int(lines[0])
|
if saved_day != get_day(): return # Different day, discard
|
||||||
except ValueError:
|
|
||||||
return
|
|
||||||
if saved_day != get_day():
|
|
||||||
return # Different day, discard
|
|
||||||
for line in lines[1:]:
|
for line in lines[1:]:
|
||||||
if line:
|
if line: played_tracks.add(Path(line))
|
||||||
played_tracks.add(Path(line))
|
|
||||||
|
|
||||||
def save_played():
|
def save_played():
|
||||||
PLAYED_FILE.parent.mkdir(parents=True, exist_ok=True)
|
PLAYED_FILE.parent.mkdir(parents=True, exist_ok=True)
|
||||||
@@ -41,12 +35,11 @@ class Module(PlaylistModifierModule):
|
|||||||
played_tracks.clear()
|
played_tracks.clear()
|
||||||
save_played()
|
save_played()
|
||||||
return playlist
|
return playlist
|
||||||
|
|
||||||
output = []
|
output = []
|
||||||
for track in playlist:
|
for track in playlist:
|
||||||
if track.path in played_tracks: continue
|
if track.path in played_tracks: continue
|
||||||
output.append(track)
|
output.append(track)
|
||||||
if len(output) < (len(playlist) / 4): return playlist
|
if len(output) < (len(playlist) // 2): return playlist
|
||||||
return output
|
return output
|
||||||
|
|
||||||
class Module2(PlayerModule):
|
class Module2(PlayerModule):
|
||||||
@@ -55,7 +48,7 @@ class Module2(PlayerModule):
|
|||||||
played_tracks.add(track.path)
|
played_tracks.add(track.path)
|
||||||
save_played()
|
save_played()
|
||||||
|
|
||||||
playlistmod = Module(), 3
|
playlistmod = Module(), 2
|
||||||
module = Module2()
|
module = Module2()
|
||||||
|
|
||||||
# This is free and unencumbered software released into the public domain.
|
# This is free and unencumbered software released into the public domain.
|
||||||
|
|||||||
Reference in New Issue
Block a user