AaronFiore/electrum
1
0
Fork 0
Code Activity

Make interface status tri-state.

Browse Source 
This allows us to distinguish between connecting and connected
state in interface.py (used to be done in network.py but that
had other issues).

This means we don't switch to a connecting server, and get_interfaces()
does not report connecting ones.
This commit is contained in:
Neil Booth
2015-05-23 22:59:29 +09:00
parent ed256e064a
commit 76355e66c8
2 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/network.py
View File

@@ -259,7 +259,8 @@ class Network(util.DaemonThread):
return self.config.get('auto_connect', False)
def get_interfaces(self):
return self.interfaces.keys()
'''The interfaces that are in connected state'''
return [s for s, i in self.interfaces.items() if i.is_connected()]
def get_servers(self):
if self.irc_servers:
@@ -339,9 +340,9 @@ class Network(util.DaemonThread):
self.switch_lagging_interface()
def switch_to_random_interface(self):
if self.interfaces:
server = random.choice(self.interfaces.keys())
self.switch_to_interface(server)
servers = self.get_interfaces() # Those in connected state
if servers:
self.switch_to_interface(random.choice(servers))
def switch_lagging_interface(self, suggestion = None):
'''If auto_connect and lagging, switch interface'''