Ticket #653: auth.diff

deluge/ui/common.py

@@ -29 +29 @@
 
 from deluge import bencode
 from deluge.log import LOG as log
+from deluge.core.authmanager import AuthManager
 import deluge.configmanager
 
 class TorrentInfo(object):
@@ -128 +129 @@
     :returns: a localhost uri containing authentication information or None if the information is not available
     """
     auth_file = deluge.configmanager.get_config_dir("auth")
-    if os.path.exists(auth_file):
-        u = urlparse.urlsplit(uri)
-        for line in open(auth_file):
-            try:
-                username, password = line.strip().split(":")
-            except ValueError:
-                continue
+    if not os.path.exists(auth_file):
+        AuthManager().start()
+        auth_file = deluge.configmanager.get_config_dir("auth")
 
-            if username == "localclient":
-                # We use '127.0.0.1' in place of 'localhost' just incase this isn't defined properly
-                hostname = u.hostname.replace("localhost", "127.0.0.1")
-                return u.scheme + "://" + username + ":" + password + "@" + hostname + ":" + str(u.port)
-    return None
+    u = urlparse.urlsplit(uri)
+    rtn_uri = None
+    for line in open(auth_file):
+        try:
+            username, password = line.strip().split(":")
+        except ValueError:
+            continue
+
+        # We use '127.0.0.1' in place of 'localhost' 
+        # just incase this isn't defined properly
+        hostname = u.hostname.replace("localhost", "127.0.0.1")
+
+        if username == "localclient" and hostname == "127.0.0.1":
+            rtn_uri = u.scheme + "://" + username + ":" + password + "@" + hostname + ":" + str(u.port)
+
+    return rtn_uri

deluge/ui/gtkui/connectionmanager.py

@@ -157 +157 @@
                 # We need to keep trying because the daemon may not have been started yet
                 # and the 'auth' file may not have been created
                 uri = get_localhost_auth_uri(DEFAULT_URI)
+                if uri == None:
+                    raise Exception('Could not locate localclient authorization')
                 time.sleep(0.01)
 
             while not self.test_online_status(uri):