feat: add remove from queue action and refactor models
This commit is contained in:
parent
2286d7a8d5
commit
4bd6ad85e3
5 changed files with 135 additions and 125 deletions
61
main.py
61
main.py
|
@ -1,62 +1,10 @@
|
|||
import asyncio
|
||||
from enum import Enum
|
||||
|
||||
from fastapi import FastAPI, WebSocket, WebSocketDisconnect
|
||||
from fastapi.responses import HTMLResponse
|
||||
from pydantic import BaseModel
|
||||
|
||||
from download_service import DownloadService
|
||||
from music_player import MusicPlayer, PlayerState
|
||||
|
||||
|
||||
class ChangePlayerState(Enum):
|
||||
play = "play"
|
||||
pause = "pause"
|
||||
resume = "resume"
|
||||
stop = "stop"
|
||||
|
||||
|
||||
class WSConnectionType(Enum):
|
||||
state = "state"
|
||||
queue = "queue"
|
||||
|
||||
|
||||
class ConnectionManager:
|
||||
def __init__(self) -> None:
|
||||
self.active_connections: dict[str, set[WebSocket]] = {
|
||||
WSConnectionType.state.value: set(),
|
||||
WSConnectionType.queue.value: set(),
|
||||
}
|
||||
|
||||
async def connect(self, websocket: WebSocket, type: WSConnectionType):
|
||||
await websocket.accept()
|
||||
self.active_connections[type.value].add(websocket)
|
||||
|
||||
async def send(self, ws: WebSocket, message: BaseModel):
|
||||
try:
|
||||
await ws.send_json(message.model_dump())
|
||||
except Exception:
|
||||
self.disconnect(ws)
|
||||
|
||||
async def broadcast(self, ws_type: WSConnectionType, message: BaseModel):
|
||||
broken = set()
|
||||
conn_list = list(self.active_connections[ws_type.value])
|
||||
for idx in range(len(conn_list)):
|
||||
ws = conn_list[idx]
|
||||
try:
|
||||
await ws.send_json(message.model_dump())
|
||||
except Exception:
|
||||
broken.add(ws)
|
||||
for ws in broken:
|
||||
self.disconnect(ws)
|
||||
|
||||
def disconnect(self, websocket: WebSocket):
|
||||
if websocket in self.active_connections[WSConnectionType.state.value]:
|
||||
self.active_connections[WSConnectionType.state.value].remove(websocket)
|
||||
|
||||
if websocket in self.active_connections[WSConnectionType.queue.value]:
|
||||
self.active_connections[WSConnectionType.queue.value].remove(websocket)
|
||||
|
||||
from models import MusicPlayer, PlayerState, WSConnectionType
|
||||
from services import ConnectionManager, DownloadService
|
||||
|
||||
# Setup
|
||||
tags_metadata = [
|
||||
|
@ -132,6 +80,11 @@ async def post_to_queue(url: str):
|
|||
await player.add_to_queue(track)
|
||||
|
||||
|
||||
@app.delete("/queue/{track_id}", tags=["queue"])
|
||||
def delete_from_queue(track_id: str):
|
||||
player.remove_from_queue_by_id(track_id)
|
||||
|
||||
|
||||
@app.post("/player/play", tags=["player"])
|
||||
async def player_play():
|
||||
await player.play()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue