update
This commit is contained in:
@@ -1,29 +1,22 @@
|
|||||||
from enum import Enum
|
|
||||||
import os
|
import os
|
||||||
from pprint import pprint
|
from pprint import pprint
|
||||||
from typing import Optional, Set
|
from typing import Set
|
||||||
import discord
|
import discord
|
||||||
from discord.ext import commands
|
from discord.ext import commands
|
||||||
from threading import Thread
|
|
||||||
from dotenv import load_dotenv
|
from dotenv import load_dotenv
|
||||||
from fastapi.concurrency import asynccontextmanager
|
from fastapi.concurrency import asynccontextmanager
|
||||||
from pydantic import BaseModel
|
from pydantic import BaseModel
|
||||||
import asyncio
|
import asyncio
|
||||||
import websockets
|
import websockets
|
||||||
import json
|
import json
|
||||||
import time
|
from src.models import BotResponse
|
||||||
from src.models import BotResponse, BotStatus, MessageType, PlaybackInformation
|
|
||||||
from src.my_voice_client import get_voice_client, set_voice_client
|
from src.my_voice_client import get_voice_client, set_voice_client
|
||||||
from src.playback_service import (
|
from src.playback_service import (
|
||||||
get_filename_and_starttime,
|
|
||||||
get_status,
|
|
||||||
handle_message,
|
handle_message,
|
||||||
handle_new_song_on_queue,
|
handle_new_song_on_queue,
|
||||||
pause_song,
|
pause_song,
|
||||||
play_current_song,
|
|
||||||
start_time_now,
|
|
||||||
)
|
)
|
||||||
from src.song_queue import add_to_queue, get_current_metadata, handle_song_end, has_current_song, move_to_last_song_in_queue
|
from src.song_queue import add_to_queue
|
||||||
|
|
||||||
load_dotenv()
|
load_dotenv()
|
||||||
|
|
||||||
@@ -97,21 +90,11 @@ async def stop(ctx: commands.Context):
|
|||||||
async def pause(ctx: commands.Context):
|
async def pause(ctx: commands.Context):
|
||||||
pause_song()
|
pause_song()
|
||||||
|
|
||||||
# def run_websocket():
|
|
||||||
# print("started websocket")
|
|
||||||
# loop = asyncio.new_event_loop()
|
|
||||||
# asyncio.set_event_loop(loop)
|
|
||||||
# start_server = websockets.serve(websocket_handler, "0.0.0.0", 5678)
|
|
||||||
# loop.run_until_complete(start_server)
|
|
||||||
# loop.run_forever()
|
|
||||||
|
|
||||||
async def start_websocket_server():
|
async def start_websocket_server():
|
||||||
print("Starting WebSocket server...")
|
print("Starting WebSocket server...")
|
||||||
async with websockets.serve(websocket_handler, "0.0.0.0", 5678, ):
|
async with websockets.serve(websocket_handler, "0.0.0.0", 5678, ):
|
||||||
await asyncio.Future()
|
await asyncio.Future()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@asynccontextmanager
|
@asynccontextmanager
|
||||||
async def lifespan(app: FastAPI):
|
async def lifespan(app: FastAPI):
|
||||||
# Start WebSocket and Discord bot in managed background tasks
|
# Start WebSocket and Discord bot in managed background tasks
|
||||||
|
|||||||
Reference in New Issue
Block a user