diff options
| author | Olivier Guiter <olivier.guiter@linux.intel.com> | 2011-11-15 15:24:07 +0100 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-11-15 15:50:44 +0100 |
| commit | 4f5be57582d8e9c27e0418650c40da3f64012f0a (patch) | |
| tree | 051d90b74dd94f4286a3a0b70cb4f290d441ca0f /test | |
| parent | 8ac0b194aae25b980c2822901edebe8e9d006c9a (diff) | |
| download | neard-4f5be57582d8e9c27e0418650c40da3f64012f0a.tar.gz neard-4f5be57582d8e9c27e0418650c40da3f64012f0a.tar.bz2 neard-4f5be57582d8e9c27e0418650c40da3f64012f0a.zip | |
near-ui: Monitor records and targets addition/removal signals
Diffstat (limited to 'test')
| -rwxr-xr-x | test/neard-ui.py | 62 |
1 files changed, 32 insertions, 30 deletions
diff --git a/test/neard-ui.py b/test/neard-ui.py index fd44396..3f0294e 100755 --- a/test/neard-ui.py +++ b/test/neard-ui.py @@ -64,11 +64,6 @@ class Neard: self.target_updateDetails(adapt_properties) else: self.adapter_update(adapt_path, adapt_properties) -# - - def adapter_TargetFound(self, adapt_path = None): - print("Target Found Prop changed: %s") % adapt_path - self.target_updateDetails(adapt_path) #Update the records UI def record_updateDetails(self, target_properties): @@ -86,18 +81,23 @@ class Neard: #Update the targets UI def target_updateDetails(self, adapt_properties): - for target_path in adapt_properties["Targets"]: - print ("TGT %s ") % target_path - target_obj = self.sessionBus.get_object('org.neard', target_path) - - target_iface = dbus.Interface(target_obj,'org.neard.Target') - target_properties = target_iface.GetProperties() - - self.targetregistered[target_path] = True - # call UI update - self.targets_update(target_path, target_properties) - #Process the records - self.record_updateDetails(target_properties) + if adapt_properties["Targets"]: + for target_path in adapt_properties["Targets"]: + print ("TGT %s ") % target_path + target_obj = self.sessionBus.get_object('org.neard', target_path) + + target_iface = dbus.Interface(target_obj,'org.neard.Target') + target_properties = target_iface.GetProperties() + + self.targetregistered[target_path] = True + # call UI update + self.targets_update(target_path, target_properties) + #Process the records + self.record_updateDetails(target_properties) + else: + print ("remove targets and records") + self.targets_update() + self.records_update() #Something changed, must update the UI @@ -229,8 +229,6 @@ class NeardUI(Neard): if i: print ("Delete adapter %s") % path self.adapters_list.remove(i) -## self.target_UpdateUI(path) - else: print ("Already deleted adapter %s") % path return @@ -284,18 +282,17 @@ class NeardUI(Neard): break i = self.targets_list.iter_next(i) - #Delete mode: + #Delete mode: Remove all if target_properties is None: i = self.targets_list.get_iter_first() while i is not None: path_name = self.targets_list.get_value(i, 0) - - if path == path_name[:len(path)-1]: - print ("Delete target %s") % path_name - self.targets_list.remove(i) + print ("Deleted target %s") % path_name + self.targets_list.remove(i) + if self.targets_list.iter_is_valid(i): + i = self.targets_list.iter_next(i) else: - print ("Already deleted target %s") % path_name - i = self.targets_list.iter_next(i) + i = None return if i is None: @@ -334,12 +331,17 @@ class NeardUI(Neard): break i = self.records_list.iter_next(i) + #Delete mode: Remove all records if record_properties is None: - if i: - print ("Delete record %s") % path + i = self.records_list.get_iter_first() + while i is not None: + path_name = self.records_list.get_value(i, 0) + print ("Delete record %s") % path_name self.records_list.remove(i) - else: - print ("Already deleted record %s") % path + if self.records_list.iter_is_valid(i): + i = self.records_list.iter_next(i) + else: + i = None return if i is None: |