[Commits] (morgen) Added a dialog to prompt the user for new webdav account info, and fixed some typos

[commits at osafoundation.org]

Commit by: morgen
Modified files:
chandler/parcels/osaf/framework/sharing/AccountInfoPrompt.py None 1.1
chandler/parcels/osaf/framework/sharing/AccountInfoPrompt.wdr None 1.1
chandler/parcels/osaf/framework/sharing/AccountInfoPrompt_wdr.xrc None 1.1
chandler/parcels/osaf/framework/sharing/Sharing.py 1.51 1.52

Log message:
Added a dialog to prompt the user for new webdav account info, and fixed some typos


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/sharing/AccountInfoPrompt.py?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/sharing/AccountInfoPrompt.wdr?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/sharing/AccountInfoPrompt_wdr.xrc?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/sharing/Sharing.py.diff?r1=text&tr1=1.51&r2=text&tr2=1.52

Index: chandler/parcels/osaf/framework/sharing/Sharing.py
diff -u chandler/parcels/osaf/framework/sharing/Sharing.py:1.51 chandler/parcels/osaf/framework/sharing/Sharing.py:1.52
--- chandler/parcels/osaf/framework/sharing/Sharing.py:1.51	Tue Feb  1 10:43:12 2005
+++ chandler/parcels/osaf/framework/sharing/Sharing.py	Tue Feb  1 16:11:38 2005
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.51 $"
-__date__ = "$Date: 2005/02/01 18:43:12 $"
+__version__ = "$Revision: 1.52 $"
+__date__ = "$Date: 2005/02/02 00:11:38 $"
 __copyright__ = "Copyright (c) 2004 Open Source Applications Foundation"
 __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -21,6 +21,7 @@
 import time, StringIO, urlparse, libxml2, os, mx
 import chandlerdb
 import WebDAV, httplib
+import AccountInfoPrompt
 
 logger = logging.getLogger('Sharing')
 logger.setLevel(logging.INFO)
@@ -568,11 +569,11 @@
     def __getSettings(self):
         if self.account is None:
             return (self.host, self.port, self.sharePath.strip("/"),
-                    self.username, self.password, self.useSSL)
+                    self.username, self.password, self.account.useSSL)
         else:
             return (self.account.host, self.account.port,
                     self.account.path.strip("/"), self.account.username,
-                    self.account.password, self.useSSL)
+                    self.account.password, self.account.useSSL)
 
     def __getClient(self):
         if self.client is None:
@@ -1207,10 +1208,11 @@
         if account is None:
             return None
 
-    conduit = WebDAVConduit(account=account)
-    format = CloudXMLFormat()
-    share = Share(conduit=conduit, format=format, contents=collection)
-    share.displayName = collections.displayName
+    conduit = WebDAVConduit(view=view, account=account)
+    format = CloudXMLFormat(view=view)
+    share = Share(view=view, conduit=conduit, format=format,
+                  contents=collection)
+    share.displayName = collection.displayName
     share.hidden = False # indicates that the DetailView should show this share
     return share
 
@@ -1230,19 +1232,43 @@
     @return: A Share item, or None if no WebDAV account could be found.
     """
 
+    (useSSL, host, port, path, query, fragment) = __spliturl(url)
+
+    parent = view.findPath("//userdata")
+
     account = findMatchingWebDAVAccount(view, url)
+
     if account is None:
         # @@@MOR must prompt user for account information (?)
         # then create an account
 
-        # For now, just:
-        return None
+        # Examine the URL for scheme, host, port, path
+        info = AccountInfoPrompt.PromptForNewAccountInfo(wx.GetApp().mainFrame,
+                                                         host=host,
+                                                         path=path)
+        if info is not None:
+            (description, username, password) = info
+            kindPath = "//parcels/osaf/framework/sharing/WebDAVAccount"
+            webDAVAccountKind = view.findPath(kindPath)
+            account = webDAVAccountKind.newItem(name=None, parent=parent)
+            account.displayName = description
+            account.host = host
+            account.path = path
+            account.username = username
+            account.password = password
+            account.isDefault = False
+            account.useSSL = useSSL
+            account.port = port
 
     share = None
     if account is not None:
-        conduit = WebDAVConduit(account=account)
-        format = CloudXMLFormat()
-        share = Share(conduit=conduit, format=format)
+        shareName = path.strip("/").split("/")[-1]
+        print path
+        print shareName
+        conduit = WebDAVConduit(view=view, shareName=shareName,
+                                account=account)
+        format = CloudXMLFormat(view=view)
+        share = Share(view=view, conduit=conduit, format=format)
         share.hidden = False
     return share
 
@@ -1293,7 +1319,7 @@
 
     webDAVAccountKind = view.findPath("//parcels/osaf/framework/sharing/WebDAVAccount")
 
-    (useSSL, host, path, query, fragment) = __spliturl(url)
+    (useSSL, host, port, path, query, fragment) = __spliturl(url)
 
     # Get the parent directory of the given path:
     # '/dev1/foo/bar' becomes ['dev1', 'foo']
@@ -1327,7 +1353,7 @@
     # matching share; go through all conduits this account points to and look
     # for shareNames that match
 
-    (useSSL, host, path, query, fragment) = __spliturl(url)
+    (useSSL, host, port, path, query, fragment) = __spliturl(url)
 
     # '/dev1/foo/bar' becomes 'bar'
     shareName = path.strip("/").split("/")[-1:]