invite: cleanup

serras · Feb 11, 2012 · cded663 · cded663
1 parent bb1ae7c
commit cded663
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 6 deletions.
diff --git a/SparkleShare/SparkleControllerBase.cs b/SparkleShare/SparkleControllerBase.cs
@@ -130,7 +130,6 @@ public virtual void Initialize ()
             SparkleInviteListener invite_listener = new SparkleInviteListener (1987);
 
             invite_listener.InviteReceived += delegate (SparkleInvite invite) {
-
                 if (OnInvite != null && !FirstRun)
                     OnInvite (invite);
             };

diff --git a/SparkleShare/SparkleInvite.cs b/SparkleShare/SparkleInvite.cs
@@ -60,7 +60,37 @@ public SparkleInvite (string host, string path, string token)
 
         public SparkleInvite (string xml_file_path)
         {
-            // TODO
+            XmlDocument xml_document = new XmlDocument ();
+            XmlNode node;
+
+            string host = "", path = "", token = "";
+
+            try {
+                xml_document.Load (xml_file_path);
+
+                node = xml_document.SelectSingleNode ("/sparkleshare/invite/host/text()");
+                if (node != null) { host = node.Value; }
+
+                node = xml_document.SelectSingleNode ("/sparkleshare/invite/path/text()");
+                if (node != null) { path = node.Value; }
+
+                node = xml_document.SelectSingleNode ("/sparkleshare/invite/token/text()");
+                if (node != null) { token = node.Value; }
+
+            } catch (XmlException e) {
+                SparkleHelpers.DebugInfo ("Invite", "Invalid XML: " + e.Message);
+                return;
+            }
+
+
+            if (path.StartsWith ("/"))
+                path = path.Substring (1);
+
+            if (!host.EndsWith ("/"))
+                host = host + "/";
+
+            FullAddress = new Uri ("ssh://" + host + path);
+            Token       = token;
         }
     }
 
@@ -168,9 +198,8 @@ private void HandleClient (object client)
 
                 XmlDocument xml_document = new XmlDocument ();
                 XmlNode node;
-                string host = "";
-                string path = "";
-                string token = "";
+
+                string host = "", path = "", token = "";
 
                 try {
                     xml_document.LoadXml (invite_xml);
@@ -185,7 +214,7 @@ private void HandleClient (object client)
                     if (node != null) { token = node.Value; }
 
                 } catch (XmlException e) {
-                    SparkleHelpers.DebugInfo ("Invite", "Not valid XML: " + received_message + " " + e.Message);
+                    SparkleHelpers.DebugInfo ("Invite", "Invalid XML: " + received_message + " " + e.Message);
                     return;
                 }