Merge lp:~dobey/ubuntuone-client/sharing-error into lp:ubuntuone-client

[dobey]

Handle ShareCreateError in the nautilus extension, and show an error dialog
Fix the _create_share_http code to call the errback/callback properly
Add the path to the share_info dict on errors
Fix volume_manager and tests to get mdid properly

[John O'Brien (jdobrien)]

review: Approve

[Tim Cole (tcole)]

review: Approve

=== modified file 'nautilus/ubuntuone-nautilus.c'
--- nautilus/ubuntuone-nautilus.c	2009-09-14 15:48:56 +0000
+++ nautilus/ubuntuone-nautilus.c	2009-09-18 18:41:10 +0000
@@ -115,6 +115,10 @@
 static void ubuntuone_nautilus_share_created (DBusGProxy * proxy,
 					      GHashTable * hash,
 					      gpointer user_data);
+static void ubuntuone_nautilus_sharing_error (DBusGProxy * proxy,
+					      GHashTable * hash,
+					      gchar * error,
+					      gpointer user_data);
 
 static GObjectClass * parent_class = NULL;
 
@@ -622,6 +626,15 @@
   dbus_g_proxy_connect_signal (uon->u1_shares, "ShareCreated",
 			       G_CALLBACK (ubuntuone_nautilus_share_created),
 			       uon, NULL);
+  dbus_g_proxy_add_signal (uon->u1_shares, "ShareCreateError",
+			   dbus_g_type_get_map ("GHashTable",
+						G_TYPE_STRING,
+						G_TYPE_STRING),
+			   G_TYPE_STRING,
+			   G_TYPE_INVALID);
+  dbus_g_proxy_connect_signal (uon->u1_shares, "ShareCreateError",
+			       G_CALLBACK (ubuntuone_nautilus_sharing_error),
+			       uon, NULL);
 }
 
 static void ubuntuone_nautilus_class_init (UbuntuOneNautilusClass * klass) {
@@ -887,7 +900,8 @@
 }
 
 static void ubuntuone_nautilus_download_finished (DBusGProxy * proxy,
-						  gchar * path, GHashTable * info,
+						  gchar * path,
+						  GHashTable * info,
 						  gpointer user_data) {
   UbuntuOneNautilus * uon = UBUNTUONE_NAUTILUS (user_data);
   gchar * partial = NULL;
@@ -919,6 +933,33 @@
   }
 }
 
+static void ubuntuone_nautilus_sharing_error (DBusGProxy * proxy,
+					      GHashTable * hash,
+					      gchar * error,
+					      gpointer user_data) {
+  UbuntuOneNautilus * uon = UBUNTUONE_NAUTILUS (user_data);
+  gchar * path, * message;
+  GtkWidget * dialog;
+
+  path = g_hash_table_lookup (hash, "path");
+
+  dialog = gtk_message_dialog_new (GTK_WINDOW (uon->share_cb_data->parent),
+				   GTK_DIALOG_DESTROY_WITH_PARENT |
+				   GTK_DIALOG_NO_SEPARATOR,
+				   GTK_MESSAGE_ERROR,
+				   GTK_BUTTONS_CLOSE,
+				   _("Error creating share."));
+  message = g_strdup_printf (_("There was an error sharing the folder '%s':\n%s"),
+			     path,
+			     error);
+  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+					    "%s", message);
+  g_free (message);
+  g_signal_connect_swapped (G_OBJECT (dialog), "response",
+			    G_CALLBACK (gtk_widget_destroy), dialog);
+  gtk_widget_show (dialog);
+}
+
 /* Required Nautilus module handling methods */
 void nautilus_module_initialize (GTypeModule * module) {
 #ifdef ENABLE_NLS

=== modified file 'tests/syncdaemon/test_dbus.py'
--- tests/syncdaemon/test_dbus.py	2009-08-26 06:04:50 +0000
+++ tests/syncdaemon/test_dbus.py	2009-09-18 18:41:10 +0000
@@ -1118,7 +1118,8 @@
         a_dir = os.path.join(self.root_dir, "a_dir")
         self.fs_manager.create(a_dir, "", is_dir=True)
         self.fs_manager.set_node_id(a_dir, "node_id")
-        mdid = self.fs_manager.get_by_node_id("", "node_id")
+        mdobj = self.fs_manager.get_by_node_id("", "node_id")
+        mdid = mdobj.mdid
         marker = MDMarker(mdid)
         d = defer.Deferred()
         def share_handler(result):
@@ -1137,7 +1138,8 @@
         a_dir = os.path.join(self.root_dir, "a_dir")
         self.fs_manager.create(a_dir, "", is_dir=True)
         self.fs_manager.set_node_id(a_dir, "node_id")
-        mdid = self.fs_manager.get_by_node_id("", "node_id")
+        mdobj = self.fs_manager.get_by_node_id("", "node_id")
+        mdid = mdobj.mdid
         marker = MDMarker(mdid)
         error_msg = 'a error message'
         d = defer.Deferred()

=== modified file 'ubuntuone/syncdaemon/action_queue.py'
--- ubuntuone/syncdaemon/action_queue.py	2009-09-10 18:49:01 +0000
+++ ubuntuone/syncdaemon/action_queue.py	2009-09-18 18:41:10 +0000
@@ -1799,7 +1799,7 @@
         """
         return self.demark(self.node_id)
 
-    def _create_share_http(self, node_id, user, name, modify):
+    def _create_share_http(self, node_id, user, name, modify, deferred):
         """Create a share using the HTTP Web API method."""
 
         consumer = oauth.OAuthConsumer("ubuntuone", "hammertime")
@@ -1821,24 +1821,23 @@
         try:
             urlopen(req)
         except HTTPError, e:
-            self.log.error('Failed to create share for %s: %s',
-                           str(node_id), e.strerror)
+            deferred.errback(Failure(e))
+
+        deferred.callback()
 
     def _run(self):
         """
         Do the actual running
         """
         if self.use_http:
-            # External user, do the Web API method
-            def failed_thread(error):
-                """Failed to launch the share creation thread."""
-                self.log.error("Failed to create share: %s",
-                               error.getErrorMessage())
+            # External user, do the HTTP REST method
+            deferred = defer.Deferred()
             d = threads.deferToThread(self._create_share_http,
                                       self.node_id, self.share_to,
-                                      self.name, self.access_level)
-            d.addErrback(failed_thread)
-            return d
+                                      self.name, self.access_level,
+                                      deferred)
+            d.addErrback(deferred.errback)
+            return deferred
         else:
             return self.action_queue.client.create_share(self.node_id,
                                                          self.share_to,
@@ -1849,6 +1848,7 @@
         """
         It worked! Push the event.
         """
+        # We don't get a share_id back from the HTTP REST method
         if not self.use_http:
             self.action_queue.event_queue.push('AQ_CREATE_SHARE_OK',
                                                share_id=success.share_id,

=== modified file 'ubuntuone/syncdaemon/dbus_interface.py'
--- ubuntuone/syncdaemon/dbus_interface.py	2009-08-26 15:25:50 +0000
+++ ubuntuone/syncdaemon/dbus_interface.py	2009-09-18 18:41:10 +0000
@@ -769,6 +769,8 @@
 
     def emit_share_create_error(self, share_info, error):
         """ emits ShareDeleted signal """
+        path = self.fs_manager.get_by_mdid(str(share_info['marker'])).path
+        share_info.update(dict(path=path))
         self.ShareCreateError(share_info, error)
 
     @dbus.service.method(DBUS_IFACE_SHARES_NAME,

=== modified file 'ubuntuone/syncdaemon/volume_manager.py'
--- ubuntuone/syncdaemon/volume_manager.py	2009-09-14 19:03:00 +0000
+++ ubuntuone/syncdaemon/volume_manager.py	2009-09-18 18:41:10 +0000
@@ -418,7 +418,7 @@
         self.log.debug('create share(%r, %s, %s, %s)',
                        path, username, name, access_level)
         mdobj = self.m.fs.get_by_path(path)
-        mdid = self.m.fs.get_by_node_id(mdobj.share_id, mdobj.node_id)
+        mdid = mdobj.mdid
         marker = MDMarker(mdid)
         share = Share(self.m.fs.get_abspath("", mdobj.path), share_id=marker,
                       name=name, access_level=access_level,