RomanNum3ral
/
Solaar
mirror of https://github.com/pwr-Solaar/Solaar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more timely update of receiver status when starting the app

This commit is contained in:
Daniel Pavel 2012-10-13 20:09:31 +03:00
parent ec7ebb0939
commit 79afb1ceed
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/watcher.py
View File

@ -89,7 +89,7 @@ class Watcher(Thread):
self.no_receiver.clear() self.no_receiver.clear()
else: else:
self._device_status_changed(self.rstatus, C.STATUS.UNAVAILABLE, _NO_RECEIVER) self._device_status_changed(self.rstatus, C.STATUS.UNAVAILABLE, _NO_RECEIVER)
time.sleep(5) time.sleep(3)
if self.listener: if self.listener:
self.listener.stop() self.listener.stop()
@ -157,6 +157,11 @@ class Watcher(Thread):
if status_code >= C.STATUS.CONNECTED and devstatus.type is None: if status_code >= C.STATUS.CONNECTED and devstatus.type is None:
# ghost device that became active # ghost device that became active
if devstatus.code != C.STATUS.CONNECTED:
# initial update, while we're getting the devinfo
devstatus.code = C.STATUS.CONNECTED
devstatus.text = C.STATUS_NAME[C.STATUS.CONNECTED]
self.status_changed.set()
if self._new_device(devstatus.number) is None: if self._new_device(devstatus.number) is None:
_l.warn("could not materialize device from %s", devstatus) _l.warn("could not materialize device from %s", devstatus)
return False return False
@ -210,6 +215,7 @@ class Watcher(Thread):
ghost = _DevStatus(handle=self.listener.receiver, number=event.devnumber, type=None, name=name, features=[]) ghost = _DevStatus(handle=self.listener.receiver, number=event.devnumber, type=None, name=name, features=[])
self.devices[event.devnumber] = ghost self.devices[event.devnumber] = ghost
self._device_status_changed(ghost, C.STATUS.UNAVAILABLE) self._device_status_changed(ghost, C.STATUS.UNAVAILABLE)
self._device_status_changed(self.rstatus, C.STATUS.CONNECTED, _OKAY)
return return
if event.devnumber in self.devices: if event.devnumber in self.devices: