ash/BAPSicle
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update GET_PLAN to GETPLAN and add SETPLAYED

Browse source
This commit is contained in:
Matthew Stratford 2021-09-03 21:49:16 +01:00
parent 95c0843865
commit ff605bf57f
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
player.py
View file

@ -598,14 +598,14 @@ class Player:
return success return success
def reset_played(self, weight: int): def set_played(self, weight: int, played: bool):
plan: List[PlanItem] = self.state.get()["show_plan"] plan: List[PlanItem] = self.state.get()["show_plan"]
if weight == -1: if weight == -1:
for item in plan: for item in plan:
item.play_count_reset() item.play_count_increment() if played else item.play_count_reset()
self.state.update("show_plan", plan) self.state.update("show_plan", plan)
elif len(plan) > weight: elif len(plan) > weight:
plan[weight].play_count_reset() plan[weight].play_count_increment() if played else plan[weight].play_count_reset()
self.state.update("show_plan", plan[weight], weight) self.state.update("show_plan", plan[weight], weight)
else: else:
return False return False
@ -1001,7 +1001,7 @@ class Player:
) )
), ),
# Show Plan Items # Show Plan Items
"GET_PLAN": lambda: self._retMsg( "GETPLAN": lambda: self._retMsg(
self.get_plan(int(self.last_msg.split(":")[1])) self.get_plan(int(self.last_msg.split(":")[1]))
), ),
"LOAD": lambda: self._retMsg( "LOAD": lambda: self._retMsg(
@ -1021,7 +1021,8 @@ class Player:
), ),
"CLEAR": lambda: self._retMsg(self.clear_channel_plan()), "CLEAR": lambda: self._retMsg(self.clear_channel_plan()),
"SETMARKER": lambda: self._retMsg(self.set_marker(self.last_msg.split(":")[1], self.last_msg.split(":", 2)[2])), "SETMARKER": lambda: self._retMsg(self.set_marker(self.last_msg.split(":")[1], self.last_msg.split(":", 2)[2])),
"RESETPLAYED": lambda: self._retMsg(self.reset_played(int(self.last_msg.split(":")[1]))), "RESETPLAYED": lambda: self._retMsg(self.set_played(weight=int(self.last_msg.split(":")[1]), played = False)),
"SETPLAYED": lambda: self._retMsg(self.set_played(weight=int(self.last_msg.split(":")[1]), played = True)),
"SETLIVE": lambda: self._retMsg(self.set_live(self.last_msg.split(":")[1] == "True")), "SETLIVE": lambda: self._retMsg(self.set_live(self.last_msg.split(":")[1] == "True")),
} }

4
websocket_server.py
View file

@ -146,7 +146,9 @@ class WebsocketServer:
extra += str(data["weight"]) extra += str(data["weight"])
elif command == "RESETPLAYED": elif command == "RESETPLAYED":
extra += str(data["weight"]) extra += str(data["weight"])
elif command == "GET_PLAN": elif command == "SETPLAYED":
extra += str(data["weight"])
elif command == "GETPLAN":
extra += str(data["timeslotId"]) extra += str(data["timeslotId"])
elif command == "SETMARKER": elif command == "SETMARKER":
extra += "{}:{}".format( extra += "{}:{}".format(