From 20a36131611e909f2e47b33ed5873172cca496b6 Mon Sep 17 00:00:00 2001
From: sbwml <984419930@qq.com>
Date: Fri, 9 Sep 2022 17:50:05 +0800
Subject: [PATCH 01/16] alist: bump to 3.0.0-beta.0

---
 alist/Makefile                                | 23 ++++++-----
 alist/files/assets/circle_center.svg          | 10 -----
 alist/files/assets/http_can_circle.svg        | 10 -----
 ...ert-feat-clear-temp-file-while-start.patch | 38 -------------------
 4 files changed, 13 insertions(+), 68 deletions(-)
 delete mode 100644 alist/files/assets/circle_center.svg
 delete mode 100644 alist/files/assets/http_can_circle.svg
 delete mode 100644 alist/patches/0001-Revert-feat-clear-temp-file-while-start.patch

diff --git a/alist/Makefile b/alist/Makefile
index daf521ba..e376ebf9 100644
--- a/alist/Makefile
+++ b/alist/Makefile
@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=alist
-PKG_VERSION:=2.6.4
-PKG_WEB_VERSION:=2.6.4
+PKG_VERSION:=3.0.0-beta.0
+PKG_WEB_VERSION:=3.0.0-beta.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/alist-org/alist/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=3860f5cec5d809159c55498874c472386cd6142a932a5e7bbfb3b0f569e3e12b
+PKG_HASH:=971f69bbc4fe550d4dc7f10a40290d48f8a019878ea4719da473b68297571804
 
 PKG_LICENSE:=GPL-3.0
 PKG_LICENSE_FILE:=LICENSE
@@ -22,8 +22,8 @@ PKG_MAINTAINER:=sbwml <admin@cooluc.com>
 define Download/$(PKG_NAME)-web
   FILE:=$(PKG_NAME)-web-$(PKG_WEB_VERSION).tar.gz
   URL_FILE:=dist.tar.gz
-  URL:=https://github.com/alist-org/web-v2/releases/download/$(PKG_WEB_VERSION)/
-  HASH:=4189ce3c523e6b8f6bba55faefabc926f6ef793c8755c5c2a2d3f75532fb2243
+  URL:=https://github.com/alist-org/alist-web/releases/download/$(PKG_WEB_VERSION)/
+  HASH:=050abbc1568bd4098027a29f8956916a6f96fd69f8989e253d021deca579d32c
 endef
 
 PKG_CONFIG_DEPENDS:=CONFIG_ALIST_COMPRESS_UPX
@@ -32,10 +32,13 @@ PKG_BUILD_DEPENDS:=golang/host
 PKG_BUILD_PARALLEL:=1
 PKG_USE_MIPS16:=0
 
-GO_PKG:=github.com/Xhofe/alist
-ALIST_PKG:=github.com/Xhofe/alist/conf
+PKG_ALIST:=github.com/alist-org/alist/v3/internal/conf
+GO_PKG:=github.com/alist-org/alist
 GO_PKG_LDFLAGS:=-w -s
-GO_PKG_LDFLAGS_X:=$(ALIST_PKG).GitTag=v$(PKG_VERSION)-$(ARCH)
+GO_PKG_LDFLAGS_X:= \
+	$(PKG_ALIST).Version=v$(PKG_VERSION)-$(ARCH) \
+	$(PKG_ALIST).WebVersion=$(PKG_WEB_VERSION) \
+	$(PKG_ALIST).BuiltAt=$(shell date "+%F %T %z")
 
 include $(INCLUDE_DIR)/package.mk
 include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
@@ -66,8 +69,8 @@ endef
 define Build/Prepare
 	$(call Build/Prepare/Default)
 	$(eval $(call Download,$(PKG_NAME)-web))
-	$(TAR) --strip-components=1 -C $(PKG_BUILD_DIR)/public -xzf $(DL_DIR)/$(PKG_NAME)-web-$(PKG_WEB_VERSION).tar.gz
-	$(CP) ./files/assets/. $(PKG_BUILD_DIR)/public/assets/
+	$(TAR) --strip-components=1 -C $(PKG_BUILD_DIR)/public/dist -xzf $(DL_DIR)/$(PKG_NAME)-web-$(PKG_WEB_VERSION).tar.gz
+	$(CP) ./files/assets/. $(PKG_BUILD_DIR)/public/dist/assets/
 endef
 
 define Build/Compile
diff --git a/alist/files/assets/circle_center.svg b/alist/files/assets/circle_center.svg
deleted file mode 100644
index bc49a26c..00000000
--- a/alist/files/assets/circle_center.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="640pt" height="640pt" viewBox="0 0 640 640" version="1.1" xmlns="http://www.w3.org/2000/svg">
-<g id="#75c4beff">
-<path fill="#75c4be" opacity="1.00" d=" M 326.33 53.46 C 332.73 52.13 339.80 52.94 345.24 56.78 C 351.10 60.95 355.42 66.87 359.18 72.91 C 413.13 162.45 466.15 252.54 519.63 342.37 C 533.77 366.22 548.04 389.99 561.98 413.97 C 565.57 420.47 569.65 426.80 572.11 433.85 C 574.71 442.80 575.26 452.42 573.40 461.58 C 571.16 471.91 563.67 480.51 554.58 485.59 C 547.15 489.94 538.61 492.34 529.99 492.34 C 471.66 492.39 413.33 492.32 355.00 492.38 C 347.28 492.31 339.07 491.06 332.84 486.14 C 328.67 482.79 324.78 478.42 323.87 472.98 C 322.65 465.12 324.45 457.05 328.13 450.06 C 332.44 441.85 337.43 434.01 341.95 425.92 C 350.12 411.30 359.31 397.29 367.87 382.90 C 373.02 374.40 381.07 366.99 391.06 365.01 C 405.38 363.19 421.45 374.82 420.76 390.02 C 420.53 403.34 411.28 413.77 406.46 425.58 C 405.37 428.57 403.57 432.32 405.76 435.24 C 409.97 437.89 415.19 437.95 420.00 438.17 C 444.00 438.20 467.99 438.13 491.99 438.21 C 496.40 438.12 501.06 438.21 505.15 436.27 C 506.87 435.57 507.96 433.81 507.89 431.96 C 507.85 428.01 505.68 424.52 503.79 421.19 C 495.41 407.20 487.36 393.02 479.03 379.00 C 435.55 304.25 391.71 229.71 347.81 155.20 C 344.09 149.60 341.53 143.14 336.78 138.28 C 334.65 135.85 330.80 136.63 329.07 139.11 C 324.76 144.59 321.32 150.70 317.65 156.62 C 258.22 256.83 198.68 356.97 139.09 457.08 C 134.67 465.40 129.90 473.61 124.01 480.99 C 118.33 487.59 110.05 492.53 101.18 492.56 C 92.76 491.73 84.50 487.48 79.39 480.65 C 75.14 474.46 74.64 466.37 76.43 459.25 C 78.16 451.11 82.97 444.19 87.22 437.20 C 128.26 367.34 169.88 297.83 211.19 228.13 C 234.01 189.69 256.88 151.28 279.84 112.92 C 287.23 99.22 295.72 86.17 303.81 72.89 C 309.02 64.44 316.29 55.89 326.33 53.46 Z" />
-</g>
-<g id="#2c9fd6ff">
-<path fill="#2c9fd6" opacity="1.00" d=" M 329.35 261.14 C 337.95 260.38 347.26 263.39 353.07 269.98 C 357.77 275.75 360.69 283.43 358.96 290.91 C 357.79 299.89 351.32 306.64 347.61 314.57 C 342.19 323.76 336.45 332.76 331.05 341.96 C 324.62 354.04 316.79 365.31 310.38 377.39 C 305.41 384.56 301.54 392.40 296.78 399.71 C 290.29 410.33 284.30 421.24 277.99 431.97 C 267.62 447.21 259.73 463.97 249.08 479.02 C 244.35 485.33 237.50 490.71 229.49 491.80 C 223.07 492.98 216.60 490.64 210.88 487.89 C 205.68 484.07 200.75 478.79 200.12 472.05 C 199.38 464.91 199.56 456.96 203.97 450.94 C 209.04 444.01 211.63 435.67 216.66 428.72 C 221.89 421.34 225.45 412.96 230.56 405.50 C 236.11 397.24 240.85 388.50 245.75 379.85 C 257.24 361.25 268.04 342.23 279.39 323.55 C 283.37 315.67 288.11 308.22 292.72 300.71 C 299.71 290.30 305.20 278.88 313.07 269.07 C 316.98 264.08 323.33 262.12 329.35 261.14 Z" />
-</g>
-</svg>
diff --git a/alist/files/assets/http_can_circle.svg b/alist/files/assets/http_can_circle.svg
deleted file mode 100644
index cab3c49f..00000000
--- a/alist/files/assets/http_can_circle.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg width="722" height="722" xmlns="http://www.w3.org/2000/svg" version="1.1">
- <g>
-  <g id="#70c6beff">
-   <path id="svg_2" d="m372.33,100.27c8.44,-1.08 16.61,3.14 22.53,8.87c6.71,6.94 11.39,15.47 16.32,23.68c62.43,104.06 124.07,208.59 186.17,312.85c14.6,24.75 29.53,49.31 43.56,74.4c6.59,11.45 9.1,25.23 6.54,38.23c-1.67,11.63 -8.97,22.12 -18.86,28.31c-7.78,4.86 -16.58,8.22 -25.73,9.17c-4.61,0.42 -9.24,0.19 -13.86,0.22c-63.67,0 -127.35,-0.01 -191.02,0c-8.07,-0.1 -16.22,-2.41 -22.78,-7.2c-7.16,-4.99 -11.59,-14.05 -10.32,-22.79c0.89,-9.17 4.85,-17.68 9.63,-25.44c10.82,-18.77 21.65,-37.53 33.15,-55.9c5.16,-8.03 9.38,-16.95 16.59,-23.43c4.87,-4.16 10.6,-7.63 16.96,-8.82c9.04,-1.12 18.19,2.51 24.97,8.39c6.95,6.16 9.53,16.17 7.88,25.14c-2.58,14.52 -13.13,25.82 -17.34,39.74c-0.92,2.35 -0.44,5.39 2.07,6.53c4.99,2.51 10.75,2.65 16.22,2.79c27.67,-0.02 55.34,-0.02 83.02,0.01c5.04,-0.14 10.92,-0.42 14.59,-4.38c1.7,-5.94 -2.55,-11.22 -5.1,-16.2c-59.46,-101.8 -118.86,-203.63 -178.93,-305.08c-2.61,-4.29 -4.77,-8.97 -8.31,-12.62c-2.33,-2.69 -7,-2.37 -8.92,0.63c-5.67,7.2 -10.1,15.27 -14.86,23.07c-65.86,110.83 -131.72,221.65 -197.58,332.48c-6.29,10.31 -11.48,21.4 -19.35,30.66c-6.28,7.48 -15.75,12.4 -25.6,12.35c-5.38,0.01 -10.4,-2.27 -15.04,-4.77c-6.95,-3.74 -12.3,-10.62 -13.5,-18.5c-1.49,-9.66 1.55,-19.46 6.41,-27.75c56.45,-95.79 113.47,-191.24 170.19,-286.88c21.72,-36.61 43.75,-73.05 65.19,-109.84c5.5,-9.12 11.24,-18.1 16.77,-27.21c6.13,-10.19 16.01,-19.5 28.34,-20.71z" fill="#70c6be"/>
-  </g>
-  <g id="#1ba0d8ff">
-   <path id="svg_3" d="m368.33,335.39c9.54,-1.82 19.84,0.73 27.41,6.83c5.57,5 9.37,12.21 9.55,19.78c0.61,9.39 -3.76,18.08 -8.42,25.92c-36.12,60.55 -72.06,121.21 -108.18,181.76c-5.34,8.95 -11.1,18.53 -21,23.02c-15,8.41 -36.64,-0.5 -41.29,-17.06c-1.72,-7.86 -1.04,-16.4 2.63,-23.63c7.02,-14.54 15.98,-28.02 23.94,-42.05c31.09,-52.53 62.14,-105.09 93.63,-157.38c4.97,-7.94 12.06,-15.57 21.73,-17.19z" fill="#1ba0d8"/>
-  </g>
- </g>
-</svg>
\ No newline at end of file
diff --git a/alist/patches/0001-Revert-feat-clear-temp-file-while-start.patch b/alist/patches/0001-Revert-feat-clear-temp-file-while-start.patch
deleted file mode 100644
index 7aaf37d1..00000000
--- a/alist/patches/0001-Revert-feat-clear-temp-file-while-start.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From fdcb81f6ba8b8d7546a6742e9566487e12815499 Mon Sep 17 00:00:00 2001
-From: sbwml <admin@cooluc.com>
-Date: Thu, 28 Apr 2022 11:10:53 +0800
-Subject: [PATCH] Revert "feat: clear temp file while start"
-
-This reverts commit 24d031d57875d3c6a9624fa7334c6eac1c9111fb.
----
- bootstrap/conf.go | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/bootstrap/conf.go b/bootstrap/conf.go
-index 5c9a1b3..f4d87d4 100644
---- a/bootstrap/conf.go
-+++ b/bootstrap/conf.go
-@@ -7,7 +7,6 @@ import (
- 	log "github.com/sirupsen/logrus"
- 	"io/ioutil"
- 	"os"
--	"path/filepath"
- )
- 
- // InitConf init config
-@@ -47,11 +46,7 @@ func InitConf() {
- 	if !conf.Conf.Force {
- 		confFromEnv()
- 	}
--	err := os.RemoveAll(filepath.Join(conf.Conf.TempDir))
--	if err != nil {
--		log.Errorln("failed delete temp file:", err)
--	}
--	err = os.MkdirAll(conf.Conf.TempDir, 0700)
-+	err := os.MkdirAll(conf.Conf.TempDir, 0700)
- 	if err != nil {
- 		log.Fatalf("create temp dir error: %s", err.Error())
- 	}
--- 
-2.34.1
-

From 4d00052697ad17c0a59602cc89a5dd868c77575e Mon Sep 17 00:00:00 2001
From: sbwml <984419930@qq.com>
Date: Fri, 9 Sep 2022 19:22:50 +0800
Subject: [PATCH 02/16] luci-app-alist: update for v3

---
 luci-app-alist/Makefile                   |   4 ++--
 luci-app-alist/luasrc/model/cbi/alist.lua |  27 +++++++---------------
 luci-app-alist/po/zh-cn/alist.po          |   9 --------
 luci-app-alist/root/etc/alist/data.db     | Bin 28672 -> 36864 bytes
 luci-app-alist/root/etc/config/alist      |   4 +---
 luci-app-alist/root/etc/init.d/alist      |   8 +++----
 6 files changed, 14 insertions(+), 38 deletions(-)

diff --git a/luci-app-alist/Makefile b/luci-app-alist/Makefile
index 11ebc459..27d4822d 100644
--- a/luci-app-alist/Makefile
+++ b/luci-app-alist/Makefile
@@ -6,11 +6,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-alist
-PKG_VERSION:=1.0.4
+PKG_VERSION:=1.0.5
 PKG_RELEASE:=1
 
 LUCI_TITLE:=LuCI support for alist
-LUCI_DEPENDS:=+alist +luci-compat
+LUCI_DEPENDS:=+alist
 
 define Package/$(PKG_NAME)/conffiles
 /etc/alist
diff --git a/luci-app-alist/luasrc/model/cbi/alist.lua b/luci-app-alist/luasrc/model/cbi/alist.lua
index be84605f..9a15cbde 100644
--- a/luci-app-alist/luasrc/model/cbi/alist.lua
+++ b/luci-app-alist/luasrc/model/cbi/alist.lua
@@ -2,10 +2,10 @@ local m, s
 local sys  = require "luci.sys"
 
 if sys.call("pidof alist >/dev/null") == 0 then
-	local password = sys.exec("/usr/bin/alist --conf /etc/alist/config.json -password | awk '{print $3}'")
-	m = Map("alist", translate("Alist"), translate("A file list program that supports multiple storage.") .. " " .. translate("manage password:") .. "<font color=\"green\">" .. password .. "</font>" .. "<br/>" .. [[<a href="https://alist-doc.nn.ci/docs/driver/native" target="_blank">]] .. translate("User Manual") .. [[</a>]])
+	local password = sys.exec("/usr/bin/alist --conf /etc/alist/config.json -password |& tail -1 | awk -F': ' '{print $2}'")
+	m = Map("alist", translate("Alist"), translate("A file list program that supports multiple storage.") .. " " .. translate("manage password:") .. "<font color=\"green\">" .. password .. "</font>" .. "<br/>" .. [[<a href="https://alist.nn.ci/guide/drivers/local.html" target="_blank">]] .. translate("User Manual") .. [[</a>]])
 else
-	m = Map("alist", translate("Alist"), translate("A file list program that supports multiple storage.") .. "<br/>" .. [[<a href="https://alist-doc.nn.ci/docs/driver/native" target="_blank">]] .. translate("User Manual") .. [[</a>]])
+	m = Map("alist", translate("Alist"), translate("A file list program that supports multiple storage.") .. "<br/>" .. [[<a href="https://alist.nn.ci/guide/drivers/local.html" target="_blank">]] .. translate("User Manual") .. [[</a>]])
 end
 
 m:section(SimpleSection).template  = "alist_status"
@@ -21,6 +21,11 @@ o = s:option(Value, "port", translate("Port"))
 o.datatype = "and(port,min(1))"
 o.rmempty = false
 
+o = s:option(Value, "temp_dir", translate("Cache directory"))
+o.datatype = "string"
+o.default = "/tmp/alist"
+o.rmempty = false
+
 o = s:option(Flag, "ssl", translate("Enable SSL"))
 o.rmempty=false
 
@@ -34,20 +39,4 @@ o:depends("ssl", "1")
 o.datatype = "string"
 o.rmempty = true
 
-s = m:section(TypedSection, "alist", translate("Cache settings"))
-s.addremove = false
-s.anonymous = true
-
-o = s:option(Value, "expiration", translate("Cache invalidation time (unit: minutes)"))
-o.datatype = "and(uinteger,min(1))"
-o.rmempty = false
-
-o = s:option(Value, "cleanup_interval", translate("Clear the invalidation cache interval (unit: minutes)"))
-o.datatype = "and(uinteger,min(1))"
-o.rmempty = false
-
-o = s:option(Value, "temp_dir", translate("Cache directory"))
-o.datatype = "string"
-o.rmempty = false
-
 return m
diff --git a/luci-app-alist/po/zh-cn/alist.po b/luci-app-alist/po/zh-cn/alist.po
index 4016647d..f8d5e46c 100644
--- a/luci-app-alist/po/zh-cn/alist.po
+++ b/luci-app-alist/po/zh-cn/alist.po
@@ -34,15 +34,6 @@ msgstr "SSL 密钥"
 msgid "SSL key file path"
 msgstr "SSL 密钥文件路径"
 
-msgid "Cache settings"
-msgstr "缓存设置"
-
-msgid "Cache invalidation time (unit: minutes)"
-msgstr "缓存失效时间（分钟）"
-
-msgid "Clear the invalidation cache interval (unit: minutes)"
-msgstr "清理失效缓存间隔（分钟）"
-
 msgid "Cache directory"
 msgstr "缓存目录"
 
diff --git a/luci-app-alist/root/etc/alist/data.db b/luci-app-alist/root/etc/alist/data.db
index 63756e27ce21b0bf278af4d3ae8d1387034eec05..920b05455ad2d5ec869ea2e8708775ccde293c45 100644
GIT binary patch
literal 36864
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
E0ALHMwg3PC

literal 28672
zcmeI(Pfyce90%}rWrK>_<Ap3_A!+0y8LS}^6HJT_vV#GG%tgbgt=&T@cJ1u*Y(U}#
z--7W<d;z=xZ-$E}W8w?&z{P{{XyoYAvf?%p3|#p4ZPT>R^W^tDzvq)(o~P@x<wciM
zZ8ZoR7T4}dw<KAX9%-5+Nju^i6jxeY16_CV7$0)-aKe2@DlNUqk^?D~+m~|t<m2$C
z!}Ej~G(i9Y5P$##AOHafK;U8s4F8heU5reQvLFY_?V|!7AOL|rf$f?+m@gLPw+6Rf
zdUVrZlyld246*KQu)bnyzFH~QDq5{Pw^-54zE)GaW4@wWrpD<epETQ+*P=<GPMICL
zP3{JMQpLBLN6k(cw3?>o`kXp6oHQ-lri^t}#GQ$XPS-SK|9W~_ef*?cUC|aQE1e7`
zCLW|R`Q@T4xqh8)ve%xNjbXKT5SNX<#Et2`3Pm6dMNnC?E~Rt368S<t<aWtS?nmbN
zY0f@u6d?cs2teQp2$1*c+!dGxrT_s5KmY;|fWSEmeBLJd=+IEM&}cE&*6g57!!^#E
z?7ptsb-%RE>eO@FVacalch+>va~YosLPz(4*#UKAek6|e0w>TdCYJI{kHQVx@(tS!
zZI6~%+liVP55+1!Xi|S8<O>;f{Nb^IlO7HO4V#M9c^JiaC8xO!%b`7;&7{@BR3Xk|
z)oQzT;3pkL<3{nF>YgY8e{c49_Wwz|sHkK4u~Ajc7Mfzd8$no)Ns>a(5Ys6&ujk{$
zxXV3Sj_{&)``VIVcu}pzwLKv>L|SRGmm=TDAF@Zjlb@$M&-v$s;UNG42tWV=5P$##
zAOHafK;Ucw<hT6wY>|jMCjp|2%U$~wnPH_MclICBH<d9t*(p#|B`?Pt04eeAUm203
z&5G!M{Wu^10SG_<0uX=z1Rwwb2tWV=5V#%!(f0t+UO@D{f985j8MA}{1Rwwb2tWV=
z5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHaf
HTpoeHmvuc6

diff --git a/luci-app-alist/root/etc/config/alist b/luci-app-alist/root/etc/config/alist
index d6c147ad..8606df94 100644
--- a/luci-app-alist/root/etc/config/alist
+++ b/luci-app-alist/root/etc/config/alist
@@ -1,7 +1,5 @@
 config alist
 	option 'enabled' '0'
 	option 'port' '5244'
-	option 'expiration' '60'
-	option 'cleanup_interval' '120'
-	option 'temp_dir' '/tmp'
+	option 'temp_dir' '/tmp/alist'
 	option 'ssl' '0'
diff --git a/luci-app-alist/root/etc/init.d/alist b/luci-app-alist/root/etc/init.d/alist
index a38d5e1e..fe448e12 100755
--- a/luci-app-alist/root/etc/init.d/alist
+++ b/luci-app-alist/root/etc/init.d/alist
@@ -8,9 +8,7 @@ CONFIG=/etc/alist/config.json
 get_config() {
 	config_get_bool enabled $1 enabled 1
 	config_get port $1 port 5244
-	config_get expiration $1 expiration 60
-	config_get cleanup_interval $1 cleanup_interval 120
-	config_get temp_dir $1 temp_dir "/tmp"
+	config_get temp_dir $1 temp_dir "/tmp/alist"
 	config_get ssl $1 ssl 0
 	config_get ssl_cert $1 ssl_cert ""
 	config_get ssl_key $1 ssl_key ""
@@ -27,11 +25,11 @@ start_service() {
 		SSL=false
 	fi
 	cat > $CONFIG <<EOF
-{"address":"0.0.0.0","port":$port,"assets":"/","database":{"type":"sqlite3","user":"","password":"","host":"","port":0,"name":"","table_prefix":"x_","db_file":"/etc/alist/data.db","ssl_mode":"disable"},"scheme":{"https":$SSL,"cert_file":"$ssl_cert","key_file":"$ssl_key"},"cache":{"expiration":$expiration,"cleanup_interval":$cleanup_interval},"temp_dir":"$temp_dir"}
+{"force":false,"address":"0.0.0.0","port":$port,"jwt_secret":"","cdn":"","database":{"type":"sqlite3","host":"","port":0,"user":"","password":"","name":"","db_file":"/etc/alist/data.db","table_prefix":"x_","ssl_mode":""},"scheme":{"https":$SSL,"cert_file":"$ssl_cert","key_file":"$ssl_key"},"temp_dir":"$temp_dir","log":{"enable":false,"name":"$temp_dir/alist.log","max_size":10,"max_backups":5,"max_age":28,"compress":false}}
 EOF
 	procd_open_instance alist
 	procd_set_param command $PROG
-	procd_append_param command --conf $CONFIG
+	procd_append_param command server --conf $CONFIG
 	procd_set_param stdout 1
 	procd_set_param stderr 1
 	procd_set_param respawn

From b27d9668e21e243fdeacd1c0e0f475e48d37451a Mon Sep 17 00:00:00 2001
From: sbwml <admin@cooluc.com>
Date: Fri, 9 Sep 2022 20:31:57 +0800
Subject: [PATCH 03/16] alist: fix build & apply upstream patches

---
 alist/Makefile                                |  3 +-
 .../001-fix-error-if-use-abs-temp-path.patch  | 33 +++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 alist/patches/001-fix-error-if-use-abs-temp-path.patch

diff --git a/alist/Makefile b/alist/Makefile
index e376ebf9..d5a5be42 100644
--- a/alist/Makefile
+++ b/alist/Makefile
@@ -37,8 +37,7 @@ GO_PKG:=github.com/alist-org/alist
 GO_PKG_LDFLAGS:=-w -s
 GO_PKG_LDFLAGS_X:= \
 	$(PKG_ALIST).Version=v$(PKG_VERSION)-$(ARCH) \
-	$(PKG_ALIST).WebVersion=$(PKG_WEB_VERSION) \
-	$(PKG_ALIST).BuiltAt=$(shell date "+%F %T %z")
+	$(PKG_ALIST).WebVersion=$(PKG_WEB_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
diff --git a/alist/patches/001-fix-error-if-use-abs-temp-path.patch b/alist/patches/001-fix-error-if-use-abs-temp-path.patch
new file mode 100644
index 00000000..70358d3a
--- /dev/null
+++ b/alist/patches/001-fix-error-if-use-abs-temp-path.patch
@@ -0,0 +1,33 @@
+From 4af91241627909fcf34cc6e4f7abd32a2781f321 Mon Sep 17 00:00:00 2001
+From: Noah Hsu <i@nn.ci>
+Date: Fri, 9 Sep 2022 18:50:54 +0800
+Subject: [PATCH] fix: error if use abs temp path (close #1624)
+
+---
+ internal/bootstrap/config.go | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/internal/bootstrap/config.go b/internal/bootstrap/config.go
+index ad9f64926..3e72a98fd 100644
+--- a/internal/bootstrap/config.go
++++ b/internal/bootstrap/config.go
+@@ -48,16 +48,14 @@ func InitConfig() {
+ 		confFromEnv()
+ 	}
+ 	// convert abs path
+-	var absPath string
+-	var err error
+ 	if !filepath.IsAbs(conf.Conf.TempDir) {
+-		absPath, err = filepath.Abs(conf.Conf.TempDir)
++		absPath, err := filepath.Abs(conf.Conf.TempDir)
+ 		if err != nil {
+ 			log.Fatalf("get abs path error: %+v", err)
+ 		}
++		conf.Conf.TempDir = absPath
+ 	}
+-	conf.Conf.TempDir = absPath
+-	err = os.RemoveAll(filepath.Join(conf.Conf.TempDir))
++	err := os.RemoveAll(filepath.Join(conf.Conf.TempDir))
+ 	if err != nil {
+ 		log.Errorln("failed delete temp file:", err)
+ 	}

From b94090d773e96600fc380dd6789f272501cb70d3 Mon Sep 17 00:00:00 2001
From: sbwml <984419930@qq.com>
Date: Fri, 9 Sep 2022 20:44:47 +0800
Subject: [PATCH 04/16] luci-app-alist: datatype must depend on 'luci-compat'

---
 luci-app-alist/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/luci-app-alist/Makefile b/luci-app-alist/Makefile
index 27d4822d..b7ab3f5d 100644
--- a/luci-app-alist/Makefile
+++ b/luci-app-alist/Makefile
@@ -10,7 +10,7 @@ PKG_VERSION:=1.0.5
 PKG_RELEASE:=1
 
 LUCI_TITLE:=LuCI support for alist
-LUCI_DEPENDS:=+alist
+LUCI_DEPENDS:=+alist +luci-compat
 
 define Package/$(PKG_NAME)/conffiles
 /etc/alist

From 3eb834c9b0af3b0ac314297f595a735447c6c9b2 Mon Sep 17 00:00:00 2001
From: sbwml <admin@cooluc.com>
Date: Sat, 10 Sep 2022 10:01:20 +0800
Subject: [PATCH 05/16] luci-app-alist: fix password printing

* daemon.info uwsgi-luci: syntax error: unexpected "&"
---
 luci-app-alist/luasrc/model/cbi/alist.lua |   2 +-
 luci-app-alist/root/etc/alist/data.db     | Bin 36864 -> 36864 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/luci-app-alist/luasrc/model/cbi/alist.lua b/luci-app-alist/luasrc/model/cbi/alist.lua
index 9a15cbde..f94fda61 100644
--- a/luci-app-alist/luasrc/model/cbi/alist.lua
+++ b/luci-app-alist/luasrc/model/cbi/alist.lua
@@ -2,7 +2,7 @@ local m, s
 local sys  = require "luci.sys"
 
 if sys.call("pidof alist >/dev/null") == 0 then
-	local password = sys.exec("/usr/bin/alist --conf /etc/alist/config.json -password |& tail -1 | awk -F': ' '{print $2}'")
+	local password = sys.exec("/usr/bin/alist --conf /etc/alist/config.json password 2>&1 | tail -1 | awk -F': ' '{print $2}'")
 	m = Map("alist", translate("Alist"), translate("A file list program that supports multiple storage.") .. " " .. translate("manage password:") .. "<font color=\"green\">" .. password .. "</font>" .. "<br/>" .. [[<a href="https://alist.nn.ci/guide/drivers/local.html" target="_blank">]] .. translate("User Manual") .. [[</a>]])
 else
 	m = Map("alist", translate("Alist"), translate("A file list program that supports multiple storage.") .. "<br/>" .. [[<a href="https://alist.nn.ci/guide/drivers/local.html" target="_blank">]] .. translate("User Manual") .. [[</a>]])
diff --git a/luci-app-alist/root/etc/alist/data.db b/luci-app-alist/root/etc/alist/data.db
index 920b05455ad2d5ec869ea2e8708775ccde293c45..f310c33ab20fbe17f3e77deda68b47b19e535020 100644
GIT binary patch
delta 147
zcmZozz|^pSX@WGP!9*EnMuUwBOY-?xdA~C7oASx<e&tW#=bS81V7A$#;5RSh$;mEt
zM|8EdL^)LTc|~~{ITQ2p@=NoQQ*%@EN*r@Ci%S&J@{1Jw3sUpKgF;GDD@vFqo7SJ_
rW92){z@N=`n7@X<ga6ECp@t)Tj58)*@0%hhz^uxMY>4ROn*J65cXKf;

delta 143
zcmZozz|^pSX@WGP&O{k!MxBibOY(VGc)v36oASx<e&tV?tWcma*`PpRvq!;iUdFGJ
zUFweL79^%;<|US7=I6ziR2HNr=HwKo=A<T<02w+6Ih~yR#FY5l$)@$^Sy=cEGfd`c
oklL)&u!WCt<>c#qQv~z4`6n{)=O$+6#V6<I<QH*GuIX<909(5>vH$=8


From 743a3a3bc1a5d05854ddd8a6f18d2350272c3da8 Mon Sep 17 00:00:00 2001
From: sbwml <984419930@qq.com>
Date: Sat, 10 Sep 2022 11:12:30 +0800
Subject: [PATCH 06/16] luci-app-alist: Add inbound access control

---
 luci-app-alist/luasrc/model/cbi/alist.lua | 17 ++++++-----
 luci-app-alist/po/zh-cn/alist.po          |  4 +++
 luci-app-alist/root/etc/init.d/alist      | 37 ++++++++++++++++++++++-
 3 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/luci-app-alist/luasrc/model/cbi/alist.lua b/luci-app-alist/luasrc/model/cbi/alist.lua
index f94fda61..8bdb60c7 100644
--- a/luci-app-alist/luasrc/model/cbi/alist.lua
+++ b/luci-app-alist/luasrc/model/cbi/alist.lua
@@ -21,22 +21,23 @@ o = s:option(Value, "port", translate("Port"))
 o.datatype = "and(port,min(1))"
 o.rmempty = false
 
-o = s:option(Value, "temp_dir", translate("Cache directory"))
-o.datatype = "string"
-o.default = "/tmp/alist"
-o.rmempty = false
-
 o = s:option(Flag, "ssl", translate("Enable SSL"))
 o.rmempty=false
 
 o = s:option(Value,"ssl_cert", translate("SSL cert"), translate("SSL certificate file path"))
+o.datatype = "file"
 o:depends("ssl", "1")
-o.datatype = "string"
-o.rmempty = true
 
 o = s:option(Value,"ssl_key", translate("SSL key"), translate("SSL key file path"))
+o.datatype = "file"
 o:depends("ssl", "1")
+
+o = s:option(Flag, "allow_wan", translate("Allow Access From Internet"))
+o.rmempty = false
+
+o = s:option(Value, "temp_dir", translate("Cache directory"))
 o.datatype = "string"
-o.rmempty = true
+o.default = "/tmp/alist"
+o.rmempty = false
 
 return m
diff --git a/luci-app-alist/po/zh-cn/alist.po b/luci-app-alist/po/zh-cn/alist.po
index f8d5e46c..3f59f8c6 100644
--- a/luci-app-alist/po/zh-cn/alist.po
+++ b/luci-app-alist/po/zh-cn/alist.po
@@ -51,3 +51,7 @@ msgstr "网络存储"
 
 msgid "User Manual"
 msgstr "用户手册"
+
+#: luci-app-alist/luasrc/model/cbi/alist.lua:35
+msgid "Allow Access From Internet"
+msgstr "允许从外网访问"
diff --git a/luci-app-alist/root/etc/init.d/alist b/luci-app-alist/root/etc/init.d/alist
index fe448e12..3c40c036 100755
--- a/luci-app-alist/root/etc/init.d/alist
+++ b/luci-app-alist/root/etc/init.d/alist
@@ -12,6 +12,28 @@ get_config() {
 	config_get ssl $1 ssl 0
 	config_get ssl_cert $1 ssl_cert ""
 	config_get ssl_key $1 ssl_key ""
+	config_get allow_wan $1 allow_wan 0
+	config_load network
+	config_get lan_addr lan ipaddr "0.0.0.0"
+}
+
+set_firewall() {
+	if [ "$external_access" = "allow" ]; then
+		uci -q delete firewall.alist
+		uci set firewall.alist=rule
+		uci set firewall.alist.name="alist"
+		uci set firewall.alist.target="ACCEPT"
+		uci set firewall.alist.src="wan"
+		uci set firewall.alist.proto="tcp"
+		uci set firewall.alist.dest_port="$port"
+		uci set firewall.alist.enabled="1"
+		uci commit firewall
+		/etc/init.d/firewall reload >/dev/null 2>&1
+	elif [ "$external_access" = "deny" ]; then
+		uci -q delete firewall.alist
+		uci commit firewall
+		/etc/init.d/firewall reload >/dev/null 2>&1
+	fi
 }
 
 start_service() {
@@ -24,8 +46,16 @@ start_service() {
 	else
 		SSL=false
 	fi
+	if [ "$allow_wan" -eq "1" ]; then
+		listen_addr="0.0.0.0"
+		external_access="allow"
+	else
+		listen_addr=$lan_addr
+		external_access="deny"
+	fi
+	set_firewall
 	cat > $CONFIG <<EOF
-{"force":false,"address":"0.0.0.0","port":$port,"jwt_secret":"","cdn":"","database":{"type":"sqlite3","host":"","port":0,"user":"","password":"","name":"","db_file":"/etc/alist/data.db","table_prefix":"x_","ssl_mode":""},"scheme":{"https":$SSL,"cert_file":"$ssl_cert","key_file":"$ssl_key"},"temp_dir":"$temp_dir","log":{"enable":false,"name":"$temp_dir/alist.log","max_size":10,"max_backups":5,"max_age":28,"compress":false}}
+{"force":false,"address":"$listen_addr","port":$port,"jwt_secret":"","cdn":"","database":{"type":"sqlite3","host":"","port":0,"user":"","password":"","name":"","db_file":"/etc/alist/data.db","table_prefix":"x_","ssl_mode":""},"scheme":{"https":$SSL,"cert_file":"$ssl_cert","key_file":"$ssl_key"},"temp_dir":"$temp_dir","log":{"enable":false,"name":"$temp_dir/alist.log","max_size":10,"max_backups":5,"max_age":28,"compress":false}}
 EOF
 	procd_open_instance alist
 	procd_set_param command $PROG
@@ -40,6 +70,11 @@ service_triggers() {
 	procd_add_reload_trigger "alist"
 }
 
+stop_service() {
+	external_access="deny"
+	set_firewall
+}
+
 reload_service() {
 	stop
 	start

From cc13b279f9063c6f9a619150712b0c861f8b816d Mon Sep 17 00:00:00 2001
From: sbwml <984419930@qq.com>
Date: Sat, 10 Sep 2022 11:32:08 +0800
Subject: [PATCH 07/16] luci-app-alist: disable password printing for now

---
 luci-app-alist/luasrc/model/cbi/alist.lua | 16 ++++++++--------
 luci-app-alist/po/zh-cn/alist.po          |  3 +++
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/luci-app-alist/luasrc/model/cbi/alist.lua b/luci-app-alist/luasrc/model/cbi/alist.lua
index 8bdb60c7..59bb8154 100644
--- a/luci-app-alist/luasrc/model/cbi/alist.lua
+++ b/luci-app-alist/luasrc/model/cbi/alist.lua
@@ -1,12 +1,12 @@
 local m, s
-local sys  = require "luci.sys"
-
-if sys.call("pidof alist >/dev/null") == 0 then
-	local password = sys.exec("/usr/bin/alist --conf /etc/alist/config.json password 2>&1 | tail -1 | awk -F': ' '{print $2}'")
-	m = Map("alist", translate("Alist"), translate("A file list program that supports multiple storage.") .. " " .. translate("manage password:") .. "<font color=\"green\">" .. password .. "</font>" .. "<br/>" .. [[<a href="https://alist.nn.ci/guide/drivers/local.html" target="_blank">]] .. translate("User Manual") .. [[</a>]])
-else
-	m = Map("alist", translate("Alist"), translate("A file list program that supports multiple storage.") .. "<br/>" .. [[<a href="https://alist.nn.ci/guide/drivers/local.html" target="_blank">]] .. translate("User Manual") .. [[</a>]])
-end
+--local sys  = require "luci.sys"
+
+--if sys.call("pidof alist >/dev/null") == 0 then
+--	local password = sys.exec("/usr/bin/alist --conf /etc/alist/config.json password 2>&1 | tail -1 | awk -F': ' '{print $2}'")
+--	m = Map("alist", translate("Alist"), translate("A file list program that supports multiple storage.") .. " " .. translate("manage password:") .. "<font color=\"green\">" .. password .. "</font>" .. "<br/>" .. [[<a href="https://alist.nn.ci/guide/drivers/local.html" target="_blank">]] .. translate("User Manual") .. [[</a>]])
+--else
+	m = Map("alist", translate("Alist"), translate("A file list program that supports multiple storage.") .. translate("Default username and password:") .. "<font color=\"green\">admin / admin</font>" .. "<br/>" .. [[<a href="https://alist.nn.ci/guide/drivers/local.html" target="_blank">]] .. translate("User Manual") .. [[</a>]])
+--end
 
 m:section(SimpleSection).template  = "alist_status"
 
diff --git a/luci-app-alist/po/zh-cn/alist.po b/luci-app-alist/po/zh-cn/alist.po
index 3f59f8c6..db8ec745 100644
--- a/luci-app-alist/po/zh-cn/alist.po
+++ b/luci-app-alist/po/zh-cn/alist.po
@@ -55,3 +55,6 @@ msgstr "用户手册"
 #: luci-app-alist/luasrc/model/cbi/alist.lua:35
 msgid "Allow Access From Internet"
 msgstr "允许从外网访问"
+
+msgid "Default username and password:"
+msgstr "默认用户名和密码："

From d927bedd7662b1bc2e4923f57317dda334fc0d75 Mon Sep 17 00:00:00 2001
From: sbwml <984419930@qq.com>
Date: Sat, 10 Sep 2022 11:37:25 +0800
Subject: [PATCH 08/16] alist: add patches from upstream

* fix: if use down proxy url
---
 .../002-fix-if-use-down-proxy-url.patch       | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 alist/patches/002-fix-if-use-down-proxy-url.patch

diff --git a/alist/patches/002-fix-if-use-down-proxy-url.patch b/alist/patches/002-fix-if-use-down-proxy-url.patch
new file mode 100644
index 00000000..30c44450
--- /dev/null
+++ b/alist/patches/002-fix-if-use-down-proxy-url.patch
@@ -0,0 +1,31 @@
+From 5ad3849bb635b6f339c4d1d5f648882e840c9189 Mon Sep 17 00:00:00 2001
+From: Noah Hsu <i@nn.ci>
+Date: Fri, 9 Sep 2022 20:54:11 +0800
+Subject: [PATCH] fix: if use down proxy url
+
+---
+ server/handles/down.go | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/server/handles/down.go b/server/handles/down.go
+index eb9d04a47..bbe0a30b3 100644
+--- a/server/handles/down.go
++++ b/server/handles/down.go
+@@ -52,7 +52,7 @@ func Proxy(c *gin.Context) {
+ 		downProxyUrl := storage.GetStorage().DownProxyUrl
+ 		if downProxyUrl != "" {
+ 			_, ok := c.GetQuery("d")
+-			if ok {
++			if !ok {
+ 				URL := fmt.Sprintf("%s%s?sign=%s",
+ 					strings.Split(downProxyUrl, "\n")[0],
+ 					utils.EncodePath(rawPath, true),
+@@ -103,7 +103,7 @@ func shouldProxy(storage driver.Driver, filename string) bool {
+ // 4. proxy_types
+ // solution: text_file + shouldProxy()
+ func canProxy(storage driver.Driver, filename string) bool {
+-	if storage.Config().MustProxy() || storage.GetStorage().WebProxy {
++	if storage.Config().MustProxy() || storage.GetStorage().WebProxy || storage.GetStorage().WebdavProxy() {
+ 		return true
+ 	}
+ 	if utils.SliceContains(conf.TypesMap[conf.ProxyTypes], utils.Ext(filename)) {

From 6cfba794ab02d8b85cf62f79bf4fd5cd71bbee2d Mon Sep 17 00:00:00 2001
From: sbwml <984419930@qq.com>
Date: Sat, 10 Sep 2022 17:43:20 +0800
Subject: [PATCH 09/16] alist: bump to v3.0.0-beta.1

---
 alist/Makefile                                |  4 +--
 .../001-fix-error-if-use-abs-temp-path.patch  | 33 -------------------
 .../002-fix-if-use-down-proxy-url.patch       | 31 -----------------
 3 files changed, 2 insertions(+), 66 deletions(-)
 delete mode 100644 alist/patches/001-fix-error-if-use-abs-temp-path.patch
 delete mode 100644 alist/patches/002-fix-if-use-down-proxy-url.patch

diff --git a/alist/Makefile b/alist/Makefile
index d5a5be42..4bd2d7fd 100644
--- a/alist/Makefile
+++ b/alist/Makefile
@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=alist
-PKG_VERSION:=3.0.0-beta.0
+PKG_VERSION:=3.0.0-beta.1
 PKG_WEB_VERSION:=3.0.0-beta.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/alist-org/alist/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=971f69bbc4fe550d4dc7f10a40290d48f8a019878ea4719da473b68297571804
+PKG_HASH:=ee23dae35de550c4c829d869d76b777a5138bcf8de003853dd3f5344bcf6f381
 
 PKG_LICENSE:=GPL-3.0
 PKG_LICENSE_FILE:=LICENSE
diff --git a/alist/patches/001-fix-error-if-use-abs-temp-path.patch b/alist/patches/001-fix-error-if-use-abs-temp-path.patch
deleted file mode 100644
index 70358d3a..00000000
--- a/alist/patches/001-fix-error-if-use-abs-temp-path.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 4af91241627909fcf34cc6e4f7abd32a2781f321 Mon Sep 17 00:00:00 2001
-From: Noah Hsu <i@nn.ci>
-Date: Fri, 9 Sep 2022 18:50:54 +0800
-Subject: [PATCH] fix: error if use abs temp path (close #1624)
-
----
- internal/bootstrap/config.go | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/internal/bootstrap/config.go b/internal/bootstrap/config.go
-index ad9f64926..3e72a98fd 100644
---- a/internal/bootstrap/config.go
-+++ b/internal/bootstrap/config.go
-@@ -48,16 +48,14 @@ func InitConfig() {
- 		confFromEnv()
- 	}
- 	// convert abs path
--	var absPath string
--	var err error
- 	if !filepath.IsAbs(conf.Conf.TempDir) {
--		absPath, err = filepath.Abs(conf.Conf.TempDir)
-+		absPath, err := filepath.Abs(conf.Conf.TempDir)
- 		if err != nil {
- 			log.Fatalf("get abs path error: %+v", err)
- 		}
-+		conf.Conf.TempDir = absPath
- 	}
--	conf.Conf.TempDir = absPath
--	err = os.RemoveAll(filepath.Join(conf.Conf.TempDir))
-+	err := os.RemoveAll(filepath.Join(conf.Conf.TempDir))
- 	if err != nil {
- 		log.Errorln("failed delete temp file:", err)
- 	}
diff --git a/alist/patches/002-fix-if-use-down-proxy-url.patch b/alist/patches/002-fix-if-use-down-proxy-url.patch
deleted file mode 100644
index 30c44450..00000000
--- a/alist/patches/002-fix-if-use-down-proxy-url.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5ad3849bb635b6f339c4d1d5f648882e840c9189 Mon Sep 17 00:00:00 2001
-From: Noah Hsu <i@nn.ci>
-Date: Fri, 9 Sep 2022 20:54:11 +0800
-Subject: [PATCH] fix: if use down proxy url
-
----
- server/handles/down.go | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/server/handles/down.go b/server/handles/down.go
-index eb9d04a47..bbe0a30b3 100644
---- a/server/handles/down.go
-+++ b/server/handles/down.go
-@@ -52,7 +52,7 @@ func Proxy(c *gin.Context) {
- 		downProxyUrl := storage.GetStorage().DownProxyUrl
- 		if downProxyUrl != "" {
- 			_, ok := c.GetQuery("d")
--			if ok {
-+			if !ok {
- 				URL := fmt.Sprintf("%s%s?sign=%s",
- 					strings.Split(downProxyUrl, "\n")[0],
- 					utils.EncodePath(rawPath, true),
-@@ -103,7 +103,7 @@ func shouldProxy(storage driver.Driver, filename string) bool {
- // 4. proxy_types
- // solution: text_file + shouldProxy()
- func canProxy(storage driver.Driver, filename string) bool {
--	if storage.Config().MustProxy() || storage.GetStorage().WebProxy {
-+	if storage.Config().MustProxy() || storage.GetStorage().WebProxy || storage.GetStorage().WebdavProxy() {
- 		return true
- 	}
- 	if utils.SliceContains(conf.TypesMap[conf.ProxyTypes], utils.Ext(filename)) {

From 9656557fdfd1a8a4bb71af3d0ac3195d786f3fa3 Mon Sep 17 00:00:00 2001
From: sbwml <984419930@qq.com>
Date: Mon, 12 Sep 2022 09:09:08 +0800
Subject: [PATCH 10/16] alist: bump to v3.0.0-beta.2

---
 alist/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/alist/Makefile b/alist/Makefile
index 4bd2d7fd..ff61c6d2 100644
--- a/alist/Makefile
+++ b/alist/Makefile
@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=alist
-PKG_VERSION:=3.0.0-beta.1
-PKG_WEB_VERSION:=3.0.0-beta.0
+PKG_VERSION:=3.0.0-beta.2
+PKG_WEB_VERSION:=3.0.0-beta.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/alist-org/alist/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=ee23dae35de550c4c829d869d76b777a5138bcf8de003853dd3f5344bcf6f381
+PKG_HASH:=4d8ad4c02db09b117823de7dfbf3ac3dea5bd56613e91899688053fa220acf21
 
 PKG_LICENSE:=GPL-3.0
 PKG_LICENSE_FILE:=LICENSE
@@ -23,7 +23,7 @@ define Download/$(PKG_NAME)-web
   FILE:=$(PKG_NAME)-web-$(PKG_WEB_VERSION).tar.gz
   URL_FILE:=dist.tar.gz
   URL:=https://github.com/alist-org/alist-web/releases/download/$(PKG_WEB_VERSION)/
-  HASH:=050abbc1568bd4098027a29f8956916a6f96fd69f8989e253d021deca579d32c
+  HASH:=98d84ae80f27da0aa0216f14b0ee3063fe735fe3d2fe894494e07fb3e70b7d46
 endef
 
 PKG_CONFIG_DEPENDS:=CONFIG_ALIST_COMPRESS_UPX

From 641a8a91dc986af20be8bc637ac5a49db426a8d3 Mon Sep 17 00:00:00 2001
From: sbwml <984419930@qq.com>
Date: Mon, 12 Sep 2022 11:01:02 +0800
Subject: [PATCH 11/16] luci-app-alist: Add log preview support

---
 luci-app-alist/luasrc/controller/alist.lua    | 19 ++++++++++--
 .../luasrc/model/cbi/{alist.lua => basic.lua} |  8 +++--
 luci-app-alist/luasrc/model/cbi/log.lua       |  5 ++++
 luci-app-alist/luasrc/view/alist_log.htm      | 29 +++++++++++++++++++
 luci-app-alist/luasrc/view/alist_status.htm   |  6 ++--
 luci-app-alist/po/zh-cn/alist.po              | 23 +++++++++------
 luci-app-alist/root/etc/init.d/alist          |  8 ++++-
 7 files changed, 81 insertions(+), 17 deletions(-)
 rename luci-app-alist/luasrc/model/cbi/{alist.lua => basic.lua} (90%)
 create mode 100644 luci-app-alist/luasrc/model/cbi/log.lua
 create mode 100644 luci-app-alist/luasrc/view/alist_log.htm

diff --git a/luci-app-alist/luasrc/controller/alist.lua b/luci-app-alist/luasrc/controller/alist.lua
index 1bb66401..bce25f97 100644
--- a/luci-app-alist/luasrc/controller/alist.lua
+++ b/luci-app-alist/luasrc/controller/alist.lua
@@ -5,9 +5,16 @@ function index()
 		return
 	end
 
+	local page = entry({"admin", "nas", "alist"}, alias("admin", "nas", "alist", "basic"), _("Alist"), 20)
+	page.dependent = true
+	page.acl_depends = { "luci-app-alist" }
+
 	entry({"admin", "nas"}, firstchild(), "NAS", 44).dependent = false
-	entry({"admin", "nas", "alist"}, cbi("alist"), _("Alist"), 20).dependent = true
-	entry({"admin", "nas", "alist_status"}, call("alist_status"))
+	entry({"admin", "nas", "alist", "basic"}, cbi("alist/basic"), _("Basic Setting"), 1).leaf = true
+	entry({"admin", "nas", "alist", "log"}, cbi("alist/log"), _("Logs"), 2).leaf = true
+	entry({"admin", "nas", "alist", "alist_status"}, call("alist_status")).leaf = true
+	entry({"admin", "nas", "alist", "get_log"}, call("get_log")).leaf = true
+	entry({"admin", "nas", "alist", "clear_log"}, call("clear_log")).leaf = true
 end
 
 function alist_status()
@@ -23,3 +30,11 @@ function alist_status()
 	luci.http.prepare_content("application/json")
 	luci.http.write_json(status)
 end
+
+function get_log()
+	luci.http.write(luci.sys.exec("cat $(uci -q get alist.@alist[0].temp_dir)/alist.log"))
+end
+
+function clear_log()
+	luci.sys.call("cat /dev/null > $(uci -q get alist.@alist[0].temp_dir)/alist.log")
+end
diff --git a/luci-app-alist/luasrc/model/cbi/alist.lua b/luci-app-alist/luasrc/model/cbi/basic.lua
similarity index 90%
rename from luci-app-alist/luasrc/model/cbi/alist.lua
rename to luci-app-alist/luasrc/model/cbi/basic.lua
index 59bb8154..500d8b7b 100644
--- a/luci-app-alist/luasrc/model/cbi/alist.lua
+++ b/luci-app-alist/luasrc/model/cbi/basic.lua
@@ -8,9 +8,9 @@ local m, s
 	m = Map("alist", translate("Alist"), translate("A file list program that supports multiple storage.") .. translate("Default username and password:") .. "<font color=\"green\">admin / admin</font>" .. "<br/>" .. [[<a href="https://alist.nn.ci/guide/drivers/local.html" target="_blank">]] .. translate("User Manual") .. [[</a>]])
 --end
 
-m:section(SimpleSection).template  = "alist_status"
+m:section(SimpleSection).template  = "alist/alist_status"
 
-s = m:section(TypedSection, "alist", translate("Global settings"))
+s = m:section(TypedSection, "alist")
 s.addremove = false
 s.anonymous = true
 
@@ -21,6 +21,10 @@ o = s:option(Value, "port", translate("Port"))
 o.datatype = "and(port,min(1))"
 o.rmempty = false
 
+o = s:option(Flag, "log", translate("Enable Logs"))
+o.default = 1
+o.rmempty = false
+
 o = s:option(Flag, "ssl", translate("Enable SSL"))
 o.rmempty=false
 
diff --git a/luci-app-alist/luasrc/model/cbi/log.lua b/luci-app-alist/luasrc/model/cbi/log.lua
new file mode 100644
index 00000000..4b6c36f8
--- /dev/null
+++ b/luci-app-alist/luasrc/model/cbi/log.lua
@@ -0,0 +1,5 @@
+m = Map("alist")
+
+m:append(Template("alist/alist_log"))
+
+return m
diff --git a/luci-app-alist/luasrc/view/alist_log.htm b/luci-app-alist/luasrc/view/alist_log.htm
new file mode 100644
index 00000000..b77932e4
--- /dev/null
+++ b/luci-app-alist/luasrc/view/alist_log.htm
@@ -0,0 +1,29 @@
+<script type="text/javascript">
+	//<![CDATA[
+	function clear_log(btn) {
+		XHR.get('<%=url([[admin]], [[nas]], [[alist]], [[clear_log]])%>', null,
+			function(x, data) {
+				if(x && x.status == 200) {
+					var log_textarea = document.getElementById('log_textarea');
+					log_textarea.innerHTML = "";
+					log_textarea.scrollTop = log_textarea.scrollHeight;
+				}
+				location.reload();
+			}
+		);
+	}
+	XHR.poll(2, '<%=url([[admin]], [[nas]], [[alist]], [[get_log]])%>', null,
+		function(x, data) {
+			if(x && x.status == 200) {
+				var log_textarea = document.getElementById('log_textarea');
+				log_textarea.innerHTML = x.responseText;
+				log_textarea.scrollTop = log_textarea.scrollHeight;
+			}
+		}
+	);
+	//]]>
+</script>
+<fieldset class="cbi-section" id="_log_fieldset">
+	<input class="cbi-button cbi-input-remove" type="button" onclick="clear_log()" value="<%:Clear logs%>" style="margin-left: 10px; margin-top: 10px;">
+	<textarea id="log_textarea" class="cbi-input-textarea" style="width: calc(100% - 20px); height: 500px; margin: 10px;" data-update="change" rows="5" wrap="off" readonly="readonly"></textarea>
+</fieldset>
diff --git a/luci-app-alist/luasrc/view/alist_status.htm b/luci-app-alist/luasrc/view/alist_status.htm
index 42b1d1a3..fc11c224 100644
--- a/luci-app-alist/luasrc/view/alist_status.htm
+++ b/luci-app-alist/luasrc/view/alist_status.htm
@@ -9,7 +9,7 @@
 %>
 
 <script type="text/javascript">//<![CDATA[
-	XHR.poll(5, '<%=url("admin/nas/alist_status")%>', null,
+	XHR.poll(5, '<%=url("admin/nas/alist/alist_status")%>', null,
 		function(x, st)
 		{
 			var tb = document.getElementById('alist_status');
@@ -17,11 +17,11 @@
 			{
 				if (st.running)
 				{
-					tb.innerHTML = '<em style=\"color:green\"><b><%:The Alist service is running.%></b></em>' + "<input class=\"cbi-button-reload mar-10\" type=\"button\" value=\" <%:Click to open Alist%> \" onclick=\"window.open('<%=protocol%>" + window.location.hostname + ":" + st.port + "/')\"/>";
+					tb.innerHTML = '<em style=\"color:green\"><b>Alist <%:RUNNING%></b></em>' + "<input class=\"cbi-button-reload mar-10\" type=\"button\" value=\" <%:Open Web Interface%> \" onclick=\"window.open('<%=protocol%>" + window.location.hostname + ":" + st.port + "/')\"/>";
 				}
 				else
 				{
-					tb.innerHTML = '<em style=\"color:red\"><b><%:The Alist service is not running.%></b></em>';
+					tb.innerHTML = '<em style=\"color:red\"><b>Alist <%:NOT RUNNING%></b></em>';
 				}
 			}
 		}
diff --git a/luci-app-alist/po/zh-cn/alist.po b/luci-app-alist/po/zh-cn/alist.po
index db8ec745..319329e7 100644
--- a/luci-app-alist/po/zh-cn/alist.po
+++ b/luci-app-alist/po/zh-cn/alist.po
@@ -4,8 +4,8 @@ msgstr "Alist 文件列表"
 msgid "Running state"
 msgstr "运行状态"
 
-msgid "Click to open Alist"
-msgstr "点击打开 Alist"
+msgid "Open Web Interface"
+msgstr "打开 Web 界面"
 
 msgid "A file list program that supports multiple storage."
 msgstr "一款支持多种存储的目录文件列表程序。"
@@ -13,8 +13,8 @@ msgstr "一款支持多种存储的目录文件列表程序。"
 msgid "manage password:"
 msgstr "管理密码："
 
-msgid "Global settings"
-msgstr "全局设置"
+msgid "Basic Setting"
+msgstr "基本设置"
 
 msgid "Port"
 msgstr "端口"
@@ -37,11 +37,11 @@ msgstr "SSL 密钥文件路径"
 msgid "Cache directory"
 msgstr "缓存目录"
 
-msgid "The Alist service is running."
-msgstr "Alist 服务已启动"
+msgid "RUNNING"
+msgstr "运行中"
 
-msgid "The Alist service is not running."
-msgstr "Alist 服务未启动"
+msgid "NOT RUNNING"
+msgstr "未运行"
 
 msgid "Collecting data..."
 msgstr "收集数据..."
@@ -52,9 +52,14 @@ msgstr "网络存储"
 msgid "User Manual"
 msgstr "用户手册"
 
-#: luci-app-alist/luasrc/model/cbi/alist.lua:35
 msgid "Allow Access From Internet"
 msgstr "允许从外网访问"
 
 msgid "Default username and password:"
 msgstr "默认用户名和密码："
+
+msgid "Enable Logs"
+msgstr "启用日志"
+
+msgid "Clear logs"
+msgstr "清空日志"
diff --git a/luci-app-alist/root/etc/init.d/alist b/luci-app-alist/root/etc/init.d/alist
index 3c40c036..54896f84 100755
--- a/luci-app-alist/root/etc/init.d/alist
+++ b/luci-app-alist/root/etc/init.d/alist
@@ -8,6 +8,7 @@ CONFIG=/etc/alist/config.json
 get_config() {
 	config_get_bool enabled $1 enabled 1
 	config_get port $1 port 5244
+	config_get log $1 log 1
 	config_get temp_dir $1 temp_dir "/tmp/alist"
 	config_get ssl $1 ssl 0
 	config_get ssl_cert $1 ssl_cert ""
@@ -46,6 +47,11 @@ start_service() {
 	else
 		SSL=false
 	fi
+	if [ "$log" -eq 1 ];then
+		LOG=true
+	else
+		LOG=false
+	fi
 	if [ "$allow_wan" -eq "1" ]; then
 		listen_addr="0.0.0.0"
 		external_access="allow"
@@ -55,7 +61,7 @@ start_service() {
 	fi
 	set_firewall
 	cat > $CONFIG <<EOF
-{"force":false,"address":"$listen_addr","port":$port,"jwt_secret":"","cdn":"","database":{"type":"sqlite3","host":"","port":0,"user":"","password":"","name":"","db_file":"/etc/alist/data.db","table_prefix":"x_","ssl_mode":""},"scheme":{"https":$SSL,"cert_file":"$ssl_cert","key_file":"$ssl_key"},"temp_dir":"$temp_dir","log":{"enable":false,"name":"$temp_dir/alist.log","max_size":10,"max_backups":5,"max_age":28,"compress":false}}
+{"force":false,"address":"$listen_addr","port":$port,"jwt_secret":"","cdn":"","database":{"type":"sqlite3","host":"","port":0,"user":"","password":"","name":"","db_file":"/etc/alist/data.db","table_prefix":"x_","ssl_mode":""},"scheme":{"https":$SSL,"cert_file":"$ssl_cert","key_file":"$ssl_key"},"temp_dir":"$temp_dir","log":{"enable":$LOG,"name":"$temp_dir/alist.log","max_size":10,"max_backups":5,"max_age":28,"compress":false}}
 EOF
 	procd_open_instance alist
 	procd_set_param command $PROG

From 5e9bb57535a4717752916147dcc8524b14a721a6 Mon Sep 17 00:00:00 2001
From: sbwml <984419930@qq.com>
Date: Mon, 12 Sep 2022 12:27:07 +0800
Subject: [PATCH 12/16] luci-app-alist: clear logs file before startup

---
 luci-app-alist/root/etc/init.d/alist | 1 +
 1 file changed, 1 insertion(+)

diff --git a/luci-app-alist/root/etc/init.d/alist b/luci-app-alist/root/etc/init.d/alist
index 54896f84..3206cf6c 100755
--- a/luci-app-alist/root/etc/init.d/alist
+++ b/luci-app-alist/root/etc/init.d/alist
@@ -60,6 +60,7 @@ start_service() {
 		external_access="deny"
 	fi
 	set_firewall
+	cat /dev/null > $temp_dir/alist.log
 	cat > $CONFIG <<EOF
 {"force":false,"address":"$listen_addr","port":$port,"jwt_secret":"","cdn":"","database":{"type":"sqlite3","host":"","port":0,"user":"","password":"","name":"","db_file":"/etc/alist/data.db","table_prefix":"x_","ssl_mode":""},"scheme":{"https":$SSL,"cert_file":"$ssl_cert","key_file":"$ssl_key"},"temp_dir":"$temp_dir","log":{"enable":$LOG,"name":"$temp_dir/alist.log","max_size":10,"max_backups":5,"max_age":28,"compress":false}}
 EOF

From 2873eb5fa76d16cedef64f5e99e5528f55369e70 Mon Sep 17 00:00:00 2001
From: sbwml <984419930@qq.com>
Date: Mon, 12 Sep 2022 12:40:08 +0800
Subject: [PATCH 13/16] alist: patch: disable delete of temp directory at
 startup

* It's not good idea on the openwrt platform
---
 ...able-delete-of-temp-directory-at-startup.patch | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 alist/patches/001-disable-delete-of-temp-directory-at-startup.patch

diff --git a/alist/patches/001-disable-delete-of-temp-directory-at-startup.patch b/alist/patches/001-disable-delete-of-temp-directory-at-startup.patch
new file mode 100644
index 00000000..ad5c4bdc
--- /dev/null
+++ b/alist/patches/001-disable-delete-of-temp-directory-at-startup.patch
@@ -0,0 +1,15 @@
+--- a/internal/bootstrap/config.go
++++ b/internal/bootstrap/config.go
+@@ -55,11 +55,7 @@ func InitConfig() {
+ 		}
+ 		conf.Conf.TempDir = absPath
+ 	}
+-	err := os.RemoveAll(filepath.Join(conf.Conf.TempDir))
+-	if err != nil {
+-		log.Errorln("failed delete temp file:", err)
+-	}
+-	err = os.MkdirAll(conf.Conf.TempDir, 0700)
++	err := os.MkdirAll(conf.Conf.TempDir, 0700)
+ 	if err != nil {
+ 		log.Fatalf("create temp dir error: %+v", err)
+ 	}

From 071721f7eacf59329e5a2619aa6bc13de577f8d5 Mon Sep 17 00:00:00 2001
From: sbwml <984419930@qq.com>
Date: Mon, 12 Sep 2022 15:32:25 +0800
Subject: [PATCH 14/16] luci-app-alist: move controls to separate folder

* fix: Model 'alist/basic' not found
---
 luci-app-alist/luasrc/model/cbi/{ => alist}/basic.lua   | 0
 luci-app-alist/luasrc/model/cbi/{ => alist}/log.lua     | 0
 luci-app-alist/luasrc/view/{ => alist}/alist_log.htm    | 0
 luci-app-alist/luasrc/view/{ => alist}/alist_status.htm | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename luci-app-alist/luasrc/model/cbi/{ => alist}/basic.lua (100%)
 rename luci-app-alist/luasrc/model/cbi/{ => alist}/log.lua (100%)
 rename luci-app-alist/luasrc/view/{ => alist}/alist_log.htm (100%)
 rename luci-app-alist/luasrc/view/{ => alist}/alist_status.htm (100%)

diff --git a/luci-app-alist/luasrc/model/cbi/basic.lua b/luci-app-alist/luasrc/model/cbi/alist/basic.lua
similarity index 100%
rename from luci-app-alist/luasrc/model/cbi/basic.lua
rename to luci-app-alist/luasrc/model/cbi/alist/basic.lua
diff --git a/luci-app-alist/luasrc/model/cbi/log.lua b/luci-app-alist/luasrc/model/cbi/alist/log.lua
similarity index 100%
rename from luci-app-alist/luasrc/model/cbi/log.lua
rename to luci-app-alist/luasrc/model/cbi/alist/log.lua
diff --git a/luci-app-alist/luasrc/view/alist_log.htm b/luci-app-alist/luasrc/view/alist/alist_log.htm
similarity index 100%
rename from luci-app-alist/luasrc/view/alist_log.htm
rename to luci-app-alist/luasrc/view/alist/alist_log.htm
diff --git a/luci-app-alist/luasrc/view/alist_status.htm b/luci-app-alist/luasrc/view/alist/alist_status.htm
similarity index 100%
rename from luci-app-alist/luasrc/view/alist_status.htm
rename to luci-app-alist/luasrc/view/alist/alist_status.htm

From d310a6cc2dcbf1223c45b7c0bf5064c11f0abc07 Mon Sep 17 00:00:00 2001
From: sbwml <984419930@qq.com>
Date: Wed, 14 Sep 2022 21:26:57 +0800
Subject: [PATCH 15/16] luci-app-alist: Add password view

---
 luci-app-alist/luasrc/controller/alist.lua    |  9 +++++++
 .../luasrc/model/cbi/alist/basic.lua          | 12 ++++-----
 .../luasrc/view/alist/admin_info.htm          | 26 +++++++++++++++++++
 luci-app-alist/po/zh-cn/alist.po              | 21 ++++++++++-----
 4 files changed, 55 insertions(+), 13 deletions(-)
 create mode 100644 luci-app-alist/luasrc/view/alist/admin_info.htm

diff --git a/luci-app-alist/luasrc/controller/alist.lua b/luci-app-alist/luasrc/controller/alist.lua
index bce25f97..28593a04 100644
--- a/luci-app-alist/luasrc/controller/alist.lua
+++ b/luci-app-alist/luasrc/controller/alist.lua
@@ -15,6 +15,7 @@ function index()
 	entry({"admin", "nas", "alist", "alist_status"}, call("alist_status")).leaf = true
 	entry({"admin", "nas", "alist", "get_log"}, call("get_log")).leaf = true
 	entry({"admin", "nas", "alist", "clear_log"}, call("clear_log")).leaf = true
+	entry({"admin", "nas", "alist", "admin_info"}, call("admin_info")).leaf = true
 end
 
 function alist_status()
@@ -38,3 +39,11 @@ end
 function clear_log()
 	luci.sys.call("cat /dev/null > $(uci -q get alist.@alist[0].temp_dir)/alist.log")
 end
+
+function admin_info()
+	local username = luci.sys.exec("/usr/bin/alist --conf /etc/alist/config.json password 2>&1 | tail -2 | awk 'NR==1 {print $2}'")
+	local password = luci.sys.exec("/usr/bin/alist --conf /etc/alist/config.json password 2>&1 | tail -2 | awk 'NR==2 {print $2}'")
+
+	luci.http.prepare_content("application/json")
+	luci.http.write_json({username = username, password = password})
+end
diff --git a/luci-app-alist/luasrc/model/cbi/alist/basic.lua b/luci-app-alist/luasrc/model/cbi/alist/basic.lua
index 500d8b7b..eaca6cc9 100644
--- a/luci-app-alist/luasrc/model/cbi/alist/basic.lua
+++ b/luci-app-alist/luasrc/model/cbi/alist/basic.lua
@@ -1,12 +1,6 @@
 local m, s
---local sys  = require "luci.sys"
 
---if sys.call("pidof alist >/dev/null") == 0 then
---	local password = sys.exec("/usr/bin/alist --conf /etc/alist/config.json password 2>&1 | tail -1 | awk -F': ' '{print $2}'")
---	m = Map("alist", translate("Alist"), translate("A file list program that supports multiple storage.") .. " " .. translate("manage password:") .. "<font color=\"green\">" .. password .. "</font>" .. "<br/>" .. [[<a href="https://alist.nn.ci/guide/drivers/local.html" target="_blank">]] .. translate("User Manual") .. [[</a>]])
---else
-	m = Map("alist", translate("Alist"), translate("A file list program that supports multiple storage.") .. translate("Default username and password:") .. "<font color=\"green\">admin / admin</font>" .. "<br/>" .. [[<a href="https://alist.nn.ci/guide/drivers/local.html" target="_blank">]] .. translate("User Manual") .. [[</a>]])
---end
+m = Map("alist", translate("Alist"), translate("A file list program that supports multiple storage.") .. "<br/>" .. [[<a href="https://alist.nn.ci/zh/guide/drivers/local.html" target="_blank">]] .. translate("User Manual") .. [[</a>]])
 
 m:section(SimpleSection).template  = "alist/alist_status"
 
@@ -44,4 +38,8 @@ o.datatype = "string"
 o.default = "/tmp/alist"
 o.rmempty = false
 
+o = s:option(Button, "admin_info", translate("View Password"))
+o.rawhtml = true
+o.template = "alist/admin_info"
+
 return m
diff --git a/luci-app-alist/luasrc/view/alist/admin_info.htm b/luci-app-alist/luasrc/view/alist/admin_info.htm
new file mode 100644
index 00000000..c593f280
--- /dev/null
+++ b/luci-app-alist/luasrc/view/alist/admin_info.htm
@@ -0,0 +1,26 @@
+<%+cbi/valueheader%>
+<script type="text/javascript">//<![CDATA[
+	function admin_info(btn)
+	{
+		btn.disabled = true;
+		btn.value = '<%:Reading...%>';
+		XHR.get('<%=luci.dispatcher.build_url("admin", "nas", "alist", "admin_info")%>',
+			null,
+			function(x,rv)
+			{
+			var tb = document.getElementById('<%=self.option%>-status');
+			if (tb)
+			{
+				tb.innerHTML = "<%:Username:%>" + "<font color='green'>" + rv.username + "</font>";
+				tb.innerHTML += "<%:Password:%>" + "<font color='green'>" + rv.password + "</font>";
+			}
+				btn.disabled = false;
+				btn.value = '<%:Read%>';
+			}
+		);
+		return false;
+	}
+//]]></script>
+<input type="button" class="btn cbi-button cbi-button-apply" value="<%:Read%>" onclick="return admin_info(this)" />
+<span id="<%=self.option%>-status"><em><%=self.value%></em></span>
+<%+cbi/valuefooter%>
\ No newline at end of file
diff --git a/luci-app-alist/po/zh-cn/alist.po b/luci-app-alist/po/zh-cn/alist.po
index 319329e7..2008c207 100644
--- a/luci-app-alist/po/zh-cn/alist.po
+++ b/luci-app-alist/po/zh-cn/alist.po
@@ -10,9 +10,6 @@ msgstr "打开 Web 界面"
 msgid "A file list program that supports multiple storage."
 msgstr "一款支持多种存储的目录文件列表程序。"
 
-msgid "manage password:"
-msgstr "管理密码："
-
 msgid "Basic Setting"
 msgstr "基本设置"
 
@@ -55,11 +52,23 @@ msgstr "用户手册"
 msgid "Allow Access From Internet"
 msgstr "允许从外网访问"
 
-msgid "Default username and password:"
-msgstr "默认用户名和密码："
-
 msgid "Enable Logs"
 msgstr "启用日志"
 
 msgid "Clear logs"
 msgstr "清空日志"
+
+msgid "View Password"
+msgstr "查看密码"
+
+msgid "Username:"
+msgstr "用户名："
+
+msgid "Password:"
+msgstr "密码："
+
+msgid "Reading..."
+msgstr "读取中..."
+
+msgid "Read"
+msgstr "读取"

From fb48d47f2ab56f5cc02212b78b909f657644ed69 Mon Sep 17 00:00:00 2001
From: sbwml <984419930@qq.com>
Date: Thu, 15 Sep 2022 20:37:07 +0800
Subject: [PATCH 16/16] alist: bump to v3.0.0-rc.0

---
 alist/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/alist/Makefile b/alist/Makefile
index ff61c6d2..47e28d15 100644
--- a/alist/Makefile
+++ b/alist/Makefile
@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=alist
-PKG_VERSION:=3.0.0-beta.2
-PKG_WEB_VERSION:=3.0.0-beta.2
+PKG_VERSION:=3.0.0-rc.0
+PKG_WEB_VERSION:=3.0.0-rc.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/alist-org/alist/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=4d8ad4c02db09b117823de7dfbf3ac3dea5bd56613e91899688053fa220acf21
+PKG_HASH:=659ddabc87ceca834a09320c6dd87ab24b16247b992d297b12d9ea4771bed9bf
 
 PKG_LICENSE:=GPL-3.0
 PKG_LICENSE_FILE:=LICENSE
@@ -23,7 +23,7 @@ define Download/$(PKG_NAME)-web
   FILE:=$(PKG_NAME)-web-$(PKG_WEB_VERSION).tar.gz
   URL_FILE:=dist.tar.gz
   URL:=https://github.com/alist-org/alist-web/releases/download/$(PKG_WEB_VERSION)/
-  HASH:=98d84ae80f27da0aa0216f14b0ee3063fe735fe3d2fe894494e07fb3e70b7d46
+  HASH:=55ad8bf4e39e48ff1a0a503783c4e6922e102810cae6dcdf99cec91263c79414
 endef
 
 PKG_CONFIG_DEPENDS:=CONFIG_ALIST_COMPRESS_UPX