command api supports parsing parameters from query string

mayswind · Oct 14, 2017 · 1874017 · 1874017
1 parent 6ea534e
commit 1874017
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/scripts/controllers/command.js b/src/scripts/controllers/command.js
@@ -80,17 +80,19 @@
         };
 
         var doCommand = function (path, params) {
-            if (path.indexOf('/new/') === 0) {
+            if (path.indexOf('/new') === 0) {
                 return doNewTaskCommand(params.url);
-            } else if (path.indexOf('/settings/rpc/set/') === 0) {
+            } else if (path.indexOf('/settings/rpc/set') === 0) {
                 return doSetRpcCommand(params.protocol, params.host, params.port, params.interface, params.secret);
             } else {
                 ariaNgCommonService.showError('Parameter is invalid!');
                 return false;
             }
         };
 
-        if (!doCommand(path, $routeParams)) {
+        var allParameters = angular.extend({}, $routeParams, $location.search());
+
+        if (!doCommand(path, allParameters)) {
             $location.path('/downloading');
         }
     }]);

diff --git a/src/scripts/core/router.js b/src/scripts/core/router.js
@@ -67,6 +67,10 @@
                 templateUrl: 'views/settings-aria2.html',
                 controller: 'Aria2SettingsController'
             })
+            .when('/settings/rpc/set', {
+                template: '',
+                controller: 'CommandController'
+            })
             .when('/settings/rpc/set/:protocol/:host/:port/:interface/:secret?', {
                 template: '',
                 controller: 'CommandController'