beenull/YCast
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Independent hardcoded vTuner URL handling

Browse source 
All 'setupapp' calls are handled independently.
Allows for easier distinction between hardcoded vTuner URLs and our
own API calls.
Also may prevent client crashes because of an invalid response with a
landing page.
This commit is contained in:
milaq 2019-08-22 01:31:13 +02:00
parent 67ac5bd70a
commit 8504097e15
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ycast/server.py
View file

@ -1,6 +1,6 @@
import logging import logging
from flask import Flask, request, url_for from flask import Flask, request, url_for, redirect, abort
import ycast.vtuner as vtuner import ycast.vtuner as vtuner
import ycast.radiobrowser as radiobrowser import ycast.radiobrowser as radiobrowser
@ -81,14 +81,21 @@ def get_paged_elements(items, requestargs):
return items[offset:limit] return items[offset:limit]
@app.route('/', defaults={'path': ''})
@app.route('/setupapp/<path:path>') @app.route('/setupapp/<path:path>')
@app.route('/' + PATH_ROOT + '/', defaults={'path': ''}) def upstream(path):
def landing(path):
if request.args.get('token') == '0': if request.args.get('token') == '0':
return vtuner.get_init_token() return vtuner.get_init_token()
if request.args.get('search'): if request.args.get('search'):
return station_search() return station_search()
if 'loginXML.asp' in path:
return redirect(url_for('landing', _external=True), code=302)
logging.error("Unhandled upstream query (/setupapp/%s)", path)
abort(404)
@app.route('/', defaults={'path': ''})
@app.route('/' + PATH_ROOT + '/', defaults={'path': ''})
def landing(path):
page = vtuner.Page() page = vtuner.Page()
page.add(vtuner.Directory('Radiobrowser', url_for('radiobrowser_landing', _external=True), 4)) page.add(vtuner.Directory('Radiobrowser', url_for('radiobrowser_landing', _external=True), 4))
if my_stations_enabled: if my_stations_enabled: