From 2d8602fd872dacaf08ff977f4868f2c219e324da Mon Sep 17 00:00:00 2001
From: Beginner <70857188+Beginner-Go@users.noreply.github.com>
Date: Thu, 11 Nov 2021 09:26:25 +0800
Subject: [PATCH] luci-app-go-aliyundrive-webdav: sync upstream (#8228)

---
 .../controller/go-aliyundrive-webdav.lua      | 21 ++++++++++++++++---
 .../model/cbi/go-aliyundrive-webdav/log.lua   | 11 +++++++---
 .../go-aliyundrive-webdav_log.htm             | 15 +++++++++++++
 .../po/zh-cn/go-aliyundrive-webdav.po         |  3 ---
 4 files changed, 41 insertions(+), 9 deletions(-)
 create mode 100644 package/lean/luci-app-go-aliyundrive-webdav/luasrc/view/go-aliyundrive-webdav/go-aliyundrive-webdav_log.htm

diff --git a/package/lean/luci-app-go-aliyundrive-webdav/luasrc/controller/go-aliyundrive-webdav.lua b/package/lean/luci-app-go-aliyundrive-webdav/luasrc/controller/go-aliyundrive-webdav.lua
index 2fd254361..8c62e441e 100644
--- a/package/lean/luci-app-go-aliyundrive-webdav/luasrc/controller/go-aliyundrive-webdav.lua
+++ b/package/lean/luci-app-go-aliyundrive-webdav/luasrc/controller/go-aliyundrive-webdav.lua
@@ -7,11 +7,12 @@ function index()
 	if not nixio.fs.access("/etc/config/go-aliyundrive-webdav") then
 		return
 	end
-	entry({"admin", "services", "go-aliyundrive-webdav"}, alias("admin", "services", "go-aliyundrive-webdav", "client"),_("Go AliyunDrive WebDAV"), 10).dependent = true  -- 首页
-	entry({"admin", "services", "go-aliyundrive-webdav", "client"}, cbi("go-aliyundrive-webdav/client"),_("Settings"), 1).leaf = true  -- 客户端配置
-	entry({"admin", "services", "go-aliyundrive-webdav", "log"}, cbi("go-aliyundrive-webdav/log"),_("Log"), 2).leaf = true  -- 日志页面
+	entry({"admin", "services", "go-aliyundrive-webdav"}, alias("admin", "services", "go-aliyundrive-webdav", "client"), _("Go AliyunDrive WebDAV"), 10).dependent = true  -- 首页
+	entry({"admin", "services", "go-aliyundrive-webdav", "client"}, cbi("go-aliyundrive-webdav/client"), _("Settings"), 1).leaf = true  -- 客户端配置
+	entry({"admin", "services", "go-aliyundrive-webdav", "log"}, cbi("go-aliyundrive-webdav/log"), _("Log"), 2).leaf = true -- 日志页面
 
 	entry({"admin", "services", "go-aliyundrive-webdav", "status"}, call("action_status")).leaf = true
+	entry({"admin", "services", "go-aliyundrive-webdav", "logtail"}, call("action_logtail")).leaf = true
 
 end
 
@@ -21,3 +22,17 @@ function action_status()
 	luci.http.prepare_content("application/json")
 	luci.http.write_json(e)
 end
+
+function action_logtail()
+	local fs = require "nixio.fs"
+	local log_path = "/var/log/go-aliyundrive-webdav.log"
+	local e = {}
+	e.running = luci.sys.call("pidof go-aliyundrive-webdav >/dev/null") == 0
+	if fs.access(log_path) then
+		e.log = luci.sys.exec("tail -n 100 %s | sed 's/\\x1b\\[[0-9;]*m//g'" % log_path)
+	else
+		e.log = ""
+	end
+	luci.http.prepare_content("application/json")
+	luci.http.write_json(e)
+end
diff --git a/package/lean/luci-app-go-aliyundrive-webdav/luasrc/model/cbi/go-aliyundrive-webdav/log.lua b/package/lean/luci-app-go-aliyundrive-webdav/luasrc/model/cbi/go-aliyundrive-webdav/log.lua
index 157a9946c..4a8959db3 100644
--- a/package/lean/luci-app-go-aliyundrive-webdav/luasrc/model/cbi/go-aliyundrive-webdav/log.lua
+++ b/package/lean/luci-app-go-aliyundrive-webdav/luasrc/model/cbi/go-aliyundrive-webdav/log.lua
@@ -1,4 +1,9 @@
-m = Map("log")
-m.title = translate("Detailed Log (In Development)")
+log = SimpleForm("logview")
+log.submit = false
+log.reset = false
 
-return m
+t = log:field(DummyValue, '', '')
+t.rawhtml = true
+t.template = 'go-aliyundrive-webdav/go-aliyundrive-webdav_log'
+
+return log
diff --git a/package/lean/luci-app-go-aliyundrive-webdav/luasrc/view/go-aliyundrive-webdav/go-aliyundrive-webdav_log.htm b/package/lean/luci-app-go-aliyundrive-webdav/luasrc/view/go-aliyundrive-webdav/go-aliyundrive-webdav_log.htm
new file mode 100644
index 000000000..e7b49f2dc
--- /dev/null
+++ b/package/lean/luci-app-go-aliyundrive-webdav/luasrc/view/go-aliyundrive-webdav/go-aliyundrive-webdav_log.htm
@@ -0,0 +1,15 @@
+<%+cbi/valueheader%>
+<textarea id="logview" class="cbi-input-textarea" style="width: 100%" rows="30" readonly="readonly"></textarea>
+
+<script type="text/javascript">
+	const LOG_URL = '<%=luci.dispatcher.build_url("admin", "services", "go-aliyundrive-webdav", "logtail")%>';
+	XHR.poll(1, LOG_URL, null, (x, d) => {
+		let logview = document.getElementById("logview");
+		if (!d.running) {
+			XHR.halt();
+		}
+		logview.value = d.log;
+		logview.scrollTop = logview.scrollHeight;
+	});
+</script>
+<%+cbi/valuefooter%>
diff --git a/package/lean/luci-app-go-aliyundrive-webdav/po/zh-cn/go-aliyundrive-webdav.po b/package/lean/luci-app-go-aliyundrive-webdav/po/zh-cn/go-aliyundrive-webdav.po
index 425610c38..a27a9edad 100644
--- a/package/lean/luci-app-go-aliyundrive-webdav/po/zh-cn/go-aliyundrive-webdav.po
+++ b/package/lean/luci-app-go-aliyundrive-webdav/po/zh-cn/go-aliyundrive-webdav.po
@@ -43,9 +43,6 @@ msgstr "设置"
 msgid "Log"
 msgstr "日志"
 
-msgid "Detailed Log (In Development)"
-msgstr "详细日志（开发中）"
-
 msgid "Enable detailed logging"
 msgstr "启用详细日志记录"