Merge lp:~mandel/ubuntuone-windows-installer/improve_u1sync_communication into lp:ubuntuone-windows-installer/beta

[Manuel de la Peña]

Improve the u1sync communication.

[John Lenton (chipaca)]

review: Approve

=== modified file 'src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs'
--- src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs	2010-11-02 22:21:27 +0000
+++ src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs	2010-11-02 22:21:27 +0000
@@ -86,7 +86,32 @@
         /// <param name="text">The text of the notification.</param>
         public void ShowNotification(int timeout, string title, string text)
         {
-            NotifyIcon.ShowBalloonTip(timeout, title, text, NotifyBalloonIcon.Info);
+            ShowNotification(timeout, title, text, NotificationType.INFO);
+        }
+
+        /// <summary>
+        /// Shows a notification to the user.
+        /// </summary>
+        /// <param name="timeout">The amount of time the notification will be shown.</param>
+        /// <param name="title">The title of the notification.</param>
+        /// <param name="text">The text of the actual notification.</param>
+        /// <param name="type">The type of notification sent.</param>
+        public void ShowNotification(int timeout, string title, string text, NotificationType type)
+        {
+            var icon = NotifyBalloonIcon.None;
+            switch (type)
+            {
+                case NotificationType.ERROR:
+                    icon = NotifyBalloonIcon.Error;
+                    break;
+                case NotificationType.WARNING:
+                    icon = NotifyBalloonIcon.Warning;
+                    break;
+                default:
+                    icon = NotifyBalloonIcon.Info;
+                    break;
+            }
+            NotifyIcon.ShowBalloonTip(timeout, title, text, icon);
         }
 
         /// <summary>
 
=== modified file 'src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj'
--- src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj	2010-10-19 12:34:50 +0000
+++ src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj	2010-11-02 22:21:27 +0000
@@ -74,6 +74,7 @@
     <Compile Include="..\Version.cs">
       <Link>Properties\Version.cs</Link>
     </Compile>
+    <Compile Include="Notification\Enums.cs" />
     <Compile Include="Notification\INotificationIconView.cs" />
     <Compile Include="Notification\IStateMapper.cs" />
     <Compile Include="Notification\ISyncDaemonClientNotifier.cs" />
 
=== added file 'src/Canonical.UbuntuOne.Client/Notification/Enums.cs'
--- src/Canonical.UbuntuOne.Client/Notification/Enums.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Client/Notification/Enums.cs	2010-11-02 22:21:27 +0000
@@ -0,0 +1,40 @@
+/* 
+ * Copyright 2010 Canonical Ltd.
+ * 
+ * This file is part of UbuntuOne on Windows.
+ * 
+ * UbuntuOne on Windows is free software: you can redistribute it and/or modify		
+ * it under the terms of the GNU Lesser General Public License version 		
+ * as published by the Free Software Foundation.		
+ *		
+ * Ubuntu One on Windows is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the	
+ * GNU Lesser General Public License for more details.	
+ *
+ * You should have received a copy of the GNU Lesser General Public License	
+ * along with UbuntuOne for Windows.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Authors: Manuel de la Peña <[e-mail]>
+ */
+namespace Canonical.UbuntuOne.Client.Notification
+{
+    /// <summary>
+    /// Enum that contains the different types of notifications.
+    /// </summary>
+    public enum NotificationType
+    {
+        ///<summary>
+        /// Enum that states that the notification provides information.
+        ///</summary>
+        INFO,
+        /// <summary>
+        /// Enum that states that the notification provides an error.
+        /// </summary>
+        ERROR,
+        /// <summary>
+        /// Enum that states that the notification provides a warning.
+        /// </summary>
+        WARNING
+    }
+}
 
=== modified file 'src/Canonical.UbuntuOne.Client/Notification/INotificationIconPresenter.cs'
--- src/Canonical.UbuntuOne.Client/Notification/INotificationIconPresenter.cs	2010-08-30 17:30:31 +0000
+++ src/Canonical.UbuntuOne.Client/Notification/INotificationIconPresenter.cs	2010-11-02 22:21:27 +0000
@@ -1,20 +1,22 @@
-// Copyright 2010 Canonical Ltd.
-// 
-// This file is part of UbuntuOne on Windows.
-// 
-// UbuntuOne on Windows is free software: you can redistribute it and/or modify		
-// it under the terms of the GNU Lesser General Public License version 		
-// as published by the Free Software Foundation.		
-//		
-// Ubuntu One on Windows is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the	
-// GNU Lesser General Public License for more details.	
-//
-// You should have received a copy of the GNU Lesser General Public License	
-// along with UbuntuOne for Windows.  If not, see <http://www.gnu.org/licenses/>.
-// 
-// Authors: Manuel de la Peña <[e-mail]>
+/* 
+ * Copyright 2010 Canonical Ltd.
+ * 
+ * This file is part of UbuntuOne on Windows.
+ * 
+ * UbuntuOne on Windows is free software: you can redistribute it and/or modify		
+ * it under the terms of the GNU Lesser General Public License version 		
+ * as published by the Free Software Foundation.		
+ *		
+ * Ubuntu One on Windows is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the	
+ * GNU Lesser General Public License for more details.	
+ *
+ * You should have received a copy of the GNU Lesser General Public License	
+ * along with UbuntuOne for Windows.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Authors: Manuel de la Peña <[e-mail]>
+ */
 namespace Canonical.UbuntuOne.Client.Notification
 {
     /// <summary>
 
=== modified file 'src/Canonical.UbuntuOne.Client/Notification/INotificationIconView.cs'
--- src/Canonical.UbuntuOne.Client/Notification/INotificationIconView.cs	2010-10-20 23:09:36 +0000
+++ src/Canonical.UbuntuOne.Client/Notification/INotificationIconView.cs	2010-11-02 22:21:27 +0000
@@ -41,6 +41,15 @@
         void ShowNotification(int timeout, string title, string text);
 
         /// <summary>
+        /// Shows a notification to the user.
+        /// </summary>
+        /// <param name="timeout">The amount of time the notification will be shown.</param>
+        /// <param name="title">The title of the notification.</param>
+        /// <param name="text">The text of the actual notification.</param>
+        /// <param name="type">The type of notification sent.</param>
+        void ShowNotification(int timeout, string title, string text, NotificationType type);
+
+        /// <summary>
         /// Gets and sets the list of recently modified files.
         /// </summary>
         IList<string> RecentlyModifiedFiles { get; set; }
 
=== modified file 'src/Canonical.UbuntuOne.ProcessDispatcher/JsonMessageProcessor.cs'
--- src/Canonical.UbuntuOne.ProcessDispatcher/JsonMessageProcessor.cs	2010-10-19 12:34:50 +0000
+++ src/Canonical.UbuntuOne.ProcessDispatcher/JsonMessageProcessor.cs	2010-11-02 22:21:27 +0000
@@ -47,7 +47,13 @@
             var messageObject = (JObject) message;
             if(string.Compare((string)messageObject["type"], "notify", StringComparison.CurrentCultureIgnoreCase) == 0)
             {
-                NotificationIconView.ShowNotification(10, (string)messageObject["title"], (string)messageObject["message"]);
+                NotificationIconView.ShowNotification(5, (string)messageObject["title"], (string)messageObject["message"], 
+                    NotificationType.INFO);
+            }
+            if(string.Compare((string)messageObject["type"], "error", StringComparison.CurrentCultureIgnoreCase) == 0)
+            {
+                NotificationIconView.ShowNotification(5, "Error", (string) messageObject["message"],
+                    NotificationType.ERROR);
             }
         }
     }
 
=== modified file 'src/u1sync/main.py'
--- src/u1sync/main.py	2010-10-19 10:35:43 +0000
+++ src/u1sync/main.py	2010-11-02 22:21:27 +0000
@@ -43,7 +43,7 @@
 from u1sync.merge import (
     SyncMerge, ClobberServerMerge, ClobberLocalMerge, merge_trees)
 from u1sync.sync import download_tree, upload_tree
-from u1sync.utils import safe_mkdir, send_bus_error, send_notification
+from u1sync.utils import safe_mkdir, send_error, send_notification
 from u1sync import metadata
 from u1sync.constants import METADATA_DIR_NAME
 from u1sync.ubuntuone_optparse import UbuntuOneOptionsParser
@@ -335,21 +335,29 @@
     try:
         do_main(argv, UbuntuOneOptionsParser())
     except AuthenticationError, e:
+        send_error("Authentication failed: %s" % e, e)
         print "Authentication failed: %s" % e
     except ConnectionError, e:
+        send_error("Connection failed: %s" % e, e)
         print "Connection failed: %s" % e
     except DirectoryNotInitializedError, e:
+        send_error("Directory not initialized", e)
         print "Directory not initialized; " \
             "use --init [DIRECTORY] to initialize it."
     except DirectoryAlreadyInitializedError, e:
+        send_error("Directory already initialized.", e)
         print "Directory already initialized."
     except NoSuchShareError, e:
+        send_error("No matching share found.", e)
         print "No matching share found."
     except ReadOnlyShareError, e:
+        send_error("The selected action isn't possible on a read-only share.", e)
         print "The selected action isn't possible on a read-only share."
     except (ForcedShutdown, KeyboardInterrupt), e:
+        send_error("Interrupted!", e)
         print "Interrupted!"
     except TreesDiffer, e:
+        send_error("Trees differ.", e)
         if not e.quiet:
             print "Trees differ."
     else:
 
=== modified file 'src/u1sync/sync.py'
--- src/u1sync/sync.py	2010-10-20 08:42:42 +0000
+++ src/u1sync/sync.py	2010-11-02 22:21:27 +0000
@@ -35,7 +35,7 @@
     DIRECTORY, SYMLINK)
 from u1sync.genericmerge import (
     MergeNode, generic_merge)
-from u1sync.utils import safe_mkdir, send_notification
+from u1sync.utils import safe_mkdir, send_notification, send_error
 from u1sync.client import UnsupportedOperationError
 
 def get_conflict_path(path, conflict_info):
@@ -88,10 +88,6 @@
                 else:
                     if not quiet:
                         print "%s   %s" % (sync_mode.symbol, display_path)
-                    if(sync_mode.symbol == DOWNLOAD_SYMBOL):
-                        send_notification("Downloading", "Downloading file '%s'" % display_path, "info")
-                    elif(sync_mode.symbol == UPLOAD_SYMBOL):
-                        send_notification("Uploading", "Uploading file '%s'" % display_path, "info")
                     try:
                         create_dir = sync_mode.create_directory
                         node_uuid = create_dir(parent_uuid=parent_uuid,
@@ -241,6 +237,7 @@
             safe_mkdir(path)
             send_notification("New dir", "Creating dir %s" % path, "info")
         except OSError, e:
+            send_error("Error creating local directory %s" % path, e)
             raise NodeCreateError("Error creating local directory %s: %s" % \
                                   (path, e))
         return None
@@ -253,6 +250,7 @@
             path = get_conflict_path(path, conflict_info)
             content_hash = conflict_info[1]
         try:
+            send_notification("Downloading", "Downloading '%s'" % path, "info")
             if node_type == SYMLINK:
                 self.client.download_string(share_uuid=
                                             self.share_uuid,
@@ -265,24 +263,30 @@
                                           filename=path)
         except (request.StorageRequestError, UnsupportedOperationError), e:
             if os.path.exists(path):
+                send_error("Error downloading content for %s" % path, e)
                 raise NodeUpdateError("Error downloading content for %s: %s" %\
                                       (path, e))
             else:
+                send_error("Error locally creating %s" % path, e)
                 raise NodeCreateError("Error locally creating %s: %s" % \
                                       (path, e))
 
     def delete_directory(self, node_uuid, path):
         """Deletes a directory."""
+        send_notification("Removing", "Removing directory '%s'" % path, "info")
         try:
             os.rmdir(path)
         except OSError, e:
+            send_error("Error locally deleting %s" % path, e)
             raise NodeDeleteError("Error locally deleting %s: %s" % (path, e))
 
     def delete_file(self, node_uuid, path):
         """Deletes a file."""
+        send_notification("Removing", "Removing file '%s'" % path, "info")
         try:
             os.unlink(path)
         except OSError, e:
+            send_error("Error locally deleting %s" % path, e)
             raise NodeDeleteError("Error locally deleting %s: %s" % (path, e))
 
 
@@ -298,10 +302,12 @@
         """Creates a directory on the server."""
         name = name_from_path(path)
         try:
+            send_notification("Creating", "Creating directory '%s'" % path, "info")
             return self.client.create_directory(share_uuid=self.share_uuid,
                                                 parent_uuid=parent_uuid,
                                                 name=name)
         except (request.StorageRequestError, UnsupportedOperationError), e:
+            send_error("Error remotely creating %s" % path, e)
             raise NodeCreateError("Error remotely creating %s: %s" % \
                                   (path, e))
 
@@ -319,6 +325,7 @@
                                  name=conflict_name,
                                  node_uuid=node_uuid)
             except (request.StorageRequestError, UnsupportedOperationError), e:
+                send_error("Error remotely renaming %s to %s" % (path, conflict_path), e)
                 raise NodeUpdateError("Error remotely renaming %s to %s: %s" %\
                                       (path, conflict_path, e))
             node_uuid = None
@@ -328,6 +335,7 @@
             try:
                 target = os.readlink(path)
             except OSError, e:
+                send_error("Error retrieving link target %s" % path, e)
                 raise NodeCreateError("Error retrieving link target " \
                                       "for %s: %s" % (path, e))
         else:
@@ -336,6 +344,7 @@
         name = name_from_path(path)
         if node_uuid is None:
             try:
+                send_notification("Creating", "Remotely creating '%s'" % path, "info")
                 if node_type == SYMLINK:
                     node_uuid = self.client.create_symlink(share_uuid=
                                                            self.share_uuid,
@@ -351,11 +360,13 @@
                                                         parent_uuid,
                                                         name=name)
             except (request.StorageRequestError, UnsupportedOperationError), e:
+                send_error("Error remotely creating for %s" % path, e)
                 raise NodeCreateError("Error remotely creating %s: %s" % \
                                       (path, e))
 
         if old_content_hash != content_hash:
             try:
+                send_notification("Updating", "Uploading '%s'" % path, "info")
                 if node_type == SYMLINK:
                     self.client.upload_string(share_uuid=self.share_uuid,
                                               node_uuid=node_uuid,
@@ -370,6 +381,7 @@
                                             old_content_hash=old_content_hash,
                                             filename=path)
             except (request.StorageRequestError, UnsupportedOperationError), e:
+                send_error("Error uploading content for %s" % path, e)
                 raise NodeUpdateError("Error uploading content for %s: %s" % \
                                       (path, e))
 
@@ -377,12 +389,16 @@
         """Deletes a directory."""
         try:
             self.client.unlink(share_uuid=self.share_uuid, node_uuid=node_uuid)
+            send_notification("Deleting", "Remotely deleting directory '%s'" % path, "info")
         except (request.StorageRequestError, UnsupportedOperationError), e:
+            send_error("Error remotely deleting %s" % path, e)
             raise NodeDeleteError("Error remotely deleting %s: %s" % (path, e))
 
     def delete_file(self, node_uuid, path):
         """Deletes a file."""
         try:
             self.client.unlink(share_uuid=self.share_uuid, node_uuid=node_uuid)
+            send_notification("Deleting", "Remotely deleting file '%s'" % path, "info")
         except (request.StorageRequestError, UnsupportedOperationError), e:
+            send_error("Error remotely deleting %s" % path, e)
             raise NodeDeleteError("Error remotely deleting %s: %s" % (path, e))
 
=== modified file 'src/u1sync/utils.py'
--- src/u1sync/utils.py	2010-10-19 10:35:43 +0000
+++ src/u1sync/utils.py	2010-11-02 22:21:27 +0000
@@ -81,14 +81,14 @@
     except Exception, e:
         print "Error: C# client is not listening!! %s" % e.message
     
-def send_bus_error(error_message, exception):
+def send_error(error_message, exception):
     message = create_error_message(error_message, exception)
     send_bus_message(message)
     
 def send_notification(title, message, type):
     message = {'type':'notify',
-                'title':title,
-                'message':message,
-                'notification_type':type}
+               'title':title,
+               'message':message,
+               'notification_type':type}
     send_bus_message(message)
     
 \ No newline at end of file