Mirrored_Repos/houdini
1
0
Fork 0
mirror of https://github.com/solero/houdini.git synced 2024-11-12 13:48:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Keep track of penguins by track ID in case they go offline whilst live

Browse Source
This commit is contained in:
Ben 2020-06-12 15:21:55 +01:00
parent 112eabf2df
commit 4eb93c74a8
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
houdini/handlers/play/music.py
View File

@ -24,11 +24,12 @@ class SoundStudio:
self.playlist = [] self.playlist = []
self.current_track = None self.current_track = None
self.room = server.rooms[SoundStudio.StudioRoomId] self.penguins_by_track_id = {}
async def broadcast_next_track(self): async def broadcast_next_track(self):
await self.get_tracks() await self.get_tracks()
if not self.room.penguins_by_id or not self.playlist: room = self.server.rooms[SoundStudio.StudioRoomId]
if not room.penguins_by_id or not self.playlist:
await self.send_broadcasted_tracks() await self.send_broadcasted_tracks()
await self.stop_broadcasting() await self.stop_broadcasting()
else: else:
@ -64,26 +65,30 @@ class SoundStudio:
async def get_tracks(self): async def get_tracks(self):
self.playlist = [] self.playlist = []
self.penguins_by_track_id = {}
room = self.server.rooms[SoundStudio.StudioRoomId]
room_penguins = room.penguins_by_id.copy()
likes = db.func.count(TrackLike.track_id) likes = db.func.count(TrackLike.track_id)
tracks_query = db.select([PenguinTrack, likes]) \ tracks_query = db.select([PenguinTrack, likes]) \
.select_from(PenguinTrack.outerjoin(TrackLike)) \ .select_from(PenguinTrack.outerjoin(TrackLike)) \
.where((PenguinTrack.owner_id.in_(tuple(self.room.penguins_by_id.keys()))) .where((PenguinTrack.owner_id.in_(tuple(room_penguins.keys())))
& (PenguinTrack.sharing == True)) \ & (PenguinTrack.sharing == True)) \
.group_by(PenguinTrack.id).gino.load(PenguinTrack.load(likes=ColumnLoader(likes))) .group_by(PenguinTrack.id).gino.load(PenguinTrack.load(likes=ColumnLoader(likes)))
async with db.transaction(): async with db.transaction():
async for track in tracks_query.iterate(): async for track in tracks_query.iterate():
self.playlist.append(track) self.playlist.append(track)
self.penguins_by_track_id[track.id] = room_penguins[track.owner_id]
async def send_broadcasted_tracks(self): async def send_broadcasted_tracks(self):
broadcasted_tracks = await self.get_broadcasted_tracks() broadcasted_tracks = await self.get_broadcasted_tracks()
for penguin in self.room.penguins_by_id.values(): room = self.server.rooms[SoundStudio.StudioRoomId]
for penguin in room.penguins_by_id.values():
playlist_position = get_playlist_position(penguin) playlist_position = get_playlist_position(penguin)
await penguin.send_xt('broadcastingmusictracks', len(self.playlist), await penguin.send_xt('broadcastingmusictracks', len(self.playlist),
playlist_position, broadcasted_tracks) playlist_position, broadcasted_tracks)
async def get_broadcasted_tracks(self): async def get_broadcasted_tracks(self):
penguins = self.server.penguins_by_id broadcasted_tracks = ','.join(f'{track.owner_id}|{self.penguins_by_track_id[track.id].safe_name}|'
broadcasted_tracks = ','.join(f'{track.owner_id}|{penguins[track.owner_id].safe_name}|'
f'{track.owner_id}|{track.id}|{track.likes}' f'{track.owner_id}|{track.id}|{track.likes}'
for track in self.playlist) for track in self.playlist)
return broadcasted_tracks return broadcasted_tracks