ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed show rule detail and discovering devices (handle empty search result)

Browse Source
This commit is contained in:
Simon Stürz 2014-12-11 16:21:27 +01:00 committed by Michael Zanetti
parent 0dd6bdb974
commit fc0fd70cf1
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/scripts/cmdmgr.py
View File

@ -229,6 +229,9 @@ def discover_device(deviceClassId = None):
for deviceDescriptor in response['params']['deviceDescriptors']: for deviceDescriptor in response['params']['deviceDescriptors']:
deviceDescriptorList.append("%s (%s)" % (deviceDescriptor['title'], deviceDescriptor['description'])) deviceDescriptorList.append("%s (%s)" % (deviceDescriptor['title'], deviceDescriptor['description']))
deviceDescriptorIdList.append(deviceDescriptor['id']) deviceDescriptorIdList.append(deviceDescriptor['id'])
if not deviceDescriptorIdList:
print "\n No device found"
return -1
selection = get_selection("Please select a device descriptor", deviceDescriptorList) selection = get_selection("Please select a device descriptor", deviceDescriptorList)
if selection != None: if selection != None:
return deviceDescriptorIdList[selection] return deviceDescriptorIdList[selection]
@ -318,6 +321,8 @@ def add_device():
add_configured_device(deviceClassId) add_configured_device(deviceClassId)
elif "CreateMethodDiscovery" in deviceClass['createMethods']: elif "CreateMethodDiscovery" in deviceClass['createMethods']:
deviceDescriptorId = discover_device(deviceClassId) deviceDescriptorId = discover_device(deviceClassId)
if deviceDescriptorId == -1:
return
add_discovered_device(deviceClassId, deviceDescriptorId) add_discovered_device(deviceClassId, deviceDescriptorId)
elif "CreateMethodAuto" in deviceClass['createMethods']: elif "CreateMethodAuto" in deviceClass['createMethods']:
print "Can't create this device manually. It'll be created automatically when hardware is discovered." print "Can't create this device manually. It'll be created automatically when hardware is discovered."
@ -580,8 +585,9 @@ def list_rule_detail():
params = {} params = {}
params['ruleId'] = ruleId params['ruleId'] = ruleId
response = send_command("Rules.GetRuleDetails", params) response = send_command("Rules.GetRuleDetails", params)
#print response print response
print "\nThe rule", ruleId, "depends on following EventDescriptors:\n" print "\nThe rule", ruleId, "depends on following EventDescriptors and triggers"
print "only if ", get_stateEvaluator_text(response['params']['rule']['stateEvaluator']['operator']), "are true.\n"
print "Events:" print "Events:"
for i in range(len(response['params']['rule']['eventDescriptors'])): for i in range(len(response['params']['rule']['eventDescriptors'])):
eventDescriptor = response['params']['rule']['eventDescriptors'][i] eventDescriptor = response['params']['rule']['eventDescriptors'][i]
@ -596,7 +602,7 @@ def list_rule_detail():
print "\nActions:" print "\nActions:"
for i in range(len(response['params']['rule']['actions'])): for i in range(len(response['params']['rule']['actions'])):
action = response['params']['rule']['actions'][i] action = response['params']['rule']['actions'][i]
device = get_device(eventDescriptor['deviceId']) device = get_device(action['deviceId'])
actionType = get_actionType(response['params']['rule']['actions'][i]['actionTypeId']) actionType = get_actionType(response['params']['rule']['actions'][i]['actionTypeId'])
actionParams = response['params']['rule']['actions'][i]['params'] actionParams = response['params']['rule']['actions'][i]['params']
print "%5s. -> %40s -> action: %s" %(i, device['name'], actionType['name']) print "%5s. -> %40s -> action: %s" %(i, device['name'], actionType['name'])
@ -620,6 +626,14 @@ def get_valueOperator_symbol(valueOperator):
else: else:
return "<unknown value operator>" return "<unknown value operator>"
def get_stateEvaluator_text(stateEvaluator):
if stateEvaluator == "StateOperatorAnd":
return "ALL of the events/states"
elif stateEvaluator == "StateOperatorOr":
return "ONE of this events/states"
else:
return "<unknown state evaluator>"
def list_rules_containig_deviceId(): def list_rules_containig_deviceId():
deviceId = select_configured_device() deviceId = select_configured_device()