Added terminal support and up to Gnome 3.24 (dev) compatibility

connmgr.py

@@ -36,17 +36,20 @@
 import re
 import sys
 
-VERSION = '0.8.3'
+VERSION = '0.8.5'
 
-supportedTerms = ["Gnome Terminal", "Terminator", "Guake", "TMux", "urxvt", "urxvt256c", "LilyTerm"]
-supportedTermsCmd = ["gnome-terminal", "terminator", "guake", "tmux", "urxvt", "urxvt256c", "lilyterm"]
-supportedTermsSite = ["http://library.gnome.org/users/gnome-terminal/stable/", 
-                      "http://www.tenshu.net/p/terminator.html", 
-                      "http://guake.org/", 
+supportedTerms = ["Gnome Terminal", "Terminator", "Guake", "TMux", "urxvt", "urxvt256c", "LilyTerm", "Mate Terminal", "XFCE Terminal", "Terminix"]
+supportedTermsCmd = ["gnome-terminal", "terminator", "guake", "tmux", "urxvt", "urxvt256c", "lilyterm", "mate-terminal", "xfce4-terminal", "terminix"]
+supportedTermsSite = ["http://library.gnome.org/users/gnome-terminal/stable/",
+                      "http://www.tenshu.net/p/terminator.html",
+                      "http://guake.org/",
                       "http://tmux.sourceforge.net/",
                       "http://software.schmorp.de/pkg/rxvt-unicode.html",
                       "http://software.schmorp.de/pkg/rxvt-unicode.html",
-                      "http://lilyterm.luna.com.tw/index.html"
+                      "http://lilyterm.luna.com.tw/index.html",
+                      "http://www.mate-desktop.org",
+                      "http://www.xfce.org/",
+                      "https://github.com/gnunn1/terminix"
                       ]
 
 
@@ -625,28 +628,14 @@ def a_host(line):
         lines = [line.strip() for line in file(SSH_CONFIG_FILE)]
         comments_removed = [remove_comment(line) for line in lines]
         blanks_removed = [line for line in comments_removed if line]
+        non_hosts_removed = [line for line in blanks_removed if a_host(line)]
 
-        block = itertools.groupby(blanks_removed, not_a_host)
-
-        first_block = False
-        for key, group in block:
-            Info = dict([line.split(None, 1) for line in group])
-
-            if (not key):
-                if (not first_block):
-                                        first_block = True
-                importedHost = Info['Host']
-            if (key and first_block):
-                if 'HostName' in Info:
-                                        importedHostname = Info['HostName']
-                if 'User' in Info:
-                                        importedHostname = Info['User']+'@'+importedHostname
-                if 'Port' in Info:
-                                        importedHostname = '-p '+Info['Port']+' '+importedHostname
-
+        for line in non_hosts_removed:
+            importedHosts = line.split(None)[1:]
+            for importedHost in importedHosts:
                 if importedHost != '*':
                     treestore.append(import_iter, ['__item__',
-                        importedHost, importedHostname, 'Unnamed', 'ssh'])
+                        importedHost, importedHost, 'Unnamed', 'ssh'])
 
     def is_folder(self, iter):
         if self.treestore.get_value(iter, 0) == '__folder__':

extension.js

@@ -74,11 +74,14 @@ const ConnectionManager = new Lang.Class({
         this._searchProvider = new Search.SshSearchProvider('CONNECTION MANAGER');
 
         if( typeof Main.overview.viewSelector === "object" &&
-            typeof Main.overview.viewSelector._searchResults === "object" &&
-            typeof Main.overview.viewSelector._searchResults._searchSystem === "object" &&
-            typeof Main.overview.viewSelector._searchResults._searchSystem.addProvider === "function") {
+            typeof Main.overview.viewSelector._searchResults === "object") {
+            if(typeof Main.overview.viewSelector._searchResults._registerProvider === "function") { //3.14
+                Main.overview.viewSelector._searchResults._registerProvider(this._searchProvider);
+            } else if(typeof Main.overview.viewSelector._searchResults._searchSystem === "object" &&
+                      typeof Main.overview.viewSelector._searchResults._searchSystem.addProvider === "function") { //3.12
                 Main.overview.viewSelector._searchResults._searchSystem.addProvider(this._searchProvider);
-        }    
+            }
+        }
 
         this._readConf();
     },
@@ -300,7 +303,7 @@ const ConnectionManager = new Lang.Class({
                         mycommand += commandTab[c]+' ';
                     }
 
-                    Util.spawnCommandLine(' sh -c '+(sshparamsTab[0]+' '+term+' '+mycommand).quote()+' &');
+                    Util.spawnCommandLine(' sh -c '+JSON.stringify(sshparamsTab[0]+' '+term+' '+mycommand)+' &');
                 });
             }
 
@@ -328,6 +331,11 @@ function enable() {
 }
 
 function disable() {
+    if(cm._searchProvider!=null) {
+        Main.overview.removeSearchProvider(cm._searchProvider);
+        cm._searchProvider = null;
+    }
+
     cm.monitor.cancel();
     cm.destroy();
 }

metadata.json

@@ -1,6 +1,15 @@
 {
-    "shell-version": ["3.12"],
-    "version": "0.8.3",
+    "shell-version": [
+      "3.12",
+      "3.14",
+      "3.16",
+      "3.18",
+      "3.20",
+      "3.22",
+      "3.24",
+      "3.26"
+    ],
+    "version": "0.8.5",
     "uuid": "connectionmanager2@ciancio.net",
     "name": "Connection Manager",
     "description": "Simple GUI app for Gnome 3 that provides a menu for initiating SSH/Telnet/Custom Apps connections.",

search.js

@@ -54,7 +54,8 @@ const SshSearchProvider = new Lang.Class({
             for (var j=0; j<terms.length; j++) {
                 let pattern = new RegExp(terms[j],"gi");
                 if (this.sshNames[i].name.match(pattern)) {
-                    searching.push(i);
+                    // +1 because id 0 breaks search results
+                    searching.push(i+1);
                 }
             }
         }
@@ -73,7 +74,7 @@ const SshSearchProvider = new Lang.Class({
         let app = null;
 
         for (let i=0; i<resultIds.length; i++) {
-            let result = this.sshNames[resultIds[i]]
+            let result = this.sshNames[resultIds[i]-1]
             let appSys = Shell.AppSystem.get_default();
             let app = null;
 
@@ -98,7 +99,7 @@ const SshSearchProvider = new Lang.Class({
                     else
                         icon = new St.Icon({ gicon: Gio.icon_new_for_string('emblem-cm-symbolic'),
                                              icon_size: size });
-                    
+
                     return icon;
                 }
             })
@@ -108,6 +109,6 @@ const SshSearchProvider = new Lang.Class({
     },
 
     activateResult: function(id) {
-        Util.spawnCommandLine(this.sshNames[id].command);
+        Util.spawnCommandLine(this.sshNames[id-1].command);
     },
 });