Merge lp:~develop7/synapse-project/ssh-plugin-proper-wildcards-and-dupes-handling into lp:synapse-project

[Andrei Dziahel]

This implements skipping of wildcard hosts (i.e. lines like "Host ?ubuntu.*") and dealing with host dupes by replacing ArrayList with HashMap.

[Andrei Dziahel (develop7)]

Any comments/suggestions?

[Alberto Aldegheri (albyrock87)]

 it is ok to me! but me and mhr3 are really busy with our jobs, so for the moment synapse development is suspended.
 I'm really sorry.

 I'll try to merge your patch asap.

review: Approve

[Andrei Dziahel (develop7)]

> I'm really sorry.
Oh, no need really.
> I'll try to merge your patch asap.
Thanks!

=== modified file 'src/plugins/ssh-plugin.vala'
--- src/plugins/ssh-plugin.vala	2011-09-26 11:20:02 +0000
+++ src/plugins/ssh-plugin.vala	2012-12-06 15:52:28 +0000
@@ -26,7 +26,7 @@
   public class SshPlugin: Object, Activatable, ItemProvider
   {
     public  bool      enabled { get; set; default = true; }
-    private ArrayList<SshHost> hosts;
+    private HashMap<string, SshHost> hosts;
     
     protected File config_file;
     protected FileMonitor monitor;
@@ -38,7 +38,7 @@
     
     construct
     {
-      hosts = new ArrayList<SshHost> ();
+      hosts = new HashMap<string, SshHost> ();
     }
 
     public void activate ()
@@ -102,11 +102,10 @@
             foreach (var host in line.split (" "))
             {
               string host_stripped = host.strip ();
-              if (host_stripped != ""/* && host_stripped.index_of ("*") == -1*/)
+              if (host_stripped != "" && host_stripped.index_of ("*") == -1 && host_stripped.index_of ("?") == -1)
               {
-                // TODO: no dupes
                 Utils.Logger.debug (this, "host added: %s\n", host_stripped);
-                hosts.add (new SshHost (host_stripped));
+                hosts.set (host_stripped, new SshHost (host_stripped));
               }
             }
           }
@@ -148,7 +147,7 @@
       var matchers = Query.get_matchers_for_query (q.query_string, 0,
         RegexCompileFlags.OPTIMIZE | RegexCompileFlags.CASELESS);
 
-      foreach (var host in hosts)
+      foreach (var host in hosts.values) //workaround for missing HashMap.iterator() method
       {
         foreach (var matcher in matchers)
         {
@@ -198,8 +197,7 @@
           description: _("Connect with SSH"),
           has_thumbnail: false,
           icon_name: "terminal",
-          // FIXME: handle wildcard hosts somehow better than now
-          host_query: host_name.replace ("?", " ").replace ("*", "").strip ()
+          host_query: host_name
         );
         
       }