File tomboy-sync-fixes-r1444.patch of Package tomboy

Overview Repositories Revisions Requests Users Attributes Meta

File tomboy-sync-fixes-r1444.patch of Package tomboy (Revision e8afce1e937cf333e1d6b6ffb25dbde8)

Currently displaying revision e8afce1e937cf333e1d6b6ffb25dbde8 , Show latest

This patch is from r1444 of svn.gnome.org/svn/trunk.  It fixes
the following issues:

* Tomboy/PreferencesDialog.cs: Check for TomboySyncException when
  saving sync configuration.  Use exception message in error dialog
  content.
* Tomboy/Synchronization/FuseSyncServiceAddin.cs: Adding
  FuseMountTimeoutError and FuseMountDirectoryError members, to be
  overriden by child classes that need to customize these error
  messages.  MountFuse method throws TomboySyncException instead of
  just returning false.  Check for existence of mountPath directory
  after mounting...wdfs with incorrect user/pass credentials will
  appear to mount correctly but Directory.Exists will return false.
* Tomboy/Synchronization/SyncManager.cs: Added TomboySyncException
  type, an extension of System.ApplicationException.
* Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs,
  Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs,
  Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs: Throw
  TomboySyncException when configuration is incorrect.

Index: Tomboy/PreferencesDialog.cs
===================================================================
--- Tomboy/PreferencesDialog.cs	(revision 1443)
+++ Tomboy/PreferencesDialog.cs	(revision 1444)
@@ -1082,12 +1082,15 @@
 				return;
 			
 			bool saved = false;
+			string errorMsg = null;
 			try {
 				GdkWindow.Cursor = new Gdk.Cursor (Gdk.CursorType.Watch);
 				GdkWindow.Display.Flush ();
 				saved = selectedSyncAddin.SaveConfiguration ();
+			} catch (TomboySyncException syncEx) {
+				errorMsg = syncEx.Message;
 			} catch (Exception e) {
-				Logger.Debug ("Error calling {0}.SaveConfiguration: {1}\n{2}",
+				Logger.Debug ("Unexpected error calling {0}.SaveConfiguration: {1}\n{2}",
 					selectedSyncAddin.Id, e.Message, e.StackTrace);
 			} finally {
 				GdkWindow.Cursor = null;
@@ -1132,14 +1135,18 @@
 
 				// Give the user a visual letting them know that connecting
 				// was successful.
+				if (errorMsg == null)
+					errorMsg = Catalog.GetString ("Sorry, but something went wrong.  " +
+					                              "Please check your information and " +
+					                              "try again.  The ~/.tomboy.log might " +
+					                              "be useful too.");
 				dialog = 
 					new HIGMessageDialog (this,
 							      Gtk.DialogFlags.Modal,
 							      Gtk.MessageType.Warning,
 							      Gtk.ButtonsType.Close,
 							      Catalog.GetString ("Error connecting :("),
-							      Catalog.GetString (
-						"Sorry, but something went wrong.  Please check your information and try again.  The ~/.tomboy.log might be useful too."));
+							      errorMsg);
 				dialog.Run ();
 				dialog.Destroy ();
 			}
Index: Tomboy/Synchronization/FuseSyncServiceAddin.cs
===================================================================
--- Tomboy/Synchronization/FuseSyncServiceAddin.cs	(revision 1443)
+++ Tomboy/Synchronization/FuseSyncServiceAddin.cs	(revision 1444)
@@ -3,6 +3,8 @@
 using System.Diagnostics;
 using System.Collections.Generic;
 
+using Mono.Unix;
+
 namespace Tomboy.Sync
 {
 	public abstract class FuseSyncServiceAddin : SyncServiceAddin
@@ -51,7 +53,7 @@
 			
 			// Mount if necessary
 			if (IsConfigured) {
-				if (!IsMounted && !MountFuse (true))
+				if (!IsMounted && !MountFuse (true)) // MountFuse may throw TomboySyncException!
 					throw new Exception ("Could not mount " + mountPath);
 				server = new FileSystemSyncServer (mountPath);
 			} else
@@ -121,7 +123,25 @@
 		
 		protected abstract string GetFuseMountExeArgs (string mountPath, bool fromStoredValues);
 #endregion // Abstract Members
+
+#region Public Virtual Members
+		public virtual string FuseMountTimeoutError
+		{
+			get
+			{
+				return Catalog.GetString ("Timeout connecting to server.");
+			}
+		}
 		
+		public virtual string FuseMountDirectoryError
+		{
+			get
+			{
+				return Catalog.GetString ("Error connecting to server.");
+			}
+		}
+#endregion
+
 #region Private Methods
 		private bool MountFuse (bool useStoredValues)
 		{
@@ -131,15 +151,21 @@
 			if (SyncUtils.IsFuseEnabled () == false) {
 				if (SyncUtils.EnableFuse () == false) {
 					Logger.Debug ("User canceled or something went wrong enabling FUSE");
-					return false;
+					throw new TomboySyncException (Catalog.GetString ("FUSE could not be enabled."));
 				}
 			}
 			
 			CreateMountPath ();
 
 			Process p = new Process ();
+			
+			// Need to redirect stderr for displaying errors to user,
+			// but we can't use stdout and by not redirecting it, it
+			// should appear in the console Tomboy is started from.
+			p.StartInfo.RedirectStandardOutput = false;
+			p.StartInfo.RedirectStandardError = true;
+			
 			p.StartInfo.UseShellExecute = false;
-			p.StartInfo.RedirectStandardOutput = false;
 			p.StartInfo.FileName = fuseMountExePath;
 			p.StartInfo.Arguments = GetFuseMountExeArgs (mountPath, useStoredValues);
 			p.StartInfo.CreateNoWindow = true;
@@ -148,13 +174,31 @@
 			bool exited = p.WaitForExit (timeoutMs);
 
 			if (!exited) {
+				UnmountTimeout (null, null); // TODO: This is awfully ugly
 				Logger.Debug (string.Format ("Error calling {0}: timed out after {1} seconds",
 				                             fuseMountExePath, timeoutMs / 1000));
-				return false;
+				throw new TomboySyncException (FuseMountTimeoutError);
 			} else if (p.ExitCode == 1) {
+				UnmountTimeout (null, null); // TODO: This is awfully ugly
 				Logger.Debug ("Error calling " + fuseMountExePath);
-				return false;
+				throw new TomboySyncException (Catalog.GetString ("An error ocurred while connecting to the specified server:\n\n") +
+				                               p.StandardError.ReadToEnd ());
 			}
+			
+			// For wdfs, incorrect user credentials will cause the mountPath to
+			// be messed up, and not recognized as a directory.  This is the only
+			// way I can find to report that the username/password may be incorrect (for wdfs).
+			if (!Directory.Exists (mountPath)) {
+				Logger.Debug ("FUSE mount call succeeded, but mount path does not exist. " +
+				              "This may be an indication that incorrect user credentials were " +
+				              "provided, but it may also represent any number of error states " +
+				              "not properly handled by the FUSE filesystem.");
+				// Even though the mountPath is screwed up, it is still (apparently)
+				// a valid FUSE mount and must be unmounted.
+				UnmountTimeout (null, null); // TODO: This is awfully ugly
+				throw new TomboySyncException (FuseMountDirectoryError);
+			}
+			
 			return true;
 		}
 		
Index: Tomboy/Synchronization/SyncManager.cs
===================================================================
--- Tomboy/Synchronization/SyncManager.cs	(revision 1443)
+++ Tomboy/Synchronization/SyncManager.cs	(revision 1444)
@@ -741,4 +741,12 @@
 		void Reset ();
 		string AssociatedServerId { get; set; }
 	}
+			
+	public class TomboySyncException : ApplicationException
+	{
+		public TomboySyncException (string message) :
+			base (message) {}
+		public TomboySyncException (string message, Exception innerException) :
+			base (message, innerException) {}
+	}
 }
Index: Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs
===================================================================
--- Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs	(revision 1443)
+++ Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs	(revision 1444)
@@ -141,7 +141,7 @@
 			if (syncPath == string.Empty) {
 				// TODO: Figure out a way to send the error back to the client
 				Logger.Debug ("The path is empty");
-				return false;
+				throw new TomboySyncException (Catalog.GetString ("Folder path field is empty."));
 			}
 			
 			// Attempt to create the path and fail if we can't
@@ -150,7 +150,8 @@
 					Directory.CreateDirectory (syncPath);
 				} catch (Exception e) {
 					Logger.Debug ("Could not create \"{0}\": {1}", path, e.Message);
-					return false;
+					throw new TomboySyncException (Catalog.GetString ("Specified folder path does not exist, " +
+					                                                  "and Tomboy was unable to create it."));
 				}
 			}
 			
Index: Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs
===================================================================
--- Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs	(revision 1443)
+++ Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs	(revision 1444)
@@ -84,7 +84,7 @@
 			if (!GetPrefWidgetSettings (out url, out username, out password)) {
 				// TODO: Figure out a way to send the error back to the client
 				Logger.Debug ("One of url, username, or password was empty");
-				return false;
+				throw new TomboySyncException (Catalog.GetString ("URL, username, or password field is empty."));
 			}
 			
 			return true;
@@ -155,10 +155,22 @@
 			                      password);
 		}
 
-		protected override string FuseMountExeName {
+		protected override string FuseMountExeName
+		{
 			get { return "wdfs"; }
 		}
 		
+		public override string FuseMountDirectoryError
+		{
+			get
+			{
+				return Catalog.GetString ("There was an error connecting to the server.  " +
+				                          "This may be caused by using an " +
+				                          "incorrect user name and/or password.");
+			}
+		}
+
+		
 		#region Private Methods
 		/// <summary>
 		/// Get config settings
Index: Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs
===================================================================
--- Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs	(revision 1443)
+++ Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs	(revision 1444)
@@ -86,7 +86,7 @@
 			if (!GetPrefWidgetSettings (out server, out folder, out username)) {
 				// TODO: Figure out a way to send the error back to the client
 				Logger.Debug ("One of url, username was empty");
-				return false;
+				throw new TomboySyncException (Catalog.GetString ("Server or username field is empty."));
 			}
 			
 			return true;
@@ -160,10 +160,22 @@
 					mountPath);
 		}
 
-		protected override string FuseMountExeName {
+		protected override string FuseMountExeName
+		{
 			get { return "sshfs"; }
 		}
 		
+		public override string FuseMountTimeoutError
+		{
+			get
+			{
+				return Catalog.GetString ("Timeout connecting to server. " +
+				                          "Please ensure that your SSH key has been " +
+				                          "added to a running SSH daemon.");
+			}
+		}
+
+		
 		#region Private Methods
 		/// <summary>
 		/// Get config settings

Places

File tomboy-sync-fixes-r1444.patch of Package tomboy (Revision e8afce1e937cf333e1d6b6ffb25dbde8)

Places