Merge lp:~dobey/ubuntuone-client/emblem-tweaking into lp:ubuntuone-client

[dobey]

Get the shares list when we load up the location bar
Get the metadata for files and add them to a list of updated/needs updating
Add emblems for updated and needs updating (default to updated)

[Elliot Murphy (statik)]

looks good and builds fine.

review: Approve

=== modified file 'nautilus/ubuntuone-nautilus.c'
--- nautilus/ubuntuone-nautilus.c	2009-09-29 20:51:14 +0000
+++ nautilus/ubuntuone-nautilus.c	2009-10-09 22:21:14 +0000
@@ -73,6 +73,9 @@
   GHashTable * uploads;
   GHashTable * downloads;
   GHashTable * shares;
+  /* Lists of sync/unsync'd files */
+  GHashTable * updated;
+  GHashTable * needsupdating;
 
   /* Extra data we need to free on finalization */
   ShareCBData * share_cb_data;
@@ -88,6 +91,9 @@
 static void ubuntuone_nautilus_register_type (GTypeModule * module);
 
 /* DBus signal and async method call handlers */
+static void ubuntuone_nautilus_update_meta (DBusGProxy * proxy,
+					    DBusGProxyCall * call_id,
+					    gpointer user_data);
 static void ubuntuone_nautilus_state_toggled (DBusGProxy * proxy,
 					      DBusGProxyCall * call_id,
 					      gpointer user_data);
@@ -161,15 +167,28 @@
   path = g_filename_from_uri (nautilus_file_info_get_uri (file), NULL, NULL);
 
   if (path) {
-    if (g_hash_table_lookup (uon->uploads, path))
-      nautilus_file_info_add_emblem (file, "ubuntuone-updating");
+    if (!g_hash_table_lookup (uon->updated, path) &&
+	!g_hash_table_lookup (uon->needsupdating, path)) {
+      /* Add the synchronized emblem anyway, and update later */
+      nautilus_file_info_add_emblem (file, "ubuntuone-synchronized");
+      dbus_g_proxy_begin_call (uon->u1_fs, "get_metadata",
+			       ubuntuone_nautilus_update_meta, uon,
+			       NULL, G_TYPE_STRING, path, G_TYPE_INVALID);
+      goto updating_meta;
+    }
 
-    if (g_hash_table_lookup (uon->downloads, path))
+    if (g_hash_table_lookup (uon->uploads, path) ||
+	g_hash_table_lookup (uon->downloads, path))
       nautilus_file_info_add_emblem (file, "ubuntuone-updating");
+    else if (g_hash_table_lookup (uon->updated, path))
+      nautilus_file_info_add_emblem (file, "ubuntuone-synchronized");
+    else if (g_hash_table_lookup (uon->needsupdating, path))
+      nautilus_file_info_add_emblem (file, "ubuntuone-unsynchronized");
 
     if (g_hash_table_lookup (uon->shares, path))
       nautilus_file_info_add_emblem (file, "shared");
 
+  updating_meta:
     g_free (path);
   }
 
@@ -255,6 +274,11 @@
   if (!path || !ubuntuone_is_storagefs (uon, path))
     goto location_done;
 
+  /* Update the list of shared folders - ok to call dbus now */
+  dbus_g_proxy_begin_call (uon->u1_shares, "get_shared",
+			   ubuntuone_nautilus_got_shared, uon,
+			   NULL, G_TYPE_INVALID);
+
   hbox = gtk_hbox_new (FALSE, 6);
   labeltext = g_strdup_printf ("<b>Ubuntu One</b> %s", _("File Sharing"));
   label = gtk_label_new (labeltext);
@@ -537,6 +561,8 @@
   uon->uploads = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
   uon->downloads = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
   uon->shares = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+  uon->updated = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+  uon->needsupdating = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
 
   /* Magic bag of holding +10:
    * We store some button widgets in a hash table here, so that we can
@@ -674,6 +700,12 @@
   g_hash_table_destroy (uon->shares);
   uon->shares = NULL;
 
+  g_hash_table_destroy (uon->updated);
+  uon->updated = NULL;
+
+  g_hash_table_destroy (uon->needsupdating);
+  uon->needsupdating = NULL;
+
   g_hash_table_destroy (uon->buttons);
   uon->buttons = NULL;
 }
@@ -737,6 +769,40 @@
 
 
 /* DBus signal handlers and async method call handlers */
+static void ubuntuone_nautilus_update_meta (DBusGProxy * proxy,
+					    DBusGProxyCall * call_id,
+					    gpointer user_data) {
+  UbuntuOneNautilus * uon;
+  GHashTable * metadata;
+  GError * error = NULL;
+  gchar * local, * server, * path, * new_path;
+
+  g_return_if_fail (proxy != NULL);
+
+  if (!dbus_g_proxy_end_call (proxy, call_id, &error,
+			      dbus_g_type_get_map ("GHashTable",
+						   G_TYPE_STRING,
+						   G_TYPE_STRING),
+			      &metadata,
+			      G_TYPE_INVALID)) {
+    g_warning ("ERROR: %s", error->message);
+    return;
+  }
+
+  uon = UBUNTUONE_NAUTILUS (user_data);
+
+  path = g_hash_table_lookup (metadata, "path");
+  local = g_hash_table_lookup (metadata, "local_hash");
+  server = g_hash_table_lookup (metadata, "server_hash");
+
+  new_path = g_strdup (path);
+  if (local && server && strcmp (local, server) == 0)
+    g_hash_table_replace (uon->updated, new_path, new_path);
+  else
+    g_hash_table_replace (uon->needsupdating, new_path, new_path);
+  utime (path, NULL);
+}
+
 static void ubuntuone_nautilus_state_toggled (DBusGProxy * proxy,
 					      DBusGProxyCall * call_id,
 					      gpointer user_data) {
@@ -848,8 +914,14 @@
 						gchar * path, GHashTable * info,
 						gpointer user_data) {
   UbuntuOneNautilus * uon = UBUNTUONE_NAUTILUS (user_data);
+  gchar * new_path;
 
   g_hash_table_remove (uon->uploads, path);
+  g_hash_table_remove (uon->needsupdating, path);
+
+  new_path = g_strdup (path);
+  g_hash_table_replace (uon->updated, new_path, new_path);
+
   utime (path, NULL);
 }
 
@@ -870,8 +942,14 @@
 						  GHashTable * info,
 						  gpointer user_data) {
   UbuntuOneNautilus * uon = UBUNTUONE_NAUTILUS (user_data);
+  gchar * new_path;
 
   g_hash_table_remove (uon->downloads, path);
+  g_hash_table_remove (uon->needsupdating, path);
+
+  new_path = g_strdup (path);
+  g_hash_table_replace (uon->updated, new_path, new_path);
+
   utime (path, NULL);
 }