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] 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 11ebc45..27d4822 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 be84605..9a15cbd 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 4016647..f8d5e46 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
zcmeI5-ESLN6~JfgG#Mwg-O^@F$d+}ov|Dd)>^P2-G!Ug}lUCif+Yg#umA10SGuPuu
zX66nv*N#IIL6=4FutMTtA9>($#RK9GKtfu?1LB3{afO6<K?3nuAs&!8cgA0F;@uUz
z(CFBm@!WIoIdjf$?w#7la?UsJ-!?f-SD9z4JYA4ZNwO?mNv9=ABCy3^i^4Vp+i>d@
zUV?|*KKP7RB4zLH#ZO+7hQ`*V_`Ss0vGtQf?dNCcVHXlW0!RP}AOR$R1dsp{_`fCa
zd}U-Lb?K7)UY@HJi#AI><=k|P61=mv{l2Dh?ZL*{!;SRAwX3%`(&fJ1a{6L<o9>p=
zoHjWrH&m-m+l?Bv-1afwbvttAa+5iJyUXxc9mbgsrv~*%xoW9Kw|Vcu%{yxk9;I(>
zJZhaPlUY%QQ}-{)lIiHQ>3`b-w@YfBv!Gq-^RSff6T}kN<alagLjL}ED}0-BwOJDT
z;r?KSP{e5JU6;zP%4?zb>CLxq-rw9HAoBek=E0~Cgj@3Km2%pt+tf2PQr_{v$=-Hf
zf6df8d}@7t9#wU_)9W4VJ;(>#%w#SN52scq2ICPi2`b`s<oQ~3BsDoHzxSvGqwZ4=
z=0NZ=)Q=;O9^xUSj@ou{Ad`yf(^8imDSOO<usRpsrJim2KFp0CA>)9OY98e+v_}Ly
zGc=r9n;aZ);I)W2I5;6m@~=`;Q}Pcs+S8viPc^8R`K_Z!f8gzoL$TYe?(m+dI?=;q
zpk7ZPx@R_oAe<kXs?}(THeJ(G#cJpo=yR3VJF7$0bu%0gDtgpbz3sLco9SlNq%iGt
zl~Zool$3ST7pod%o!J-oQmS;8Y1r0Hk7~WPVF`Px#!FRZ1-^%8+@Y0{>#-(icMO6|
zR~sdlS*F&ps<Ry@99gP+*5J!khzzH0ObxzVZPvlcZCw!YnO+e$)VSE45<7e#0VIF~
zkN^@u0!RP}AOR$R1dsp{Kmx~{fXD|#U>ku=e9w;$B!C2v01`j~NB{{S0VIF~kN^@u
z0!ZK(5fI=1N0OgJlYdKoa*V>lP>=u;Kmter2_OL^fCP{L5<mh-00|s(0%szMlu9LI
zO5CVZp9i}f#C%o`<gyZnpTC$+u**e8p(m33hm`y$?C^mEkN^@u0!RP}AOR$R1dsp{
zKmter3B3FSV$qZw<O3o~G!+Xn0Qmd=m;bV21V{i0AOR$R1dsp{Kmter2_OL^fCN5|
zfcX9&|Nh_SQNn&CfCP{L5<mh-00|%gB!C2v01`j~FE@dB;)*mBe<3A{iC5z<lI7vQ
z|98)qn*w@|1dsp{Kmx~@z}R^7PtVo(L|l$>woM(?GJQT%go;4w;?n#~L0>4&%r7ie
zW-3ehxtaW&UR+o#(mARwee2e{`E_UEoohSQyBpWp+e??##lps1;l?|+7LCpPwVUg2
zHFvMui^byAIs5LqUZ`JpF5lXGn6I#^Q(Llp?m;=QA#mVHJUGAVnd)4t4pZ290y<Z3
z^mNuev&Ol*oXc5EQ>_~F`SQZj>}+n!XO8D;T{Y#FP*a%Zl~gxS@<9s@vyPM1%p7#&
zs-{H)%}^~mHXixI`5(R!9|ssNR8ms4-I7NQ|KjR0{ClGBJ<iWuehRPoCpzrs9?#Cq
zi{@Mrj*3q+PqLY3h5auyboAom$IDIKG)%ty^y#xanHPG?hlH7Di~D=a%X`9sqk8jX
zVSn$C*5J{_{XMXBSRwOlZjb}Qw?Rrlw1>@QAfUoPrGcU5$=pDt;{M^&4Dw1qS<Z}J
zT;0s5nnr!U6in@vi`h3b7eu`&xYE*Jlfk^QOlP~NMAj@+pQ=z#4ESw4m<U=ON=4b`
zcW9}?^xd}hNBx~OsGrvE{9s&YDz2(+L&dL>C|PAO==SQg!k8tDo0(vUsK{0l)6ma7
z$w3Lc^*b9`ThBomx6sL}p``{4V?p&f*HU-eb|PSBDjcBJb@PY;i7U|=7OaDCfX1LY
zm{>q!Eo}LEYb_YHT)6C+XTZWT*cDqfo!}_zH;iy~L=smbf4=noWZ<`1^`I0R)ZwBH
zlkWJ>Mq|@D(+F%$(zJZBHHqtTu{Ecc(=Z@5eaF;1=CdlFUY>3{A=I<1S~WGQx~`wK
zpnh3aV|I?Yxu8$=-R7$AX)9l&qTtsw5teQ+W>~bx44l}{8i6#>HiYgfjBlx3pm0@n
zo$4zB-t=f}AM8xKdbRD_z4hzaEx*TN0HnnS#zAKe>X8LLQ7>ELwzVp*TiY$LIJz&c
zS|sslWaxAN30k6Loz=zE9wGlFxNLBffr@7(QMS;x3-zUzzWf_i=*LW3%$}fk%QXl$
zt5ve)QiHgTK@77>Dz;1D`VdoN#NVkBaL{er_}-1cMmTfAGr04_-fj@JVG^4)h-Wt{
zLd7OktI<}wxf-a2)1{?WfB~vTm|+lmUL`wfgD@9XMHsF8%G7(YKuHKfcR7@41Vm!9
zNE5a#wV@J-7OL-YlllbeDUvOp*gEW)Lp0`8iRqZ6QK!VMxy0Qi6_rDf+%z2KQL+n0
z42ZHuG@`jKsgWA&In1&K=fw9of!c_~^NHnYEytw&*Wwc^F{Q>}rotIG%xNh82Spe!
zFU`75pIT6uuG1v7^D$*|1{O<9sRANU$bm`9{l0ZDttjK+FtJjO9+Uh)da>VYsy*E`
z-GP~;Q<&yn)}cK2g_d6O=hDAJbK;c$v#npA2G<ltr&YCXiL!z)%Y3-O6<RkxINguW
z#3vpra0fHsH}Rr+UvOPj%L=K%0qOP;adRu#nIUB=7g+X1txRrmi>`@x6X`1R(sy0z
zy!+r`crSVLtn#{GC@VeprK3@bzrW8@{bp~2+0YbpZ;H1Miqfh4*y;F2*a83Pi(5xW
zeEtnFUWQwtC<ECjWM{LpGZm;)nVk*CL`D;Tl!g)?ONoz@d&wUqe;@zX;b-Ef-DmRL
z(a&T2z7a!10!RP}AOR$R1dsp{Kmter3B23{;B(*af?Q!5j(**nkbVsWzX%18g#IeD
ze%8t@pM&EMd(*|Qg5dqWyy7It+=HpauYl-jS0oaM6Cir4KW+GB5Ei?M!W1+w983tl
z0-`eqQ-I^i=<9ONhwHP+pGY6|W$n&@?88GzsxN``yFH1i)6ix;si;%XF7>39lF+`}
zlP^j@d$pSiibHeuU<&3Wh|UEfk!2Z!R#M~}AxC2|Z*(j=DYp_ZF(o=Ki<F0w{8ak-
zp?t*%NY8iE5J8G!7-Xka$6<9xqc(N;i9~ct?j|ILV1AzOWC}!qzf>zdAQBB@t(?Gr
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 d6c147a..8606df9 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 a38d5e1..fe448e1 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