f-spot r4271 - in trunk/dpap-sharp: DPAPBrowser DPAPService lib

[apart svn gnome org]

Author: apart
Date: Sat Aug 16 08:40:32 2008
New Revision: 4271
URL: http://svn.gnome.org/viewvc/f-spot?rev=4271&view=rev

Log:
Fixing f-spot <-> f-spot communication


Modified:
   trunk/dpap-sharp/DPAPBrowser/DPAPBrowser.cs
   trunk/dpap-sharp/DPAPService/DPAPService.cs
   trunk/dpap-sharp/lib/Database.cs
   trunk/dpap-sharp/lib/Server.cs

Modified: trunk/dpap-sharp/DPAPBrowser/DPAPBrowser.cs
==============================================================================
--- trunk/dpap-sharp/DPAPBrowser/DPAPBrowser.cs	(original)
+++ trunk/dpap-sharp/DPAPBrowser/DPAPBrowser.cs	Sat Aug 16 08:40:32 2008
@@ -134,7 +134,7 @@
 		{
 			Service service = args.Service;
 			Console.WriteLine ("ServiceFound " + service.Name);
-			if (service.Name.Equals ("f-spot photos")) return;
+			if (service.Name.Equals (System.Environment.UserName + " f-spot photos")) return;
 			list.AppendValues (service.Name);
 			
 /*			System.Console.WriteLine ("Connecting to {0} at {1}:{2}", service.Name, service.Address, service.Port);

Modified: trunk/dpap-sharp/DPAPService/DPAPService.cs
==============================================================================
--- trunk/dpap-sharp/DPAPService/DPAPService.cs	(original)
+++ trunk/dpap-sharp/DPAPService/DPAPService.cs	Sat Aug 16 08:40:32 2008
@@ -57,12 +57,13 @@
 		Console.WriteLine ("Starting DPAP server");
 			
 			DPAP.Database database = new DPAP.Database ("DPAP");
-			DPAP.Server server = new Server ("f-spot photos");
+			
+			DPAP.Server server = new Server (System.Environment.UserName.ToString() + " f-spot photos");
 			server.Port = 8770;
 			server.AuthenticationMethod = AuthenticationMethod.None;
 			int collision_count = 0;
 			server.Collision += delegate {
-				server.Name = "f-spot photos" + "[" + ++collision_count + "]";
+				server.Name = System.Environment.UserName.ToString() + " f-spot photos" + "[" + ++collision_count + "]";
 			};
             
 			

Modified: trunk/dpap-sharp/lib/Database.cs
==============================================================================
--- trunk/dpap-sharp/lib/Database.cs	(original)
+++ trunk/dpap-sharp/lib/Database.cs	Sat Aug 16 08:40:32 2008
@@ -263,7 +263,7 @@
             byte [] albums_data;
 
             try {
-                albums_data = client.Fetcher.Fetch (String.Format ("/databases/{0}/containers", id, revquery));
+                albums_data = client.Fetcher.Fetch (String.Format ("/databases/{0}/containers", id), "meta=dpap.aspectratio,dmap.itemid,dmap.itemname,dpap.imagefilename,dpap.imagefilesize,dpap.creationdate,dpap.imagepixelwidth,dpap.imagepixelheight,dpap.imageformat,dpap.imagerating,dpap.imagecomments,dpap.imagelargefilesize&type=photo");
             } catch (WebException) {
                 return;
             }

Modified: trunk/dpap-sharp/lib/Server.cs
==============================================================================
--- trunk/dpap-sharp/lib/Server.cs	(original)
+++ trunk/dpap-sharp/lib/Server.cs	Sat Aug 16 08:40:32 2008
@@ -855,11 +855,12 @@
                 ws.WriteResponse (client, db.ToAlbumsNode ());
             } else if (dbContainerItemsRegex.IsMatch (path)) {
 				// DEBUG
-				Console.WriteLine ("ContainerItems !");
+				Console.WriteLine ("ContainerItems ! path=" + path);
+				
                 Match match = dbContainerItemsRegex.Match (path);
                 int dbid = Int32.Parse (match.Groups [1].Value);
                 int plid = Int32.Parse (match.Groups [2].Value);
-
+				
                 Database curdb = revmgr.GetDatabase (clientRev, dbid);
                 if (curdb == null) {
                     ws.WriteResponse (client, HttpStatusCode.BadRequest, "invalid database id");
@@ -871,7 +872,8 @@
                     ws.WriteResponse (client, HttpStatusCode.BadRequest, "invalid playlist id");
                     return true;
                 }
-
+				// DEBUG
+				Console.WriteLine("db and album ready!");
                 ArrayList deletedIds = new ArrayList ();
                 if (delta > 0) {
                     Database olddb = revmgr.GetDatabase (clientRev - delta, dbid);
@@ -890,7 +892,9 @@
                         }
                     }
                 }
-                    curpl.ToPhotosNode (query ["meta"].Split (',')).Dump ();
+				Console.WriteLine("About to send response... meta=" + query["meta"]);
+                curpl.ToPhotosNode (query ["meta"].Split (',')).Dump ();
+				
                 ws.WriteResponse (client, curpl.ToPhotosNode (query ["meta"].Split (',')));
 				//, (int []) deletedIds.ToArray (typeof (int))));
             } else if (path == "/update") {