Merge lp:~qos/do-plugins/ssh-browse-via-sftp into lp:do-plugins

[Massimo Mund]

[Massimo Mund (qos)]

You can now launch your SSH hosts via nautilus and SFTP.
e.g.: Tap the MagicKey, type "SFTP", type "yourhost", ENTER
and nautilus will open the host via "sftp://yourhost".

You can also directly access "yourhost".
e.g.: Tag the MagicKey, type "yourhost", TAB, select OPEN or BROWSE VIA SFTP, ENTER

[Alex Launi (alexlauni)]

1) Please return the localizer to the autofoo one. You've hardcoded the path in the Addin.xml.in.
2) SSHActionSFTP is an ugly name, StfpAction.cs.
3) You've got a bunch of Mono guideline violations, make sure that all of your method calls have a space between the method name and the parameters. Method (param);
4) You dont need SupportsItem if you're just returning True, that's what the parent method does.
5) I don't like that you've got the code for finding the file manager in two places. You should make a new static class Util.cs that has a static method FindFileManager () that will search GConf for the file manager, then you're not copying and pasting blocks. Much cleaner.

review: Needs Fixing

[Massimo Mund (qos)]

all issues fixed hopefully :)

Unmerged revisions

660. By Massimo Mund on 2009-12-06

Fixed the issues suggested by Alex Launi.

659. By Mo <mo@ibex> on 2009-08-21

Fixed missing SSH source file

658. By Mo <mo@ibex> on 2009-08-21

Allows you to launch SSH profiles via SFTP and nautilus

=== modified file 'SSH/Makefile.am'
--- SSH/Makefile.am	2009-06-22 04:05:16 +0000
+++ SSH/Makefile.am	2009-12-06 00:40:28 +0000
@@ -4,8 +4,10 @@
 
 FILES = \
 	src/SSHAction.cs \
+	src/SFTPAction.cs \
 	src/SSHHostItem.cs \
-	src/SSHHostItemSource.cs
+	src/SSHHostItemSource.cs \
+	src/Util.cs
 
 RESOURCES = \
 	Resources/SSH.addin.xml 

=== modified file 'SSH/Resources/SSH.addin.xml.in'
--- SSH/Resources/SSH.addin.xml.in	2009-06-26 15:28:06 +0000
+++ SSH/Resources/SSH.addin.xml.in	2009-12-06 00:40:28 +0000
@@ -1,9 +1,9 @@
 <Addin
 	id="SSH"
 	namespace="Do"
-	version="1.1"
+	version="1.2"
 	name="SSH"
-	description="Search and connect to SSH hosts."
+	description="Search, Browse and connect to SSH hosts."
 	author="Peter Stuifzand"
 	category="Community"
 	defaultEnabled="false"
@@ -19,11 +19,13 @@
 	<Dependencies>
 		<Addin id="Universe" version="1.0" />
 	</Dependencies>
+	
 
 	<Extension path = "/Do/ItemSource">
 		<ItemSource type="SSH.SSHHostItemSource" />
 	</Extension>
 	<Extension path = "/Do/Action">
 		<Action type="SSH.SSHAction" />
+		<Action type="SSH.SFTPAction" />
 	</Extension>
 </Addin>

=== modified file 'SSH/SSH.mdp'
--- SSH/SSH.mdp	2009-06-29 08:47:41 +0000
+++ SSH/SSH.mdp	2009-12-06 00:40:28 +0000
@@ -16,7 +16,9 @@
   <Contents>
     <File name="src" subtype="Directory" buildaction="Compile" />
     <File name="src/SSHAction.cs" subtype="Code" buildaction="Compile" />
+    <File name="src/SFTPAction.cs" subtype="Code" buildaction="Compile" />
     <File name="src/SSHHostItem.cs" subtype="Code" buildaction="Compile" />
+    <File name="src/Util.cs" subtype="Code" buildaction="Compile" />
     <File name="Resources/SSH.addin.xml" subtype="Code" buildaction="EmbedAsResource" />
     <File name="src/SSHHostItemSource.cs" subtype="Code" buildaction="Compile" />
   </Contents>

=== added file 'SSH/src/SFTPAction.cs'
--- SSH/src/SFTPAction.cs	1970-01-01 00:00:00 +0000
+++ SSH/src/SFTPAction.cs	2009-12-06 00:40:28 +0000
@@ -0,0 +1,77 @@
+/* SFTPAction.cs
+ *
+ * GNOME Do is the legal property of its developers. Please refer to the
+ * COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Do.Universe;
+using Do.Platform;
+using System.Diagnostics;
+
+using Mono.Addins;
+
+namespace SSH {
+	
+	public class SFTPAction : Act {
+		
+		public override string Name {
+			get {
+				return AddinManager.CurrentLocalizer.GetString ("Browse via SFTP");
+			}
+		}
+		
+		public override string Description {
+			get {
+				return AddinManager.CurrentLocalizer.GetString ("Browse via SFTP");
+			}
+		}
+		
+		public override string Icon {
+			get {
+				return "network-server";
+			}
+		}
+		
+		public override IEnumerable<Type> SupportedItemTypes {
+			get {
+				yield return typeof (ITextItem);
+				yield return typeof (SSHHostItem);
+                }
+		}
+				
+		public override IEnumerable<Item> Perform (IEnumerable<Item> items, IEnumerable<Item> modItems) {
+
+			string hostname;
+			string exec = Util.FindFileManager ();
+
+			if (items.First () is ITextItem) {
+				ITextItem textitem = items.First () as ITextItem;
+				hostname = textitem.Text;
+			}
+			else {
+				SSHHostItem hostitem = items.First () as SSHHostItem;
+				hostname = hostitem.Host;
+			}
+
+			Process.Start (exec, "sftp://"+hostname);
+			yield break;
+		}
+	}
+}
\ No newline at end of file

=== modified file 'SSH/src/SSHAction.cs'
--- SSH/src/SSHAction.cs	2009-06-22 04:05:16 +0000
+++ SSH/src/SSHAction.cs	2009-12-06 00:40:28 +0000
@@ -57,10 +57,6 @@
                 }
 		}
 		
-		public override bool SupportsItem (Item item) {
-			return true;
-		}
-		
 		public override IEnumerable<Item> Perform (IEnumerable<Item> items, IEnumerable<Item> modItems) {
 			
 			GConf.Client client = new GConf.Client ();

=== modified file 'SSH/src/SSHHostItem.cs'
--- SSH/src/SSHHostItem.cs	2009-06-22 04:05:16 +0000
+++ SSH/src/SSHHostItem.cs	2009-12-06 00:40:28 +0000
@@ -21,6 +21,7 @@
 using System;
 using System.IO;
 using System.Collections.Generic;
+using System.Diagnostics;
 
 using Do.Universe;
 
@@ -28,7 +29,7 @@
 
 namespace SSH {
 
-	public class SSHHostItem : Item {
+	public class SSHHostItem : Item, IOpenableItem {
 		
 		public SSHHostItem (string host)
 		{
@@ -37,9 +38,16 @@
 
 		public override string Name { get { return this.Host; } }
 		public override string Description { get { return AddinManager.CurrentLocalizer.GetString ("SSH Host"); } }
-		public override string Icon { get { return "gnome-globe"; } }
+		public override string Icon { get { return "network-server"; } }
 
 		public string Host { get; private set; }
+		
+		public void Open () {
+			
+			string exec = Util.FindFileManager ();
+			Process.Start (exec, "sftp://"+this.Host);
+			
+		}
 	}
 }
 

=== modified file 'SSH/src/SSHHostItemSource.cs'
--- SSH/src/SSHHostItemSource.cs	2009-07-02 18:44:25 +0000
+++ SSH/src/SSHHostItemSource.cs	2009-12-06 00:40:28 +0000
@@ -64,7 +64,7 @@
 			items.Clear ();
 			try {
 				string home = Environment.GetFolderPath (Environment.SpecialFolder.Personal);
-				string hostsFile = Path.Combine(home, ".ssh/config");
+				string hostsFile = Path.Combine (home, ".ssh/config");
 				
 				using (FileStream fs = new FileStream (hostsFile, FileMode.Open, FileAccess.Read)) {
 					Regex NameRegex = new Regex ("^\\s*Host\\s+(.+)\\s*$");
@@ -76,7 +76,7 @@
 							Match NameMatch = NameRegex.Match (s);
 							if (NameMatch.Groups.Count != 2) continue;
 							
-							string line = NameMatch.Groups[1].ToString();
+							string line = NameMatch.Groups[1].ToString ();
 							string[] hosts = line.Split(new string[] { " " }, StringSplitOptions.None);
 							foreach (string host in hosts)
 								items.Add (new SSHHostItem (host));

=== added file 'SSH/src/Util.cs'
--- SSH/src/Util.cs	1970-01-01 00:00:00 +0000
+++ SSH/src/Util.cs	2009-12-06 00:40:28 +0000
@@ -0,0 +1,43 @@
+/* Util.cs
+ *
+ * GNOME Do is the legal property of its developers. Please refer to the
+ * COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+using GConf;
+
+namespace SSH {
+	
+	public static class Util {
+		
+		public static string FindFileManager () {
+			
+			GConf.Client client = new GConf.Client ();
+			string exec = (string) client.Get ("/desktop/gnome/applications/component_viewer/exec");
+			
+			if (exec.Equals ("") == true) {
+				exec = "nautilus";
+			} else {
+				exec = exec.Replace ("%s", "");
+			}
+			return exec;
+			
+		}
+
+	}
+	
+}