From d38de2fa6bff34b737961fced6f86db15647237f Mon Sep 17 00:00:00 2001 From: ronggang Date: Wed, 16 Jan 2019 10:16:38 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20"=E7=A7=8D?= =?UTF-8?q?=E5=AD=90=E4=B8=8B=E8=BD=BD=E5=AE=8C=E6=88=90=E5=90=8E=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E8=84=9A=E6=9C=AC"=20=E5=8F=82=E6=95=B0=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit add "script-torrent-done-enabled" Configuration item --- src/tr-web-control/i18n/en.json | 3 ++- src/tr-web-control/i18n/zh_CN.json | 3 ++- src/tr-web-control/script/min/system.min.js | 2 +- src/tr-web-control/script/system.js | 2 +- .../template/dialog-system-config.html | 13 ++++++++++++- 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/tr-web-control/i18n/en.json b/src/tr-web-control/i18n/en.json index 249b243..757a77d 100644 --- a/src/tr-web-control/i18n/en.json +++ b/src/tr-web-control/i18n/en.json @@ -222,7 +222,8 @@ }, "import-config": "Import configuration from file", "export-config": "Export current configuration", - "import-config-confirm": "Do you want to import these configurations? This overrides the current configuration." + "import-config-confirm": "Do you want to import these configurations? This overrides the current configuration.", + "script-torrent-done-enabled": "Execute the following script when the torrent download is complete:" }, "public": { "button-ok": "OK", diff --git a/src/tr-web-control/i18n/zh_CN.json b/src/tr-web-control/i18n/zh_CN.json index 303b709..e894467 100644 --- a/src/tr-web-control/i18n/zh_CN.json +++ b/src/tr-web-control/i18n/zh_CN.json @@ -221,7 +221,8 @@ }, "import-config": "从备份文件中导入配置", "export-config": "导出当前配置到配置文件（内容包括：Transmission 参数、WebUI 配置）", - "import-config-confirm": "是否确认导入这些配置信息？这将覆盖当前配置。" + "import-config-confirm": "是否确认导入这些配置信息？这将覆盖当前配置。", + "script-torrent-done-enabled": "种子下载完成后执行以下脚本：" }, "public": { "button-ok": "确定", diff --git a/src/tr-web-control/script/min/system.min.js b/src/tr-web-control/script/min/system.min.js index 844ff55..a3c7d69 100644 --- a/src/tr-web-control/script/min/system.min.js +++ b/src/tr-web-control/script/min/system.min.js @@ -48,7 +48,7 @@ this.lang.toolbar.tip.recheck).click(function(){var a=system.control.torrentlist $(this))});this.panel.toolbar.find("#toolbar_remove").linkbutton({disabled:true}).attr("title",this.lang.toolbar.tip.remove).click(function(){var a=system.control.torrentlist.datagrid("getChecked"),b=[],c;for(c in a)b.push(a[c].id);b.length!=0&&system.openDialogFromTemplate({id:"dialog-torrent-remove-confirm",options:{title:system.lang.dialog["torrent-remove"].title,width:350,height:150},datas:{ids:b}})});this.panel.toolbar.find("#toolbar_rename").linkbutton({disabled:true}).click(function(){var a= system.control.torrentlist.datagrid("getChecked");a.length!=0&&system.openDialogFromTemplate({id:"dialog-torrent-rename",options:{title:system.lang.dialog["torrent-rename"].title,width:520,height:200,resizable:true},datas:{id:a[0].id}})});this.panel.toolbar.find("#toolbar_changeDownloadDir").linkbutton({disabled:true}).attr("title",this.lang.toolbar.tip["change-download-dir"]).click(function(){var a=system.control.torrentlist.datagrid("getChecked"),b=[],c;for(c in a)b.push(a[c].id);b.length!=0&&system.openDialogFromTemplate({id:"dialog-torrent-changeDownloadDir", options:{title:system.lang.dialog["torrent-changeDownloadDir"].title,width:520,height:200},datas:{ids:b}})});this.panel.toolbar.find("#toolbar_alt_speed").linkbutton().attr("title",this.lang.toolbar.tip["alt-speed"]).click(function(){var a=$(this),b=false;if(a.linkbutton("options").iconCls=="iconfont tr-icon-rocket")b=true;transmission.exec({method:"session-set",arguments:{"alt-speed-enabled":b}},function(c){if(c.result=="success"){system.serverConfig["alt-speed-enabled"]=b;a.linkbutton({iconCls:"iconfont tr-icon-"+ -(b?"woniu":"rocket")});b?$("#status_alt_speed").show():$("#status_alt_speed").hide()}});a.linkbutton({iconCls:"icon-loading"})});this.panel.toolbar.find("#toolbar_config").linkbutton().attr("title",this.lang.toolbar.tip["system-config"]).click(function(){system.openDialogFromTemplate({id:"dialog-system-config",options:{title:system.lang.toolbar["system-config"],width:680,height:450,resizable:true}})});this.panel.toolbar.find("#toolbar_reload").linkbutton().attr("title",this.lang.toolbar.tip["system-reload"]).click(function(){system.reloadData()}); +(b?"woniu":"rocket")});b?$("#status_alt_speed").show():$("#status_alt_speed").hide()}});a.linkbutton({iconCls:"icon-loading"})});this.panel.toolbar.find("#toolbar_config").linkbutton().attr("title",this.lang.toolbar.tip["system-config"]).click(function(){system.openDialogFromTemplate({id:"dialog-system-config",options:{title:system.lang.toolbar["system-config"],width:680,height:500,resizable:true}})});this.panel.toolbar.find("#toolbar_reload").linkbutton().attr("title",this.lang.toolbar.tip["system-reload"]).click(function(){system.reloadData()}); this.panel.toolbar.find("#toolbar_search").searchbox({searcher:function(a){system.searchTorrents(a)},prompt:this.lang.toolbar["search-prompt"]});this.panel.toolbar.find("#toolbar_copyPath").linkbutton().attr("title",this.lang.toolbar.tip["copy-path-to-clipboard"])},initStatusBar:function(){this.panel.statusbar.find("#status_title_downloadspeed").html(this.lang.statusbar.downloadspeed);this.panel.statusbar.find("#status_title_uploadspeed").html(this.lang.statusbar.uploadspeed)},connect:function(){this.showStatus(this.lang.system.status.connect, 0);transmission.on.torrentCountChange=function(){system.reloadTorrentBaseInfos()};transmission.on.postError=function(){};transmission.init({islocal:true},function(){system.reloadSession(true);system.getServerStatus()})},reloadSession:function(a){transmission.getSession(function(b){system.serverConfig=b;$("#status_version").html("Transmission "+system.lang.statusbar.version+b.version+", RPC: "+b["rpc-version"]+", WEB Control: "+system.version+"("+system.codeupdate+")");if(b["alt-speed-enabled"]==true){system.panel.toolbar.find("#toolbar_alt_speed").linkbutton({iconCls:"iconfont tr-icon-woniu"}); $("#status_alt_speed").show()}else{system.panel.toolbar.find("#toolbar_alt_speed").linkbutton({iconCls:"iconfont tr-icon-rocket"});$("#status_alt_speed").hide()}system.downloadDir=b["download-dir"];transmission.downloadDirs.length==0&&transmission.downloadDirs.push(system.downloadDir);parseInt(system.serverConfig["rpc-version"])>=15?transmission.getFreeSpace(system.downloadDir,function(c){system.serverConfig["download-dir-free-space"]=c.arguments["size-bytes"];system.showFreeSpace(c.arguments["size-bytes"])}): diff --git a/src/tr-web-control/script/system.js b/src/tr-web-control/script/system.js index e774e2d..8fdec58 100644 --- a/src/tr-web-control/script/system.js +++ b/src/tr-web-control/script/system.js @@ -1486,7 +1486,7 @@ var system = { options: { title: system.lang.toolbar["system-config"], width: 680, - height: 450, + height: 500, resizable: true } }); diff --git a/src/tr-web-control/template/dialog-system-config.html b/src/tr-web-control/template/dialog-system-config.html index 7db0293..c873a9b 100644 --- a/src/tr-web-control/template/dialog-system-config.html +++ b/src/tr-web-control/template/dialog-system-config.html @@ -34,6 +34,15 @@
+ + + + + + + +
+ @@ -435,7 +444,7 @@ var title = ("incomplete-dir-enabled,rename-partial-files,start-added-torrents,download-queue-enabled,seed-queue-enabled" + ",peer-port-random-on-start,speed-limit-down-enabled,speed-limit-up-enabled,alt-speed-enabled,idle-seeding-limit-enabled" + ",port-forwarding-enabled,utp-enabled,dht-enabled,lpd-enabled,pex-enabled,blocklist-enabled,seedRatioLimited,queue-stalled-enabled" + - ",alt-speed-time-enabled" + ",alt-speed-time-enabled,script-torrent-done-enabled" ).split(","); $.each(title, function (i, item) { thisDialog.find("#" + item).prop("checked", system.serverConfig[item]) @@ -498,6 +507,8 @@ thisDialog.find("#queue-stalled-minutes").val(system.serverConfig["queue-stalled-minutes"]).prop("disabled", !system.serverConfig["queue-stalled-enabled"]); thisDialog.find("#idle-seeding-limit").val(system.serverConfig["idle-seeding-limit"]).prop("disabled", !system.serverConfig["idle-seeding-limit-enabled"]); + thisDialog.find("#script-torrent-done-filename").val(system.serverConfig["script-torrent-done-filename"]).prop("disabled", !system.serverConfig["script-torrent-done-enabled"]); + var etype = system.lang.dialog["system-config"]["encryption-type"]; for (var key in etype) { $("