From c68d427fd1cb8fd82dd8b2ddfe6ade5298d91c89 Mon Sep 17 00:00:00 2001 From: Beginner <70857188+Beginner-Go@users.noreply.github.com> Date: Sun, 26 Dec 2021 01:24:35 +0800 Subject: [PATCH] aliyundrive-webdav: update to 1.1.0 (#8512) Co-authored-by: messense --- package/lean/aliyundrive-webdav/Makefile | 2 +- .../aliyundrive-webdav/files/aliyundrive-webdav.config | 1 + .../lean/aliyundrive-webdav/files/aliyundrive-webdav.init | 7 +++++++ package/lean/luci-app-aliyundrive-webdav/Makefile | 2 +- .../luasrc/model/cbi/aliyundrive-webdav/client.lua | 4 ++++ .../view/aliyundrive-webdav/aliyundrive-webdav_status.htm | 4 ++-- .../po/zh-cn/aliyundrive-webdav.po | 6 ++++++ 7 files changed, 22 insertions(+), 4 deletions(-) diff --git a/package/lean/aliyundrive-webdav/Makefile b/package/lean/aliyundrive-webdav/Makefile index c1ccb2231..c685d7ec1 100644 --- a/package/lean/aliyundrive-webdav/Makefile +++ b/package/lean/aliyundrive-webdav/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=aliyundrive-webdav -PKG_VERSION:=1.0.0 +PKG_VERSION:=1.1.0 PKG_RELEASE:=$(AUTORELESE) PKG_LICENSE:=MIT diff --git a/package/lean/aliyundrive-webdav/files/aliyundrive-webdav.config b/package/lean/aliyundrive-webdav/files/aliyundrive-webdav.config index 66a4ef1af..e5d041268 100644 --- a/package/lean/aliyundrive-webdav/files/aliyundrive-webdav.config +++ b/package/lean/aliyundrive-webdav/files/aliyundrive-webdav.config @@ -12,3 +12,4 @@ config server option root '/' option no_trash '0' option domain_id '' + option read_only '0' diff --git a/package/lean/aliyundrive-webdav/files/aliyundrive-webdav.init b/package/lean/aliyundrive-webdav/files/aliyundrive-webdav.init index f8faf91f9..b274edc26 100755 --- a/package/lean/aliyundrive-webdav/files/aliyundrive-webdav.init +++ b/package/lean/aliyundrive-webdav/files/aliyundrive-webdav.init @@ -38,6 +38,13 @@ start_service() { ;; *) ;; esac + + case "$(uci_get_by_type server read_only 0)" in + 1|on|true|yes|enabled) + extra_options="$extra_options --read-only" + ;; + *) ;; + esac fi procd_open_instance diff --git a/package/lean/luci-app-aliyundrive-webdav/Makefile b/package/lean/luci-app-aliyundrive-webdav/Makefile index 96de5a250..4dc2d234b 100644 --- a/package/lean/luci-app-aliyundrive-webdav/Makefile +++ b/package/lean/luci-app-aliyundrive-webdav/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-aliyundrive-webdav -PKG_VERSION:=1.0.0 +PKG_VERSION:=1.1.0 PKG_RELEASE:=1 PKG_LICENSE:=MIT diff --git a/package/lean/luci-app-aliyundrive-webdav/luasrc/model/cbi/aliyundrive-webdav/client.lua b/package/lean/luci-app-aliyundrive-webdav/luasrc/model/cbi/aliyundrive-webdav/client.lua index 7cdbf8842..ec6d324ea 100644 --- a/package/lean/luci-app-aliyundrive-webdav/luasrc/model/cbi/aliyundrive-webdav/client.lua +++ b/package/lean/luci-app-aliyundrive-webdav/luasrc/model/cbi/aliyundrive-webdav/client.lua @@ -47,6 +47,10 @@ cache_ttl.datatype = "uinteger" no_trash = e:option(Flag, "no_trash", translate("Delete file permanently instead of trashing")) no_trash.rmempty = false +read_only = e:option(Flag, "read_only", translate("Enable read only mode")) +read_only.description = translate("Disallow upload, modify and delete file operations") +read_only.rmempty = false + domain_id = e:option(Value, "domain_id", translate("Domain ID")) domain_id.description = translate("Input domain_id option will use Aliyun PDS instead of AliyunDrive") diff --git a/package/lean/luci-app-aliyundrive-webdav/luasrc/view/aliyundrive-webdav/aliyundrive-webdav_status.htm b/package/lean/luci-app-aliyundrive-webdav/luasrc/view/aliyundrive-webdav/aliyundrive-webdav_status.htm index 39bd7d421..cd52d7ba6 100644 --- a/package/lean/luci-app-aliyundrive-webdav/luasrc/view/aliyundrive-webdav/aliyundrive-webdav_status.htm +++ b/package/lean/luci-app-aliyundrive-webdav/luasrc/view/aliyundrive-webdav/aliyundrive-webdav_status.htm @@ -4,9 +4,9 @@ XHR.poll(3, '<%=url([[admin]], [[services]], [[aliyundrive-webdav]], [[status]]) var tb = document.getElementById('aliyundrive-webdav_status'); if (data && tb) { if (data.running) { - tb.innerHTML = '' + data.application + '<%:RUNNING%>'; + tb.innerHTML = '' + data.application + '<%:RUNNING%>'; } else { - tb.innerHTML = '' + data.application + '<%:NOT RUNNING%>'; + tb.innerHTML = '' + data.application + '<%:NOT RUNNING%>'; } } } diff --git a/package/lean/luci-app-aliyundrive-webdav/po/zh-cn/aliyundrive-webdav.po b/package/lean/luci-app-aliyundrive-webdav/po/zh-cn/aliyundrive-webdav.po index 09718aab1..84d8c5162 100644 --- a/package/lean/luci-app-aliyundrive-webdav/po/zh-cn/aliyundrive-webdav.po +++ b/package/lean/luci-app-aliyundrive-webdav/po/zh-cn/aliyundrive-webdav.po @@ -67,6 +67,12 @@ msgstr "限制只能访问该云盘目录,默认为 / 表示不限制,注意 msgid "Delete file permanently instead of trashing" msgstr "删除文件不放入回收站" +msgid "Enable read only mode" +msgstr "启用只读模式" + +msgid "Disallow upload, modify and delete file operations" +msgstr "禁止上传、修改和删除文件操作" + msgid "Domain ID" msgstr "阿里云相册与云盘服务 domainId"