Merge lp:~chipaca/ubuntuone-client/public_files_list_v2 into lp:ubuntuone-client

[John Lenton]

Plug nautilus into syncdaemon's get_public_files. Without this patch, nautilus has no information as to what files the user has previously published.

This makes the public files notification work! yay

[Rodrigo Moya (rodrigo-moya)]

Looks ok to me

review: Approve

[Vincenzo Di Somma (vds)]

review: Approve

[lp:~chipaca/ubuntuone-client/public_files_list_v2]

503. By John Lenton on 2010-04-16

this is a fix for 562443

[dobey (dobey)]

I'd prefer to not have the additional got_one_public file function here, and just use a for loop instead. Is there any particular reason not to do so?

I'd also really like to know why exactly GSList wouldn't work for the signal here. We're using a GSList of GHashTables elsewhere for "aa{ss}" signatures from DBus, just fine. So, I'd like to understand why exactly it's failing here, but not elsewhere, and why a GPtrArray would work instead. It makes no sense to me at all.

[John Lenton (chipaca)]

I agree about avoiding got_one. Will change it to just a plain for, if that works.
And I agree it makes no sense. Yet it works. I'm not about to go spelunking into dbus_glib :)

[lp:~chipaca/ubuntuone-client/public_files_list_v2]

504. By John Lenton on 2010-04-16

remove _got_one_ call

[dobey (dobey)]

review: Approve

=== modified file 'nautilus/ubuntuone-nautilus.c'
--- nautilus/ubuntuone-nautilus.c	2010-04-14 23:52:06 +0000
+++ nautilus/ubuntuone-nautilus.c	2010-04-16 16:25:49 +0000
@@ -164,6 +164,12 @@
 					      GHashTable * hash,
 					      gchar * error,
 					      gpointer user_data);
+static void ubuntuone_nautilus_got_public_files (DBusGProxy * proxy,
+                                                 GPtrArray * files,
+                                                 gpointer user_data);
+static void ubuntuone_nautilus_public_files_list_error (DBusGProxy * proxy,
+                                                        gchar * error,
+                                                        gpointer user_data);
 static void ubuntuone_nautilus_share_created (DBusGProxy * proxy,
 					      GHashTable * hash,
 					      gpointer user_data);
@@ -1083,6 +1089,25 @@
   dbus_g_proxy_connect_signal (uon->u1_public, "PublicAccessChangeError",
 			       G_CALLBACK (ubuntuone_nautilus_publish_error),
 			       uon, NULL);
+
+  dbus_g_proxy_add_signal (uon->u1_public, "PublicFilesList",
+                           dbus_g_type_get_collection ("GPtrArray",
+                                                       dbus_g_type_get_map
+                                                       ("GHashTable",
+                                                        G_TYPE_STRING,
+                                                        G_TYPE_STRING)),
+                           G_TYPE_INVALID);
+  dbus_g_proxy_connect_signal (uon->u1_public, "PublicFilesList",
+                               G_CALLBACK (ubuntuone_nautilus_got_public_files),
+                               uon, NULL);
+
+  dbus_g_proxy_add_signal (uon->u1_public, "PublicFilesListError",
+                           G_TYPE_STRING,
+                           G_TYPE_INVALID);
+  dbus_g_proxy_connect_signal (uon->u1_public, "PublicFilesListError",
+                               G_CALLBACK (ubuntuone_nautilus_public_files_list_error),
+                               uon, NULL);
+
 }
 
 static void ubuntuone_nautilus_class_init (UbuntuOneNautilusClass * klass) {
@@ -1343,11 +1368,9 @@
 					       gpointer user_data) {
   UbuntuOneNautilus * uon = UBUNTUONE_NAUTILUS (user_data);
   gchar * status;
-  gchar * is_online;
-  gchar * is_connected;
+  gboolean is_online;
 
-  is_online = g_hash_table_lookup (hash, "is_online");
-  is_connected = g_hash_table_lookup (hash, "is_connected");
+  is_online = g_strcmp0(g_hash_table_lookup (hash, "is_online"), "True") == 0;
   status = g_hash_table_lookup (hash, "name");
 
   /* Get the root when we get a status change signal, if we haven't yet */
@@ -1362,14 +1385,13 @@
 			     ubuntuone_nautilus_got_udfs, uon,
 			     NULL, G_TYPE_INVALID);
 
-#if 0
-  /* The following code is disabled, for the time being. lp:562443 */
   /* Get the list of public files if we haven't already */
-  if (!uon->gotpubs)
+  if (is_online && !uon->gotpubs) {
     dbus_g_proxy_begin_call (uon->u1_public, "get_public_files",
 			     ubuntuone_nautilus_end_dbus_call, uon,
 			     NULL, G_TYPE_INVALID);
-#endif
+    uon->gotpubs = TRUE;
+  }
 }
 
 static void ubuntuone_nautilus_upload_started (DBusGProxy * proxy,
@@ -1505,6 +1527,28 @@
   ubuntuone_nautilus_file_published (proxy, hash, user_data);
 }
 
+static void ubuntuone_nautilus_got_public_files (DBusGProxy * proxy,
+                                                 GPtrArray * files,
+                                                 gpointer user_data) {
+  UbuntuOneNautilus * uon = UBUNTUONE_NAUTILUS (user_data);
+  int i;
+
+  g_hash_table_remove_all (uon->public);
+  for (i = 0; i < files->len; i++)
+    g_hash_table_insert (uon->public,
+                         g_strdup (g_hash_table_lookup (files->pdata[i], "path")),
+                         g_strdup (g_hash_table_lookup (files->pdata[i], "public_url")));
+}
+
+static void ubuntuone_nautilus_public_files_list_error (DBusGProxy * proxy,
+                                                        gchar * error,
+                                                        gpointer user_data) {
+  UbuntuOneNautilus * uon = UBUNTUONE_NAUTILUS (user_data);
+  /* the get_public_files call failed. We unset gotpubs, so the call
+  is retried when the syncdaemon next tells us it's online */
+  uon->gotpubs = FALSE;
+}
+
 static void ubuntuone_nautilus_share_created (DBusGProxy * proxy,
 					      GHashTable * hash,
 					      gpointer user_data) {