From 634f01c35c8065ff4b07951f4d0a0f5e33bf91f0 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Wed, 22 Jan 2020 21:35:11 +0800 Subject: [PATCH] luci-app-rclone: sync with upstream --- package/ctcgfw/luci-app-rclone/Makefile | 2 +- .../luasrc/controller/rclone.lua | 2 +- .../luasrc/model/cbi/rclone.lua | 24 +++++++++++++++++++ .../ctcgfw/luci-app-rclone/po/en/rclone.po | 16 +++++++++---- .../luci-app-rclone/po/templates/rclone.pot | 16 +++++++++---- .../ctcgfw/luci-app-rclone/po/zh-cn/rclone.po | 16 +++++++++---- .../luci-app-rclone/root/etc/init.d/rclone | 2 ++ 7 files changed, 64 insertions(+), 14 deletions(-) diff --git a/package/ctcgfw/luci-app-rclone/Makefile b/package/ctcgfw/luci-app-rclone/Makefile index 03a068bbad..7be074c9c0 100644 --- a/package/ctcgfw/luci-app-rclone/Makefile +++ b/package/ctcgfw/luci-app-rclone/Makefile @@ -13,7 +13,7 @@ LUCI_TITLE:=LuCI support for Rclone LUCI_DEPENDS:=+rclone +rclone-webui-react LUCI_PKGARCH:=all PKG_NAME:=luci-app-rclone -PKG_VERSION:=1.0.5 +PKG_VERSION:=1.0.7 PKG_RELEASE:=1 PKG_LICENSE:=GPLv3.0+ PKG_MAINTAINER:=ElonH diff --git a/package/ctcgfw/luci-app-rclone/luasrc/controller/rclone.lua b/package/ctcgfw/luci-app-rclone/luasrc/controller/rclone.lua index 6049fc12de..a18b204573 100644 --- a/package/ctcgfw/luci-app-rclone/luasrc/controller/rclone.lua +++ b/package/ctcgfw/luci-app-rclone/luasrc/controller/rclone.lua @@ -1,7 +1,7 @@ module("luci.controller.rclone", package.seeall) function index() - if not nixio.fs.access("/var/etc/config/rclone") then + if not nixio.fs.access("/etc/config/rclone") then return end entry({"admin", "services", "rclone"}, cbi("rclone"), _("Rclone"), 100 ).dependent = false diff --git a/package/ctcgfw/luci-app-rclone/luasrc/model/cbi/rclone.lua b/package/ctcgfw/luci-app-rclone/luasrc/model/cbi/rclone.lua index 256da61fd2..51e897389c 100644 --- a/package/ctcgfw/luci-app-rclone/luasrc/model/cbi/rclone.lua +++ b/package/ctcgfw/luci-app-rclone/luasrc/model/cbi/rclone.lua @@ -73,6 +73,30 @@ o.placeholder = '/var/etc/rclone/rclone.conf' o.default = '/var/etc/rclone/rclone.conf' o.rmempty = false +o = s:option(Button,"config_download",translate("download configuration")) +o.inputtitle = translate("download") +o.inputstyle = "apply" +o.write = function() + Download() +end + +function Download() + local t,e + t=nixio.open(uci.get('rclone', 'config', 'config_path'),"r") + luci.http.header('Content-Disposition','attachment; filename="rclone.conf"') + luci.http.prepare_content("application/octet-stream") + while true do + e=t:read(nixio.const.buffersize) + if(not e)or(#e==0)then + break + else + luci.http.write(e) + end + end + t:close() + luci.http.close() +end + o = s:option(Value, 'username', translate('username')) o.placeholder = 'admin' o.default = 'admin' diff --git a/package/ctcgfw/luci-app-rclone/po/en/rclone.po b/package/ctcgfw/luci-app-rclone/po/en/rclone.po index 92f2a617a9..a71070ee05 100644 --- a/package/ctcgfw/luci-app-rclone/po/en/rclone.po +++ b/package/ctcgfw/luci-app-rclone/po/en/rclone.po @@ -38,6 +38,14 @@ msgstr "all address" msgid "configure" msgstr "configure" +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:77 +msgid "download" +msgstr "download" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:76 +msgid "download configuration" +msgstr "download configuration" + #: luci-app-rclone/luasrc/model/cbi/rclone.lua:47 msgid "global" msgstr "global" @@ -58,15 +66,15 @@ msgstr "local network address" msgid "localhost address" msgstr "localhost address" -#: luci-app-rclone/luasrc/model/cbi/rclone.lua:87 +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:111 msgid "log" msgstr "log" -#: luci-app-rclone/luasrc/model/cbi/rclone.lua:81 +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:105 msgid "password" msgstr "password" -#: luci-app-rclone/luasrc/model/cbi/rclone.lua:91 +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:115 msgid "path" msgstr "path" @@ -94,7 +102,7 @@ msgstr "rclone state" msgid "run Rclone as daemon" msgstr "run Rclone as daemon" -#: luci-app-rclone/luasrc/model/cbi/rclone.lua:76 +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:100 msgid "username" msgstr "username" diff --git a/package/ctcgfw/luci-app-rclone/po/templates/rclone.pot b/package/ctcgfw/luci-app-rclone/po/templates/rclone.pot index 875e32bbd7..7258680663 100644 --- a/package/ctcgfw/luci-app-rclone/po/templates/rclone.pot +++ b/package/ctcgfw/luci-app-rclone/po/templates/rclone.pot @@ -28,6 +28,14 @@ msgstr "" msgid "configure" msgstr "" +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:77 +msgid "download" +msgstr "" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:76 +msgid "download configuration" +msgstr "" + #: luci-app-rclone/luasrc/model/cbi/rclone.lua:47 msgid "global" msgstr "" @@ -48,15 +56,15 @@ msgstr "" msgid "localhost address" msgstr "" -#: luci-app-rclone/luasrc/model/cbi/rclone.lua:87 +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:111 msgid "log" msgstr "" -#: luci-app-rclone/luasrc/model/cbi/rclone.lua:81 +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:105 msgid "password" msgstr "" -#: luci-app-rclone/luasrc/model/cbi/rclone.lua:91 +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:115 msgid "path" msgstr "" @@ -84,6 +92,6 @@ msgstr "" msgid "run Rclone as daemon" msgstr "" -#: luci-app-rclone/luasrc/model/cbi/rclone.lua:76 +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:100 msgid "username" msgstr "" diff --git a/package/ctcgfw/luci-app-rclone/po/zh-cn/rclone.po b/package/ctcgfw/luci-app-rclone/po/zh-cn/rclone.po index 5948311d82..0d673325cc 100644 --- a/package/ctcgfw/luci-app-rclone/po/zh-cn/rclone.po +++ b/package/ctcgfw/luci-app-rclone/po/zh-cn/rclone.po @@ -39,6 +39,14 @@ msgstr "全部地址" msgid "configure" msgstr "配置" +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:77 +msgid "download" +msgstr "下载" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:76 +msgid "download configuration" +msgstr "下载配置文件" + #: luci-app-rclone/luasrc/model/cbi/rclone.lua:47 msgid "global" msgstr "全局" @@ -59,15 +67,15 @@ msgstr "局域网地址" msgid "localhost address" msgstr "本机地址" -#: luci-app-rclone/luasrc/model/cbi/rclone.lua:87 +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:111 msgid "log" msgstr "日志" -#: luci-app-rclone/luasrc/model/cbi/rclone.lua:81 +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:105 msgid "password" msgstr "密码" -#: luci-app-rclone/luasrc/model/cbi/rclone.lua:91 +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:115 msgid "path" msgstr "路径" @@ -95,7 +103,7 @@ msgstr "rclone 状态" msgid "run Rclone as daemon" msgstr "启动 rclone 后台服务" -#: luci-app-rclone/luasrc/model/cbi/rclone.lua:76 +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:100 msgid "username" msgstr "用户名" diff --git a/package/ctcgfw/luci-app-rclone/root/etc/init.d/rclone b/package/ctcgfw/luci-app-rclone/root/etc/init.d/rclone index 13372500b7..17dc34b2fd 100755 --- a/package/ctcgfw/luci-app-rclone/root/etc/init.d/rclone +++ b/package/ctcgfw/luci-app-rclone/root/etc/init.d/rclone @@ -30,6 +30,8 @@ init_config() { config_dir=${config_path%/*} [ -d $config_dir ] || mkdir -p $config_dir + [ -f $config_path ] || touch $config_path + log_dir=${log_path%/*} [ -d $log_dir ] || mkdir -p $log_dir && echo /dev/null > $log_path