Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2025-12-25 18:13:17 +01:00
Code Issues Projects Releases Wiki Activity

Modified and simplified is_expand(...) method

Browse source
This commit is contained in:
Max Ammann 2016-06-13 15:08:47 +02:00
parent 619344c813
commit 2ae26548fc
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
beetsplug/web/__init__.py
View file

@ -75,8 +75,10 @@ def json_generator(items, root, expand=False):
yield ']}'
def is_expand(args):
return "expand" in args
def is_expand():
"""Returns whether the current request is for an expanded response."""
return flask.request.args.get('expand') is not None
def resource(name):
@ -88,9 +90,7 @@ def resource(name):
entities = [entity for entity in entities if entity]
if len(entities) == 1:
return flask.jsonify(
_rep(entities[0], expand=is_expand(flask.request.args))
)
return flask.jsonify(_rep(entities[0], expand=is_expand()))
elif entities:
return app.response_class(
json_generator(entities, root=name),
@ -111,7 +111,7 @@ def resource_query(name):
return app.response_class(
json_generator(
query_func(queries),
root='results', expand=is_expand(flask.request.args)
root='results', expand=is_expand()
),
mimetype='application/json'
)
@ -127,8 +127,7 @@ def resource_list(name):
def make_responder(list_all):
def responder():
return app.response_class(
json_generator(list_all(), root=name,
expand=is_expand(flask.request.args)),
json_generator(list_all(), root=name, expand=is_expand()),
mimetype='application/json'
)
responder.__name__ = 'all_{0}'.format(name)