From 2e18f5802baca231503e77cea1bd661a6804aa57 Mon Sep 17 00:00:00 2001 From: MaysWind Date: Sat, 31 Dec 2016 23:02:05 +0800 Subject: [PATCH] support set rpc interface path --- src/langs/zh_CN.txt | 1 + src/scripts/config/constants.js | 1 + src/scripts/config/defaultLanguage.js | 1 + src/scripts/services/ariaNgSettingService.js | 6 +++++- src/views/settings-ariang.html | 12 +++++++++++- 5 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/langs/zh_CN.txt b/src/langs/zh_CN.txt index 802ea9c..3ebfb6f 100644 --- a/src/langs/zh_CN.txt +++ b/src/langs/zh_CN.txt @@ -126,6 +126,7 @@ Page Title Refresh Interval=页面标题刷新间隔 Enable Browser Notification=启用浏览器通知 Aria2 RPC Host=Aria2 RPC 主机 Aria2 RPC Port=Aria2 RPC 端口 +Aria2 RPC Interface=Aria2 RPC 接口 Aria2 RPC Protocol=Aria2 RPC 协议 Aria2 RPC Http Request Method=Aria2 RPC Http 请求方法 POST method only supports aria2 v1.15.2 and above.=POST 方法仅支持 aria2 v1.15.2 及以上. diff --git a/src/scripts/config/constants.js b/src/scripts/config/constants.js index 8bfdb0d..155fdc2 100644 --- a/src/scripts/config/constants.js +++ b/src/scripts/config/constants.js @@ -22,6 +22,7 @@ browserNotification: false, rpcHost: '', rpcPort: '6800', + rpcInterface: 'jsonrpc', protocol: 'http', httpMethod: 'POST', secret: '', diff --git a/src/scripts/config/defaultLanguage.js b/src/scripts/config/defaultLanguage.js index 052000c..a11ded7 100644 --- a/src/scripts/config/defaultLanguage.js +++ b/src/scripts/config/defaultLanguage.js @@ -130,6 +130,7 @@ 'Enable Browser Notification': 'Enable Browser Notification', 'Aria2 RPC Host': 'Aria2 RPC Host', 'Aria2 RPC Port': 'Aria2 RPC Port', + 'Aria2 RPC Interface': 'Aria2 RPC Interface', 'Aria2 RPC Protocol': 'Aria2 RPC Protocol', 'Aria2 RPC Http Request Method': 'Aria2 RPC Http Request Method', 'POST method only supports aria2 v1.15.2 and above.': 'POST method only supports aria2 v1.15.2 and above.', diff --git a/src/scripts/services/ariaNgSettingService.js b/src/scripts/services/ariaNgSettingService.js index 7a28493..8f81896 100644 --- a/src/scripts/services/ariaNgSettingService.js +++ b/src/scripts/services/ariaNgSettingService.js @@ -163,12 +163,13 @@ var protocol = getOption('protocol'); var rpcHost = getOption('rpcHost'); var rpcPort = getOption('rpcPort'); + var rpcInterface = getOption('rpcInterface'); if (!rpcHost) { rpcHost = getDefaultRpcHost(); } - return protocol + '://' + rpcHost + ':' + rpcPort + '/jsonrpc'; + return protocol + '://' + rpcHost + ':' + rpcPort + '/' + rpcInterface; }, setRpcHost: function (value) { setOption('rpcHost', value); @@ -176,6 +177,9 @@ setRpcPort: function (value) { setOption('rpcPort', Math.max(parseInt(value), 0)); }, + setRpcInterface: function (value) { + setOption('rpcInterface', value); + }, getProtocol: function () { return getOption('protocol'); }, diff --git a/src/views/settings-ariang.html b/src/views/settings-ariang.html index 046a129..c4ff37d 100644 --- a/src/views/settings-ariang.html +++ b/src/views/settings-ariang.html @@ -117,7 +117,7 @@ : / - jsonrpc + @@ -131,6 +131,16 @@ ng-change="settingService.setRpcPort(context.settings.rpcPort)"/> +
+
+ Aria2 RPC Interface + * +
+
+ +
+
Aria2 RPC Protocol