Changeset 124

Timestamp:

03/03/07 23:34:19 (2 years ago)

Author:

kbarnes3

Message:

Made the Bridge automatically reconnect to previously known servers

Files:

• dmp/trunk/BadClient/Form1.cs (modified) (3 diffs)
• dmp/trunk/Bridge/Bridge.cs (modified) (5 diffs)
• dmp/trunk/Mono.Zeroconf/BrowseService.cs (modified) (3 diffs)
• dmp/trunk/daap-sharp/BridgeDatabase.cs (modified) (1 diff)

dmp/trunk/BadClient/Form1.cs

@@ -29 +29 @@
-                {
-                    lblStatus.Text = "Status: It connected?";
-SongsInCollection
+AvailableSongsInCollection 
-                    lblStatus.Text = "Status: Found " + theStuff.Rows.Count + " rows!";
-                    dgvSongs.Rows.Clear();
@@ -58 +58 @@
-        private void button2_Click(object sender, EventArgs e)
-        {
-SongsInCollection
+AvailableSongsInCollection 
-            lblStatus.Text = "Status: This doesn't work yet!";
-            foreach (DataRow row in theStuff.Rows) {
@@ -66 +66 @@
-
-                private void btnListServers_Click(object sender, EventArgs e) {
-
+Zeroconf
-                        foreach (KeyValuePair<string, DAAP.Service> pair in theServers) {
-                                treeView1.Nodes.Add(pair.Value.Name);

dmp/trunk/Bridge/Bridge.cs

@@ -36 +36 @@
-                        this.myServiceLocator = new ServiceLocator();
-                        this.myServiceLocator.ShowLocalServices = true;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-                /// <summary>
@@ -42 +56 @@
-                /// </summary>
-                /// <param name="theHostName">The host name, in some form that can be resolved</param>
-90
+89
-                /// <returns>The library id, which is referred to in the db and the 
-
+ or -1 if the connect fails
-        public int AddServerConnection(string theHostName, ushort thePort){
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-                                return -1;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                /// </summary>
-                /// <returns></returns>
-
+Zeroconf
-                        System.Collections.IEnumerable serverListing = this.myServiceLocator.Services;
-                        Dictionary<String, Service> serverDict = new Dictionary<string, Service>();
@@ -100 +111 @@
-                        int duplicateCount;
-                        Service server;
+                        Console.WriteLine("Listing servers...");
-                        foreach (System.Collections.DictionaryEntry entry in serverListing) {
-                                server = (Service) entry.Value;
-                                key = server.Name;
+                                Console.WriteLine("Found the server \"" + key + "\".");
-                                if (serverDict.ContainsKey(key)) {
-                                        duplicateCount = 1;
@@ -116 +129 @@
-                                }
-                        }
+                        Console.WriteLine("Done listing servers.");
-                        return serverDict;
-                }
@@ -200 +214 @@
-            return this.db.isDatabaseUp();
-        }
+
+                /// <summary>
+                /// Attempts to log in and store the connection info in the database
+                /// </summary>
+                /// <param name="newClient">The client to log in to</param>
+                /// <returns>-1 on failure, the library ID on success</returns>
+                private int LoginAndSaveToDatabase(Client newClient) {
+                        try {
+
+                                if (!clientList.ContainsKey(newClient.Id))
+                                        this.clientList.Add(newClient.Id, newClient);
+
+                                newClient.Login(); // Passwords are for wimps
+                                Console.WriteLine("Connected to " + newClient.Name);
+
+                                return newClient.Id;
+                        }
+                        catch (DAAP.LoginException ex) {
+                                Console.WriteLine("Bridge: " + ex.Message);
+                                return -1;
+                        }
+                }
-        }
-}

dmp/trunk/Mono.Zeroconf/BrowseService.cs

@@ -37 +37 @@
-    public sealed class BrowseService : Service
-    {
-                private Native.DNSServiceResolveReply resolveReply;
-        private bool is_resolved = false;
-        private bool resolve_pending = false;
@@ -49 +48 @@
-        public BrowseService(string name, string replyDomain, string regtype) : base(name, replyDomain, regtype)
-        {
-                        resolveReply = OnResolveReply;
-        }
-
-                ~BrowseService()
-                {
-                        GC.KeepAlive(resolveReply);
-                }
-
-        public void Resolve()
@@ -77 +70 @@
-            ServiceRef sd_ref;
-            ServiceError error = Native.DNSServiceResolve(out sd_ref, ServiceFlags.None, 
-r
+OnR
-                
-            if(error != ServiceError.NoError) {

dmp/trunk/daap-sharp/BridgeDatabase.cs

@@ -205 +205 @@
-            insertTrans.Commit();
-                        this.databaseConnection.Close();
+                }
+
+                /// <summary>
+                /// Gets the list of all the songs in the collection
+                /// </summary>
+                /// <param name="libraries">A list of the library id's to get the songs from</param>
+                /// <returns>A DataTable with the following columns:
+                /// id, libraryId, artist, album, title</returns>
+                public DataTable getAvailableSongsInCollection(int[] libraries) {
+                        StringBuilder commandText = new StringBuilder("SELECT * FROM songs WHERE ");
+                        if (libraries.Length == 0) {
+                                commandText.Append("libraryId = -1");
+                        }
+                        else {
+                                commandText.AppendFormat("libraryId = {0}", libraries[0]);
+                                for (int i = 1; i < libraries.Length; i++) {
+                                        commandText.AppendFormat("OR libraryId = {1}", libraries[i]);
+                                }
+                        }
+                        SQLiteDataAdapter adapter = new SQLiteDataAdapter(commandText.ToString(), 
+                                this.databaseConnection);
+                        DataTable theTable = new DataTable();
+                        this.databaseConnection.Open();
+                        adapter.Fill(theTable);
+                        this.databaseConnection.Close();
+
+                        return theTable;
+                }
+
+                /// <summary>
+                /// Returns a list of distinct libraries that the bridge has connected to before
+                /// </summary>
+                /// <returns></returns>
+                public DataTable getServersInCollection() {
+                        string commandText = "SELECT id, name FROM libraries";
+                        SQLiteDataAdapter adapter = new SQLiteDataAdapter(commandText, this.databaseConnection);
+                        DataTable theTable = new DataTable();
+                        this.databaseConnection.Open();
+                        adapter.Fill(theTable);
+                        this.databaseConnection.Close();
+
+                        return theTable;
-                }
-