emre · denzuko · Dec 26, 2017 · Dec 26, 2017 · Dec 26, 2017 · Dec 26, 2017
diff --git a/Vagrantfile b/Vagrantfile
diff --git a/contrib/archlinux/PKGBUILD b/contrib/archlinux/PKGBUILD
diff --git a/contrib/bash-completion/README.md b/contrib/bash-completion/README.md
diff --git a/contrib/bash-completion/stormssh b/contrib/bash-completion/stormssh
diff --git a/contrib/suse/stormssh.spec b/contrib/suse/stormssh.spec
diff --git a/scripts/setup.sh b/scripts/setup.sh
diff --git a/storm/__init__.py b/storm/__init__.py
@@ -6,7 +6,7 @@
 import re
 from shutil import copyfile
 
-from .parsers.ssh_config_parser import ConfigParser
+from .parsers import ConfigParser
 from .defaults import get_default
 
 

diff --git a/storm/__main__.py b/storm/__main__.py
@@ -10,7 +10,7 @@
     import builtins
 
 from storm import Storm
-from storm.parsers.ssh_uri_parser import parse
+from storm.parsers import parse
 from storm.utils import (get_formatted_message, colored)
 from storm.kommandr import *
 from storm.defaults import get_default

diff --git a/storm/parsers/__init__.py b/storm/parsers/__init__.py
@@ -0,0 +1,10 @@
+from ssh_config_parser import StormConfig, ConfigParser
+from ssh_uri_parser import parse
+from storm_config_parser import get_storm_config
+
+__all__ = [
+  "StormConfig",
+  "ConfigParser",
+  "parse",
+  "get_storm_config"
+]
diff --git a/storm/static/js/main.js b/storm/static/js/main.js
@@ -12,7 +12,7 @@ function Storm($scope, $http) {
   }
 
   function fetch(callback) {
-    $http.get("/list").success(function (data) {
+    $http.get("/servers").success(function (data) {
       $scope.servers = data.map(function (host) {
         var port = host.options.port;
         var hostname = host.options.hostname;
@@ -59,7 +59,7 @@ function Storm($scope, $http) {
 
     if ($scope.state.editIndex > -1) {
       $scope.isDisabled = false;
-      $http.put('/edit', JSON.stringify({name: $scope.title, connection_uri: $scope.uri, id_file: $scope.id_file})).
+      $http.put('/servers/' + $scope.title, JSON.stringify({connection_uri: $scope.uri, id_file: $scope.id_file})).
         success(function(data, status) {
           if (status == 200) {
             $scope.servers[$scope.state.editIndex] = {
@@ -81,7 +81,7 @@ function Storm($scope, $http) {
         });
 
     } else {
-      $http.post('/add', JSON.stringify({name: $scope.title, connection_uri: $scope.uri, id_file: $scope.id_file})).
+      $http.post('/servers/'+$scope.title, JSON.stringify({connection_uri: $scope.uri, id_file: $scope.id_file})).
         success(function (data, status) {
           if (status == 201) {
             $scope.servers.push({
@@ -137,7 +137,7 @@ function Storm($scope, $http) {
   };
 
   $scope.delete = function (serverToDelete) {
-    $http.post("/delete", JSON.stringify({name: serverToDelete.host})).
+    $http.delete("/servers/" + serverToDelete.host).
       success(function () {
         fetch(function () {
           plural();

diff --git a/storm/web.py b/storm/web.py
@@ -5,7 +5,7 @@
                    send_from_directory)
 
 from storm import Storm, DELETED_SIGN
-from storm.parsers.ssh_uri_parser import parse
+from storm.parsers import parse
 
 
 app = Flask(__name__)
@@ -28,16 +28,17 @@ def response(resp=None, status=200, content_type='application/json'):
 
 
 @app.route('/')
+@app.route('/index')
 def index():
     return render('index.html', __THEME__)
 
-@app.route('/list', methods=['GET'])
+@app.route('/servers', methods=['GET'])
 def list_keys():
     storm_ = app.get_storm()
     return response(json.dumps(storm_.list_entries(True, only_servers=True)))
 
 
-@app.route('/add', methods=['POST'])
+@app.route('/servers', methods=['POST'])
 def add():
     storm_ = app.get_storm()
 
@@ -60,13 +61,17 @@ def add():
     except (KeyError, TypeError):
         return response(status=400)
 
+@app.route('/servers/<name>', methods=['GET'])
+def list_keys(name):
+    storm_ = app.get_storm()
+    return response(json.dumps(storm_.list_entries(True, only_servers=True).get(name)))
+
 
-@app.route('/edit', methods=['PUT'])
-def edit():
+@app.route('/servers/<name>', methods=['PUT','POST'])
+def edit(name):
     storm_ = app.get_storm()
 
     try:
-        name = request.json['name']
         connection_uri = request.json['connection_uri']
         id_file = None
         if 'id_file' in request.json:
@@ -82,13 +87,11 @@ def edit():
     except (KeyError, TypeError):
         return response(status=400)
 
-
-@app.route('/delete', methods=['POST'])
-def delete():
+@app.route('/servers/<name>', methods=['DELETE'])
+def delete(name):
     storm_ = app.get_storm()
 
     try:
-        name = request.json['name']
         storm_.delete_entry(name)
         return response()
     except ValueError as exc: