segfaulthunter / pypentago-mainline / changeset / 7b7bc4f7a28a

Up to file-list src/pypentago/client/interface/__init__.py:

@@ -100,7 +100,8 @@ def main(default_servers=[]):
     main = MainWindow()
     main.show()
     for server in default_servers:
-        g = ServerWindow.from_string(server)
+        g = ServerWindow.from_string(server.address, server.user,
                                      server.password)
         g.show()
         main.windows.append(g)
     reactor.run()

Up to file-list src/pypentago/client/main.py:

@@ -31,6 +31,7 @@ from ConfigParser import ConfigParser
 import pypentago
 from pypentago import conf
 from pypentago import util
 from pypentago.client import interface
 from pypentago import __version__, verbosity_levels
@@ -74,9 +75,19 @@ def main(args=None):
     logfile = config.get("client", "logfile", vars=var)
     servers = conf.parse_servers(config)
     connect = []
     for arg in args:
         if arg in servers:
             connect.append(servers[arg])
         else:
             connect.append(util.parse_connect(arg))
     connect.extend(server for server in servers.itervalues()
                    if server.autoconnect)
     pypentago.init_logging(logfile, verbosity)
     log = logging.getLogger("pypentago.client")
-    interface.main(args)
+    interface.main(connect)
 if __name__ == "__main__":

Up to file-list src/pypentago/conf.py:

@@ -23,6 +23,7 @@ from __future__ import with_statement
 import os
 import pypentago
 from pypentago import util
 from ConfigParser import RawConfigParser
@@ -89,6 +90,10 @@ def init_client_conf(location):
     client.add_section('client')
     client.set('client', 'logfile', '%(appdata)s/client.log')
     client.add_section('servers')
     client.set('servers', 'all', '')
     client.set('servers', 'autoconnect', '')
     with open(client_file, 'w') as client_file:
         client.write(client_file)
@@ -111,3 +116,51 @@ def possible_configs(file_name, location
         if os.path.exists(name):
             yield os.path.abspath(name)
 def parse_servers(parser):
     ret = {}
     if (not parser.has_section('servers') or
         not parser.has_option('servers', 'all')):
         return {}
     servers = parser.get('servers', 'all')
     server_list = [s.strip() for s in servers.split(',')]
     if parser.has_option('servers', 'autoconnect'):
         auto = parser.get('servers', 'autoconnect')
         auto_list = [s.strip() for s in auto.split(',')]
     else:
         auto_list = []
     for server in server_list:
         if parser.has_option(server, 'address'):
             address = parser.get(server, 'address')
         else:
             continue
         if parser.has_option(server, 'name'):
             name = parser.get(server, 'name')
         else:
             # Better than nothing.
             name = server
         if parser.has_option(server, 'description'):
             description = parser.get(server, 'description')
         else:
             description = None
         if parser.has_option(server, 'user'):
             user = parser.get(server, 'user')
         else:
             user = None
         if parser.has_option(server, 'password'):
             password = parser.get(server, 'password')
         else:
             password = None
         autoconnect = server in auto_list
         ret[server] = util.ServerInfo(
             address=address, name=name, description=description,
             user=user, password=password, autoconnect=autoconnect
+        )
     return ret

Up to file-list src/pypentago/util.py:

@@ -64,6 +64,17 @@ class IDPool(object):
         self.free_ids = []
 class ServerInfo(object):
     def __init__(self, address, name=None, description=None,
                  user=None, password=None, autoconnect=False):
         self.address = address
         self.name = name
         self.description = description
         self.user = user
         self.password = password
         self.autoconnect = autoconnect
 def parse_ipv4(string, default_port=-1):
     h = string.split(':')
     if len(h) == 1:
@@ -122,3 +133,17 @@ def contains(row, col):
     if col > 2:
         r += 1
     return r
 def parse_connect(string):
     if '@' in string:
         auth, address = string.split('@', 1)
         if ':' in auth:
             user, passwd = auth.split(':', 1)
         else:
             user = auth
             password = None
     else:
         user = None
         password = None
         address = string
     return ServerInfo(address=address, user=user, password=password)

commit 411:	7b7bc4f7a28a
parent 410:	3777000c14e4
branch:	default