Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Get the IP addresses again when restarting the smartdevice driver.

Browse Source
This commit is contained in:
Charles Haley 2013-02-08 12:09:09 +01:00
parent 82550e6ace
commit 6914cdec13
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/devices/smart_device_app/driver.py
View File

@ -71,6 +71,8 @@ class ConnectionListener (Thread):
def run(self): def run(self):
queue_not_serviced_count = 0 queue_not_serviced_count = 0
device_socket = None device_socket = None
get_all_ips(reinitialize=True)
while self.keep_running: while self.keep_running:
try: try:
time.sleep(1) time.sleep(1)

15
src/calibre/utils/mdns.py
View File

@ -14,7 +14,7 @@ _server = None
_all_ip_addresses = dict() _all_ip_addresses = dict()
class AllIpAddressesGetter (Thread): class AllIpAddressesGetter(Thread):
def get_all_ips(self): def get_all_ips(self):
''' Return a mapping of interface names to the configuration of the ''' Return a mapping of interface names to the configuration of the
@ -37,13 +37,20 @@ class AllIpAddressesGetter (Thread):
def run(self): def run(self):
global _all_ip_addresses global _all_ip_addresses
# print 'sleeping' # print 'sleeping'
# time.sleep(10) # time.sleep(15)
# print 'slept' # print 'slept'
_all_ip_addresses = self.get_all_ips() _all_ip_addresses = self.get_all_ips()
AllIpAddressesGetter().start() _ip_address_getter_thread = None
def get_all_ips(): def get_all_ips(reinitialize=False):
global _all_ip_addresses, _ip_address_getter_thread
if not _ip_address_getter_thread or (reinitialize and not
_ip_address_getter_thread.is_alive()):
_all_ip_addresses = dict()
_ip_address_getter_thread = AllIpAddressesGetter()
_ip_address_getter_thread.setDaemon(True)
_ip_address_getter_thread.start()
return _all_ip_addresses return _all_ip_addresses
def _get_external_ip(): def _get_external_ip():