3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-05-25 06:56:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse source 
Conflicts:
	control/control.py
This commit is contained in:
badaix 2016-06-18 13:05:54 +02:00
commit 5e23136a53
6 changed files with 71 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
control/control.py
View file

@ -35,13 +35,20 @@ def setName(client, name):
requestId = requestId + 1
if sys.argv[2] == "setVolume":
if len(sys.argv) < 4:
print("usage: control.py <SERVER HOST> setVolume <VOLUME>")
if len(sys.argv) < 5:
print("usage: control.py <SERVER HOST> setVolume <HOSTNAME> [+/-]<VOLUME>")
exit(0)
volume = int(sys.argv[3])
volstr = sys.argv[4]
j = doRequest(json.dumps({'jsonrpc': '2.0', 'method': 'Server.GetStatus', 'id': 1}), 1)
for client in j["result"]["clients"]:
setVolume(client["host"]["mac"], volume)
if(sys.argv[3] == client['host']['name'] or sys.argv[3] == 'all'):
if(volstr[0] == '+'):
volume = int(client['config']['volume']['percent']) + int(volstr[1:])
elif(volstr[0] == '-'):
volume = int(client['config']['volume']['percent']) - int(volstr[1:])
else:
volume = int(volstr)
setVolume(client['host']['mac'], volume)
elif sys.argv[2] == "setName":
if len(sys.argv) < 5:
@ -54,7 +61,7 @@ else:
j = doRequest(json.dumps({'jsonrpc': '2.0', 'method': 'Server.GetStatus', 'id': 1}), 1)
for client in j["result"]["clients"]:
print("MAC: " + client["host"]["mac"] + ", conntect: " + str(client['connected']) + ", volume: " + str(client["config"]["volume"]["percent"]) + ", name: " + client["config"]["name"] + ", host: " + client["host"]["name"])
print("MAC: " + client['host']['mac'] + ", connect: " + str(client['connected']) + ", volume: " + str(client['config']['volume']['percent']) + ", name: " + client['host']['name'] + ", host: " + client['host']['ip'])
telnet.close