From dbce0e14e91c5f02e1df5bb04a1ede37bf0812ce Mon Sep 17 00:00:00 2001
From: Hylke Bons <hylkebons@gmail.com>
Date: Sun, 24 Jul 2011 19:22:17 +0100
Subject: [PATCH] Add events to tcp listener

---
 SparkleLib/SparkleListenerBase.cs |  2 +-
 SparkleLib/SparkleListenerTcp.cs  | 15 +++++++++++----
 SparkleLib/SparkleRepoBase.cs     |  6 +++---
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/SparkleLib/SparkleListenerBase.cs b/SparkleLib/SparkleListenerBase.cs
index 3503ce6e..b9293841 100644
--- a/SparkleLib/SparkleListenerBase.cs
+++ b/SparkleLib/SparkleListenerBase.cs
@@ -186,7 +186,7 @@ namespace SparkleLib {
 
         public void OnDisconnected ()
         {
-            SparkleHelpers.DebugInfo ("Listener", "Disonnected");
+            SparkleHelpers.DebugInfo ("Listener", "Disonnected from " + Server);
 
             if (Disconnected != null)
                 Disconnected ();
diff --git a/SparkleLib/SparkleListenerTcp.cs b/SparkleLib/SparkleListenerTcp.cs
index ad7e71ae..ee82127a 100644
--- a/SparkleLib/SparkleListenerTcp.cs
+++ b/SparkleLib/SparkleListenerTcp.cs
@@ -46,11 +46,12 @@ namespace SparkleLib {
 
         public override bool IsConnected {
             get {
-                //return this.client.IsConnected;
                 bool result = false;
+
                 lock (this.mutex) {
                   result = this.connected;
                 }
+
                 return result;
             }
         }
@@ -70,40 +71,46 @@ namespace SparkleLib {
                         int port = Server.Port;
                         if (port < 0) port = 9999;
                         this.socket.Connect (Server.Host, port);
+
                         lock (this.mutex) {
                             base.is_connecting = false;
                             this.connected = true;
 
+                            OnConnected ();
+
                             foreach (string channel in base.channels) {
                                 SparkleHelpers.DebugInfo ("ListenerTcp", "Subscribing to channel " + channel);
                                 this.socket.Send (Encoding.UTF8.GetBytes ("subscribe " + channel + "\n"));
                             }
                         }
 
-
                         byte [] bytes = new byte [4096];
 
                         // List to the channels, this blocks the thread
                         while (this.socket.Connected) {
                             int bytes_read = this.socket.Receive (bytes);
+
                             if (bytes_read > 0) {
                                 string received = Encoding.UTF8.GetString (bytes);
                                 string folder_identifier = received.Substring (0, received.IndexOf ("!"));
                                 string message = received.Substring (received.IndexOf ("!") + 1);
 
                                 OnAnnouncement (new SparkleAnnouncement (folder_identifier, message));
+
                             } else {
                                 SparkleHelpers.DebugInfo ("ListenerTcp", "Error on socket");
+
                                 lock (this.mutex) {
-                                    this.socket.Close();
+                                    this.socket.Close ();
                                     this.connected = false;
+
+                                    OnDisconnected ();
                                 }
                             }
                         }
                         
                         SparkleHelpers.DebugInfo ("ListenerTcp", "Disconnected from " + Server.Host);
                         
-                        // TODO: attempt to reconnect..?
                     } catch (SocketException e) {
                         SparkleHelpers.DebugInfo ("ListenerTcp", "Could not connect to " + Server + ": " + e.Message);
                     }
diff --git a/SparkleLib/SparkleRepoBase.cs b/SparkleLib/SparkleRepoBase.cs
index de06a2bf..70cb9808 100644
--- a/SparkleLib/SparkleRepoBase.cs
+++ b/SparkleLib/SparkleRepoBase.cs
@@ -462,9 +462,9 @@ namespace SparkleLib {
                         NewChangeSet (change_set);
                 }
 
-                // There could be changes from a
-                // resolved conflict. Tries only once,
-                //then let the timer try again periodicallly
+                // There could be changes from a resolved
+                // conflict. Tries only once, then lets
+                // the timer try again periodically
                 if (HasUnsyncedChanges)
                     SyncUp ();