andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mpd: Upate command reflection to handle new commands helper

Browse Source
This commit is contained in:
Thomas Adamcik 2014-01-22 23:26:31 +01:00
parent 55a46c31d7
commit 9df2eebfe2
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
mopidy/mpd/protocol/reflection.py
View File

@ -26,13 +26,21 @@ def commands(context):
Shows which commands the current user has access to. Shows which commands the current user has access to.
""" """
if context.dispatcher.authenticated: command_names = set()
command_names = set(command.name for command in protocol.mpd_commands) for name, handler in protocol.commands.handlers.items():
else: if not handler.list_command:
command_names = set( continue
command.name for command in protocol.mpd_commands if context.dispatcher.authenticated or not handler.auth_required:
if not command.auth_required) command_names.add(name)
# TODO: remove
if context.dispatcher.authenticated:
command_names.update(c.name for c in protocol.mpd_commands)
else:
command_names.update(c.name for c in protocol.mpd_commands
if not c.auth_required)
# TODO: remove once we've marked all of these as list_command=False
# No one is permited to use 'config' or 'kill', rest of commands are not # No one is permited to use 'config' or 'kill', rest of commands are not
# listed by MPD, so we shouldn't either. # listed by MPD, so we shouldn't either.
command_names = command_names - set([ command_names = command_names - set([
@ -80,15 +88,17 @@ def notcommands(context):
Shows which commands the current user does not have access to. Shows which commands the current user does not have access to.
""" """
if context.dispatcher.authenticated: command_names = set(['config', 'kill']) # No permission to use
command_names = [] for name, handler in protocol.commands.handlers.items():
else: if not handler.list_command:
command_names = [command.name for command in protocol.mpd_commands continue
if command.auth_required] if not context.dispatcher.authenticated and handler.auth_required:
command_names.add(name)
# No permission to use # TODO: remove
command_names.append('config') if not context.dispatcher.authenticated:
command_names.append('kill') command_names.update(command.name for command in protocol.mpd_commands
if command.auth_required)
return [ return [
('command', command_name) for command_name in sorted(command_names)] ('command', command_name) for command_name in sorted(command_names)]