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

Update sanic deprications and remove asyncio stuff not needed.

Browse source
This commit is contained in:
Matthew Stratford 2022-03-19 16:03:18 +00:00
parent 86c0ca14e7
commit 01dfb3f3d6
1 changed files with 23 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
web_server.py
View file

@ -1,10 +1,8 @@
from sanic import Sanic from sanic import Sanic
from sanic.exceptions import NotFound, abort from sanic.exceptions import NotFound, SanicException
from sanic.response import html, file, redirect from sanic.response import html, file, redirect
from sanic.response import json as resp_json from sanic.response import json as resp_json
from sanic_cors import CORS from sanic_cors import CORS
from syncer import sync
import asyncio
from jinja2 import Environment, FileSystemLoader from jinja2 import Environment, FileSystemLoader
from jinja2.utils import select_autoescape from jinja2.utils import select_autoescape
from urllib.parse import unquote from urllib.parse import unquote
@ -89,7 +87,7 @@ LOGGING_CONFIG = dict(
}, },
) )
app = Sanic("BAPSicle Web Server", log_config=LOGGING_CONFIG) app = Sanic("BAPSicle-WebServer", log_config=LOGGING_CONFIG)
def render_template(file, data, status=200): def render_template(file, data, status=200):
@ -258,8 +256,7 @@ def ui_logs_render(request, path):
try: try:
log_file = open(resolve_external_file_path("/logs/{}.log").format(path)) log_file = open(resolve_external_file_path("/logs/{}.log").format(path))
except FileNotFoundError: except FileNotFoundError:
abort(404) raise SanicException("Not Found",404)
return
data = { data = {
"logs": log_file.read().splitlines()[ "logs": log_file.read().splitlines()[
@ -285,10 +282,10 @@ def player_simple(request, channel: int, command: str):
player_to_q[channel].put("UI:" + command.upper()) player_to_q[channel].put("UI:" + command.upper())
return redirect("/status") return redirect("/status")
abort(404) raise SanicException("Not Found",404)
@app.route("/player/<channel:int>/seek/<pos:number>") @app.route("/player/<channel:int>/seek/<pos:float>")
def player_seek(request, channel: int, pos: float): def player_seek(request, channel: int, pos: float):
player_to_q[channel].put("UI:SEEK:" + str(pos)) player_to_q[channel].put("UI:SEEK:" + str(pos))
@ -310,7 +307,7 @@ def player_remove(request, channel: int, channel_weight: int):
return redirect("/status") return redirect("/status")
@app.route("/player/<channel:int>/output/<name:string>") @app.route("/player/<channel:int>/output/<name:str>")
def player_output(request, channel: int, name: Optional[str]): def player_output(request, channel: int, name: Optional[str]):
player_to_q[channel].put("UI:OUTPUT:" + unquote(str(name))) player_to_q[channel].put("UI:OUTPUT:" + unquote(str(name)))
return redirect("/config/player") return redirect("/config/player")
@ -322,7 +319,7 @@ def player_autoadvance(request, channel: int, state: int):
return redirect("/status") return redirect("/status")
@app.route("/player/<channel:int>/repeat/<state:string>") @app.route("/player/<channel:int>/repeat/<state:str>")
def player_repeat(request, channel: int, state: str): def player_repeat(request, channel: int, state: str):
player_to_q[channel].put("UI:REPEAT:" + state.upper()) player_to_q[channel].put("UI:REPEAT:" + state.upper())
return redirect("/status") return redirect("/status")
@ -386,11 +383,11 @@ async def api_search_library(request):
) )
@app.route("/library/playlists/<type:string>") @app.route("/library/playlists/<type:str>")
async def api_get_playlists(request, type: str): async def api_get_playlists(request, type: str):
if type not in ["music", "aux"]: if type not in ["music", "aux"]:
abort(401) raise SanicException("Bad Request",400)
if type == "music": if type == "music":
return resp_json(await api.get_playlist_music()) return resp_json(await api.get_playlist_music())
@ -398,11 +395,11 @@ async def api_get_playlists(request, type: str):
return resp_json(await api.get_playlist_aux()) return resp_json(await api.get_playlist_aux())
@app.route("/library/playlist/<type:string>/<library_id:string>") @app.route("/library/playlist/<type:str>/<library_id:str>")
async def api_get_playlist(request, type: str, library_id: str): async def api_get_playlist(request, type: str, library_id: str):
if type not in ["music", "aux"]: if type not in ["music", "aux"]:
abort(401) raise SanicException("Bad Request",400)
if type == "music": if type == "music":
return resp_json(await api.get_playlist_music_items(library_id)) return resp_json(await api.get_playlist_music_items(library_id))
@ -424,10 +421,10 @@ def json_status(request):
# Get audio for UI to generate waveforms. # Get audio for UI to generate waveforms.
@app.route("/audiofile/<type:string>/<id:int>") @app.route("/audiofile/<type:str>/<id:int>")
async def audio_file(request, type: str, id: int): async def audio_file(request, type: str, id: int):
if type not in ["managed", "track"]: if type not in ["managed", "track"]:
abort(404) raise SanicException("Bad Request",400)
filename = resolve_external_file_path( filename = resolve_external_file_path(
"music-tmp/{}-{}.mp3".format(type, id)) "music-tmp/{}-{}.mp3".format(type, id))
@ -438,8 +435,7 @@ async def audio_file(request, type: str, id: int):
try: try:
response = await file(filename) response = await file(filename)
except FileNotFoundError: except FileNotFoundError:
abort(404) raise SanicException("Not Found",404)
return
return response return response
@ -552,7 +548,6 @@ def WebServer(player_to: List[Queue], player_from: Queue, state: StateManager):
terminate = Terminator() terminate = Terminator()
while not terminate.terminate: while not terminate.terminate:
try: try:
sync(
app.run( app.run(
host=server_state.get()["host"], host=server_state.get()["host"],
port=server_state.get()["port"], port=server_state.get()["port"],
@ -560,15 +555,6 @@ def WebServer(player_to: List[Queue], player_from: Queue, state: StateManager):
debug=not package.BETA, debug=not package.BETA,
access_log=not package.BETA, access_log=not package.BETA,
) )
) except Exception as e:
except Exception: logger.log.exception(e)
break sleep(1)
try:
loop = asyncio.get_event_loop()
if loop:
loop.close()
if app:
app.stop()
del app
except Exception:
pass