move commands to separate classes, update README, fix config file path, update default config file

Author: Doka-NT

Application.py

@@ -14,13 +14,13 @@ def run(self):
         config = self.get_config(config_file_path)
         manager = self.get_manager(config)
 
-        window = ConnectionListWindow(manager, config.get_window())
+        window = ConnectionListWindow(manager, config.get_window(), config.get_ssh_command(), config.get_edit_command())
         window.show()
 
     @staticmethod
     def get_config_file_path() -> str:
         home = expanduser("~")
-        return home + sep + '_______sshManager.config.json'
+        return home + sep + '.sshManager.config.json'
 
     @staticmethod
     def get_manager(config: Config):

README.md

@@ -1,15 +1,15 @@
 # Ubuntu Desktop (GUI) ssh manager
-GUI ssh manager for Ubuntu 16.04 (not tested on below versions)
+GUI ssh manager for Linux (Ubuntu)
 
 ![alt tag](https://raw.githubusercontent.com/Doka-NT/ssh-manager/master/screenshot.png)
 # Requirements
-- PyQt4
+- python 3.5+
 
 # Run
 ```bash
-python app.py
+python3.5 app.py
 ```
 
 # Config
-config.json file will be created after first run.
-Edit it as you need.
+Application can be configured by json configuration file. 
+All connections defines in section connections, like provided examples.

resources/config-dist.json

@@ -3,10 +3,14 @@
     "ssh": [
       "gnome-terminal",
       "-x",
-      "ssh"
+      "ssh",
+      "$host",
+      "-p",
+      "$port"
     ],
     "edit": [
-      "xdg-open"
+      "xdg-open",
+      "$file"
     ]
   },
   "window": {

ssh_manager/CommandFactory.py

@@ -0,0 +1,21 @@
+from ssh_manager.config.Commands.AbtractCommand import AbstractCommand
+from ssh_manager.config.Commands.EditCommand import EditCommand
+from ssh_manager.config.Commands.SshCommand import SshCommand
+
+
+class CommandFactory:
+    def create_command(self, name: str, args: list) -> AbstractCommand:
+        command = None
+        if name == 'ssh':
+            command = self.create_ssh_command(args)
+        elif name == 'edit':
+            command = self.create_edit_command(args)
+        return command
+
+    @staticmethod
+    def create_ssh_command(args: list) -> AbstractCommand:
+        return SshCommand(args)
+
+    @staticmethod
+    def create_edit_command(args: list) -> AbstractCommand:
+        return EditCommand(args)

ssh_manager/Connection.py

@@ -3,8 +3,10 @@ class Connection:
     label = ''
     host = ''
     port = 0
+    args = []
 
-    def __init__(self, label: str, host: str, port: int):
+    def __init__(self, label: str, host: str, port: int, args: list):
         self.label = label
         self.host = host
         self.port = port
+        self.args = args

ssh_manager/JsonConfigParser.py

@@ -14,6 +14,7 @@ def parse(self, file: ConfigurationFile) -> Config:
 
         self._parse_connections(json_object, config)
         self._parse_window(json_object, config)
+        self._parse_commands(json_object, config)
 
         return config
 
@@ -23,11 +24,23 @@ def _parse_connections(json_object: dict, config: Config):
         for _connection in json_object['connections']:
             if 'port' not in _connection:
                 _connection['port'] = Connection.DEFAULT_PORT
-            connection = Connection(_connection['label'], _connection['host'], _connection['port'])
+            if 'args' not in _connection:
+                _connection['args'] = []
+            connection = Connection(
+                _connection['label'],
+                _connection['host'],
+                _connection['port'],
+                _connection['args']
+            )
             config.add_connection(connection)
 
     @staticmethod
     def _parse_window(json_object: dict, config: Config):
         _window = json_object['window']
         window = Window(_window['x'], _window['y'], _window['width'], _window['height'])
         config.set_window(window)
+
+    def _parse_commands(self, json_object: dict, config: Config):
+        for name, args in json_object['command'].items():
+            command = self._command_factory.create_command(name, args)
+            config.add_command(name, command)

ssh_manager/config/Command.py

@@ -0,0 +1,11 @@
+from ssh_manager.config.Commands.AbtractCommand import AbstractCommand
+
+
+class Command:
+    _commands = {}
+
+    def add_command(self, name: str, handler: AbstractCommand):
+        self._commands[name] = handler
+
+    def get_command(self, name: str) -> AbstractCommand:
+        return self._commands[name]

ssh_manager/config/Commands/AbtractCommand.py

@@ -0,0 +1,8 @@
+class AbstractCommand:
+    _args = []
+
+    def __init__(self, args: list):
+        self._args = args
+
+    def run(self, *args):
+        pass

ssh_manager/config/Commands/EditCommand.py

@@ -0,0 +1,12 @@
+from os import system
+
+from ssh_manager.config.Commands.AbtractCommand import AbstractCommand
+
+
+class EditCommand(AbstractCommand):
+    def run(self, *args):
+        super().run(*args)
+        cmd = self._args
+        file = args[0]
+        command = " ".join(cmd).replace("$file", file)
+        system(command)

ssh_manager/config/Commands/SshCommand.py

@@ -0,0 +1,14 @@
+from os import system
+
+from ssh_manager.Connection import Connection
+from ssh_manager.config.Commands.AbtractCommand import AbstractCommand
+
+
+class SshCommand(AbstractCommand):
+    def run(self, *args):
+        super().run(*args)
+        connection = args[0]  # type: Connection
+        command_args = args[1]  # type: list
+        cmd = self._args + command_args
+        command = " ".join(cmd).replace("$host", connection.host).replace("$port", str(connection.port))
+        system(command)

ssh_manager/config/Commands/__init__.py

@@ -1,10 +1,14 @@
 from ssh_manager.Connection import Connection
+from ssh_manager.config.Commands.AbtractCommand import AbstractCommand
+from ssh_manager.config.Commands.EditCommand import EditCommand
+from ssh_manager.config.Commands.SshCommand import SshCommand
 from ssh_manager.config.Window import Window
 
 
 class Config:
     _connections = []
     _window = None
+    _commands = {}
 
     def add_connection(self, connection: Connection):
         self._connections.append(connection)
@@ -20,3 +24,12 @@ def get_window(self) -> Window:
 
     def set_connections(self, connections):
         self._connections = connections
+
+    def add_command(self, name: str, command: AbstractCommand):
+        self._commands[name] = command
+
+    def get_ssh_command(self) -> SshCommand:
+        return self._commands['ssh']
+
+    def get_edit_command(self) -> EditCommand:
+        return self._commands['edit']

ssh_manager/config/Config.py

@@ -1,10 +1,15 @@
 from abc import abstractmethod, ABCMeta
 
 from ssh_manager import ConfigurationFile
+from ssh_manager.CommandFactory import CommandFactory
 
 
 class AbstractConfigParser:
     __metaclass__ = ABCMeta
+    _command_factory = None
+
+    def __init__(self):
+        self._command_factory = CommandFactory()
 
     @abstractmethod
     def parse(self, file: ConfigurationFile):

ssh_manager/interfaces/AbstractConfigParser.py

@@ -1,7 +1,7 @@
-from os import system
-
 from gi import require_version
 
+from ssh_manager.config.Commands.AbtractCommand import AbstractCommand
+
 require_version('Gdk', '3.0')
 require_version('Gtk', '3.0')
 
@@ -15,12 +15,23 @@
 class ConnectionListWindow:
     VERTICAL_MARGIN = 5
     HORIZONTAL_MARGIN = 2
+
+    __command_ssh = None
+    __command_edit = None
+
     _listbox = None
     _frame = None
     _scrollable = None
     _list_store = Gtk.ListStore(str)
 
-    def __init__(self, manager: Manager, window_config: Window):
+    def __init__(
+            self, manager: Manager,
+            window_config: Window,
+            command_ssh: AbstractCommand,
+            command_edit: AbstractCommand
+    ):
+        self.__command_ssh = command_ssh
+        self.__command_edit = command_edit
         self._manager = manager
         self._window_config = window_config
 
@@ -71,9 +82,8 @@ def show(self):
         Gtk.main()
 
     # noinspection PyUnusedLocal
-    @staticmethod
-    def btn_settings_click(target):
-        system("xdg-open " + Application.Application.get_config_file_path())
+    def btn_settings_click(self, target):
+        self.__command_edit.run(Application.Application.get_config_file_path())
 
     # noinspection PyUnusedLocal
     def btn_reload_click(self, target):
@@ -97,4 +107,4 @@ def _fill_listbox(self):
     def row_activated(self, target: Gtk.TreeView, path: Gtk.TreePath, column: Gtk.TreeViewColumn):
         i = path.get_indices()[0]
         connection = self._manager.get_connection(i)
-        system("gnome-terminal -x ssh {} -p {}".format(connection.host, connection.port))
+        self.__command_ssh.run(connection, connection.args)