Changeset 152

Timestamp:

03/08/07 18:25:04 (2 years ago)

Author:

kbarnes3

Message:

Added code that would allow the UI to remove a connection to the server, if it worked.

Files:

• dmp/trunk/Bridge/Bridge.cs (modified) (1 diff)
• dmp/trunk/daap-sharp/BridgeDatabase.cs (modified) (1 diff)

dmp/trunk/Bridge/Bridge.cs

@@ -296 +296 @@
-
-                /// <summary>
+                /// Disconnects from the given server
+                /// </summary>
+                /// <param name="libraryId">The library ID to disconnect from</param>
+                /// <returns></returns>
+                public bool RemoveServerConnection(int libraryId) {
+                        if (this.clientList.ContainsKey(libraryId)) {
+                                Client oldClient = this.clientList[libraryId];
+                                oldClient.Logout();
+                                this.clientList.Remove(libraryId);
+                                this.db.RemoveServer(libraryId);
+                                DataTable newTable = this.getAvailableSongsInCollection();
+                                this.ServerRemoved(this, new ServerStatusEventArgs(oldClient.Name, false));
+                                this.SongListChanged(this, new SongListChangedEventArgs(newTable));
+                                return true;
+                        }
+                        else {
+                                return false;
+                        }
+                }
+
+                /// <summary>
+                /// Disconnects from the given server
+                /// </summary>
+                /// <param name="zeroconfName">The serivce found with ZeroConf to disconnect from</param>
+                /// <returns>True if it worked, false otherwise</returns>
+                public bool RemoveServerConnection(string zeroconfName) {
+                        if (this.serverNameToIdList.ContainsKey(zeroconfName)) {
+                                int libraryId = this.serverNameToIdList[zeroconfName];
+                                bool result = this.RemoveServerConnection(libraryId);
+                                return result;
+                        }
+                        else {
+                                return false;
+                        }
+                }
+
+                /// <summary>
-                /// Runs when ZeroConf finds a new server.  Adds the server if it's been seen before
-                /// </summary>

dmp/trunk/daap-sharp/BridgeDatabase.cs

@@ -463 +463 @@
-            return true;
-        }
+
+                /// <summary>
+                /// Removes the given server and all songs from it from the database.
+                /// </summary>
+                /// <param name="libraryId">The library ID of the server to remove</param>
+                public void RemoveServer(int libraryId) {
+                        string songCommandString = "DELETE FROM songs WHERE libraryId = @libraryId";
+                        SQLiteCommand songCommand = new SQLiteCommand(songCommandString, this.databaseConnection);
+                        songCommand.Parameters.Add("libraryId", DbType.Int32).Value = libraryId;
+
+                        string libraryCommandString = "DELETE FROM libraries WHERE id = @id";
+                        SQLiteCommand libraryCommand = new SQLiteCommand(libraryCommandString, this.databaseConnection);
+                        libraryCommand.Parameters.Add("id", DbType.Int32).Value = libraryId;
+
+                        this.databaseConnection.Open();
+                        songCommand.ExecuteNonQuery();
+                        libraryCommand.ExecuteNonQuery();
+                        this.databaseConnection.Close();
+                }
-
-        public void removeSongs(List<int> deletedIds)