voussoir/ycdl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move make_json_response into new jsonify.py.

Browse source
This commit is contained in:
voussoir 2020-03-28 16:51:40 -07:00
parent c7ef2dd41b
commit d407326392
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
frontends/ycdl_flask/backend/jsonify.py Normal file
View file

@ -0,0 +1,8 @@
import flask
import json
def make_json_response(j, *args, **kwargs):
dumped = json.dumps(j)
response = flask.Response(dumped, *args, **kwargs)
response.headers['Content-Type'] = 'application/json;charset=utf-8'
return response

15
frontends/ycdl_flask/backend/ycdl_flask.py
View file

@ -20,6 +20,7 @@ import ycdl
from voussoirkit import pathclass
from . import jinja_filters
from . import jsonify
root_dir = pathclass.Path(__file__).parent.parent
@ -48,12 +49,6 @@ site.debug = True
####################################################################################################
####################################################################################################
def make_json_response(j, *args, **kwargs):
dumped = json.dumps(j)
response = flask.Response(dumped, *args, **kwargs)
response.headers['Content-Type'] = 'application/json;charset=utf-8'
return response
def send_file(filepath):
'''
Range-enabled file sending.
@ -218,14 +213,14 @@ def post_mark_video_state():
ycdldb.rollback()
flask.abort(400)
return make_json_response({'video_ids': video_ids, 'state': state})
return jsonify.make_json_response({'video_ids': video_ids, 'state': state})
@site.route('/refresh_all_channels', methods=['POST'])
def post_refresh_all_channels():
force = request.form.get('force', False)
force = ycdl.helpers.truthystring(force)
ycdldb.refresh_all_channels(force=force)
return make_json_response({})
return jsonify.make_json_response({})
@site.route('/refresh_channel', methods=['POST'])
def post_refresh_channel():
@ -246,7 +241,7 @@ def post_refresh_channel():
force = ycdl.helpers.truthystring(force)
ycdldb.add_channel(channel_id, commit=False)
ycdldb.refresh_channel(channel_id, force=force)
return make_json_response({})
return jsonify.make_json_response({})
@site.route('/start_download', methods=['POST'])
def post_start_download():
@ -263,7 +258,7 @@ def post_start_download():
ycdldb.rollback()
flask.abort(404)
return make_json_response({'video_ids': video_ids, 'state': 'downloaded'})
return jsonify.make_json_response({'video_ids': video_ids, 'state': 'downloaded'})
####################################################################################################
####################################################################################################