Changeset 136

Timestamp:

03/06/07 20:48:00 (2 years ago)

Author:

kbarnes3

Message:

Added an event to fire when a server is added. Untested, so sorry if it breaks.

Files:

• dmp/trunk/Bridge/Bridge.cs (modified) (6 diffs)
• dmp/trunk/Bridge/Bridge.csproj (modified) (1 diff)
• dmp/trunk/Bridge/ServerAddedEventArgs.cs (added)
• dmp/trunk/daap-sharp/BridgeDatabase.cs (modified) (1 diff)

dmp/trunk/Bridge/Bridge.cs

@@ -15 +15 @@
-        public class Bridge
-        {
+                public event EventHandler<ServerAddedEventArgs > ServerAdded;
+
-                /// <summary>
-                /// The dictionary of DAAP clients, since I believe each instance only connects to one server
@@ -20 +22 @@
-                /// </summary>
-                private System.Collections.Generic.Dictionary<int, Client> clientList;
+
+                /// <summary>
+                /// This dictionary maps a server name to the library ID found in the Bridge Database
+                /// </summary>
+                private System.Collections.Generic.Dictionary<string, int> serverNameToIdList;
-
-        private BridgeDatabase db;
@@ -38 +45 @@
-            this.myServiceLocator = new ServiceLocator();
-            this.myServiceLocator.ShowLocalServices = true;
+                        this.myServiceLocator.Found += ZeroConfServerFound;
-            this.myServiceLocatorStarted = false;
-                }
@@ -156 +164 @@
-                }
-
-        public void AddFoundHandler(ServiceHandler fun){
-            myServiceLocator.Found += fun;
-        }
-
-                /// <summary>
-                /// Gets the list of all the songs in the collection
@@ -250 +254 @@
-                    Console.WriteLine("Added libraryid to client list: " + newClient.Id);
-                    this.clientList.Add(newClient.Id, newClient);
+                                        this.serverNameToIdList.Add(newClient.Name, newClient.Id);
-                }
-                else
@@ -264 +269 @@
-                        }
-                }
+
+                /// <summary>
+                /// Runs when ZeroConf finds a new server
+                /// </summary>
+                /// <param name="o"></param>
+                /// <param name="args"></param>
+                private void ZeroConfServerFound(object o, DAAP.ServiceArgs args) {
+                        Service newServer = args.Service;
+                        int libraryId = this.db.getLibraryIdForName(newServer.Name);
+                        if (libraryId > -1) { //Reconnect to this server
+                                int addResult = this.AddServerConnection(newServer);
+                                if (addResult > -1) {
+                                        
+                                        this.ServerAdded(this, new ServerAddedEventArgs(newServer.Name, true));
+                                }
+                        }
+                        else {
+                                this.ServerAdded(this, new ServerAddedEventArgs(newServer.Name, false));
+                        }
+                }
-        }
+
-}

dmp/trunk/Bridge/Bridge.csproj

@@ -48 +48 @@
-    <Compile Include="Bridge.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ServerAddedEventArgs.cs" />
-  </ItemGroup>
-  <ItemGroup>

dmp/trunk/daap-sharp/BridgeDatabase.cs

@@ -238 +238 @@
-
-                        return theTable;
+                }
+
+                /// <summary>
+                /// Finds the library ID matching the name, if one exists
+                /// </summary>
+                /// <param name="libName">The name of the server to find an ID for</param>
+                /// <returns>The libary ID if it's in the database, -1 otherwise</returns>
+                public int getLibraryIdForName(string libName) {
+                        string commandText = "SELECT id FROM libraries WHERE name = @name";
+                        SQLiteDataAdapter adapter = new SQLiteDataAdapter(commandText, this.databaseConnection);
+                        adapter.SelectCommand.Parameters.Add("name", DbType.String).Value = libName;
+                        DataTable tempTable = new DataTable();
+                        this.databaseConnection.Open();
+                        adapter.Fill(tempTable);
+                        this.databaseConnection.Close();
+                        if (tempTable.Rows.Count <= 0) {
+                                return -1;
+                        }
+                        else {
+                                int libraryId = (int)tempTable.Rows[0]["id"];
+                                return libraryId;
+                        }
-                }
-