diff --git a/applications/luci-app-chinesesubfinder/Makefile b/applications/luci-app-chinesesubfinder/Makefile index f611162..0727273 100644 --- a/applications/luci-app-chinesesubfinder/Makefile +++ b/applications/luci-app-chinesesubfinder/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.0-20221106 +PKG_VERSION:=1.0.0-20221111 PKG_RELEASE:= LUCI_TITLE:=LuCI support for ChineseSubFinder diff --git a/applications/luci-app-chinesesubfinder/luasrc/model/cbi/chinesesubfinder.lua b/applications/luci-app-chinesesubfinder/luasrc/model/cbi/chinesesubfinder.lua index 87681bc..bef9881 100644 --- a/applications/luci-app-chinesesubfinder/luasrc/model/cbi/chinesesubfinder.lua +++ b/applications/luci-app-chinesesubfinder/luasrc/model/cbi/chinesesubfinder.lua @@ -8,8 +8,8 @@ local m, s, o m = taskd.docker_map("chinesesubfinder", "chinesesubfinder", "/usr/libexec/istorec/chinesesubfinder.sh", translate("ChineseSubFinder"), - translate("ChineseSubFinder brings together your personal videos, music, photos, and live television.") - .. translate("Official website:") .. ' https://chinesesubfinder.media/') + translate("ChineseSubFinder is a tool which can download chinese subtitle automaticly.") + .. translate("Official website:") .. ' https://github.com/allanpk716/ChineseSubFinder') s = m:section(SimpleSection, translate("Service Status"), translate("ChineseSubFinder status:")) s:append(Template("chinesesubfinder/status")) diff --git a/applications/luci-app-chinesesubfinder/po/zh-cn/chinesesubfinder.po b/applications/luci-app-chinesesubfinder/po/zh-cn/chinesesubfinder.po index a77f2ab..a51b41b 100644 --- a/applications/luci-app-chinesesubfinder/po/zh-cn/chinesesubfinder.po +++ b/applications/luci-app-chinesesubfinder/po/zh-cn/chinesesubfinder.po @@ -4,8 +4,8 @@ msgstr "Content-Type: text/plain; charset=UTF-8" msgid "Official website:" msgstr "官方网站:" -msgid "ChineseSubFinder brings together your personal videos, music, photos, and live television." -msgstr "ChineseSubFinder 是一个多媒体串流平台。" +msgid "ChineseSubFinder is a tool which can download chinese subtitle automaticly." +msgstr "ChineseSubFinder是一个自动化中文字幕下载工具。" msgid "Config path" msgstr "配置文件路径" diff --git a/applications/luci-app-lanraragi/Makefile b/applications/luci-app-lanraragi/Makefile index e027c82..2ef036e 100644 --- a/applications/luci-app-lanraragi/Makefile +++ b/applications/luci-app-lanraragi/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.0-20221106 +PKG_VERSION:=1.0.0-20221111 PKG_RELEASE:= LUCI_TITLE:=LuCI support for LANraragi diff --git a/applications/luci-app-lanraragi/luasrc/model/cbi/lanraragi.lua b/applications/luci-app-lanraragi/luasrc/model/cbi/lanraragi.lua index 883b16c..843d032 100644 --- a/applications/luci-app-lanraragi/luasrc/model/cbi/lanraragi.lua +++ b/applications/luci-app-lanraragi/luasrc/model/cbi/lanraragi.lua @@ -7,8 +7,9 @@ local lanraragi_model = require "luci.model.lanraragi" local m, s, o m = taskd.docker_map("lanraragi", "lanraragi", "/usr/libexec/istorec/lanraragi.sh", - translate("LANraragi"), - translate("LANraragi is Open source server for archival of comics/manga.") + translate("LANraragi"), + translate("LANraragi is Open source server for archival of comics/manga. ") + .. translate("Default Password:") .. ' kamimamita ' .. translate("Official website:") .. ' https://github.com/Difegue/LANraragi') s = m:section(SimpleSection, translate("Service Status"), translate("LANraragi status:")) @@ -26,8 +27,10 @@ o.datatype = "string" o = s:option(Value, "image_name", translate("Image").."*") o.rmempty = false o.datatype = "string" +o:value("dezhao/lanraragi_cn", "dezhao/lanraragi_cn") +o:value("dezhao/lanraragi_cn:0.8.6", "dezhao/lanraragi_cn:0.8.6") o:value("difegue/lanraragi", "difegue/lanraragi") -o.default = "difegue/lanraragi" +o.default = "dezhao/lanraragi_cn" local blocks = lanraragi_model.blocks() local home = lanraragi_model.home() diff --git a/applications/luci-app-lanraragi/po/zh-cn/lanraragi.po b/applications/luci-app-lanraragi/po/zh-cn/lanraragi.po index 31a9c49..06feaec 100644 --- a/applications/luci-app-lanraragi/po/zh-cn/lanraragi.po +++ b/applications/luci-app-lanraragi/po/zh-cn/lanraragi.po @@ -39,3 +39,6 @@ msgstr "LANraragi 未运行" msgid "Open LANraragi" msgstr "打开 LANraragi" + +msgid "Default Password:" +msgstr "默认密码:" diff --git a/applications/luci-app-lanraragi/root/etc/config/lanraragi b/applications/luci-app-lanraragi/root/etc/config/lanraragi index 3352796..4950c27 100644 --- a/applications/luci-app-lanraragi/root/etc/config/lanraragi +++ b/applications/luci-app-lanraragi/root/etc/config/lanraragi @@ -1,6 +1,6 @@ config main option 'http_port' '3000' - option 'image_name' 'difegue/lanraragi' + option 'image_name' 'dezhao/lanraragi_cn' option 'config_path' '' option 'content_path' '' diff --git a/applications/luci-app-lanraragi/root/usr/libexec/istorec/lanraragi.sh b/applications/luci-app-lanraragi/root/usr/libexec/istorec/lanraragi.sh index 0b4ef14..6928594 100755 --- a/applications/luci-app-lanraragi/root/usr/libexec/istorec/lanraragi.sh +++ b/applications/luci-app-lanraragi/root/usr/libexec/istorec/lanraragi.sh @@ -10,7 +10,7 @@ do_install() { local config=`uci get lanraragi.@main[0].config_path 2>/dev/null` local content=`uci get lanraragi.@main[0].content_path 2>/dev/null` - [ -z "$image_name" ] && image_name="difegue/lanraragi" + [ -z "$image_name" ] && image_name="dezhao/lanraragi_cn" echo "docker pull ${image_name}" docker pull ${image_name} docker rm -f lanraragi diff --git a/applications/luci-app-navidrome/Makefile b/applications/luci-app-navidrome/Makefile index 59d0cbf..7be754b 100644 --- a/applications/luci-app-navidrome/Makefile +++ b/applications/luci-app-navidrome/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.0-20221106 +PKG_VERSION:=1.0.0-20221111 PKG_RELEASE:= LUCI_TITLE:=LuCI support for Navidrome diff --git a/applications/luci-app-navidrome/luasrc/model/cbi/navidrome.lua b/applications/luci-app-navidrome/luasrc/model/cbi/navidrome.lua index fe59702..2fb87ef 100644 --- a/applications/luci-app-navidrome/luasrc/model/cbi/navidrome.lua +++ b/applications/luci-app-navidrome/luasrc/model/cbi/navidrome.lua @@ -8,7 +8,7 @@ local m, s, o m = taskd.docker_map("navidrome", "navidrome", "/usr/libexec/istorec/navidrome.sh", translate("Navidrome"), - translate("Navidrome is Open source server for archival of comics/manga.") + translate("Navidrome is an open source web-based music collection server and streamer.") .. translate("Official website:") .. ' https://github.com/Difegue/Navidrome') s = m:section(SimpleSection, translate("Service Status"), translate("Navidrome status:")) diff --git a/applications/luci-app-photoprism/Makefile b/applications/luci-app-photoprism/Makefile index 9344ca1..beb426b 100644 --- a/applications/luci-app-photoprism/Makefile +++ b/applications/luci-app-photoprism/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.0-20221106 +PKG_VERSION:=1.0.0-20221111 PKG_RELEASE:= LUCI_TITLE:=LuCI support for PhotoPrism diff --git a/applications/luci-app-photoprism/luasrc/model/cbi/photoprism.lua b/applications/luci-app-photoprism/luasrc/model/cbi/photoprism.lua index 40a907f..0812961 100644 --- a/applications/luci-app-photoprism/luasrc/model/cbi/photoprism.lua +++ b/applications/luci-app-photoprism/luasrc/model/cbi/photoprism.lua @@ -8,7 +8,8 @@ local m, s, o m = taskd.docker_map("photoprism", "photoprism", "/usr/libexec/istorec/photoprism.sh", translate("PhotoPrism"), - translate("PhotoPrism® is an AI-Powered Photos App for the Decentralized Web.") + translate("PhotoPrism® is an AI-Powered Photos App for the Decentralized Web. ") + .. translate("Default User:") .. ' admin ' .. translate("Official website:") .. ' https://photoprism.app/') s = m:section(SimpleSection, translate("Service Status"), translate("PhotoPrism status:")) @@ -31,6 +32,11 @@ o:value("photoprism/photoprism:latest", "photoprism/photoprism:latest") o:value("photoprism/photoprism:221105-armv7", "photoprism/photoprism:221105-armv7") o.default = "photoprism/photoprism:latest" +o = s:option(Value, "password", translate("Default Password").."*") +o.password = true +o.rmempty = false +o.datatype = "string" + local blocks = photoprism_model.blocks() local home = photoprism_model.home() diff --git a/applications/luci-app-photoprism/po/zh-cn/photoprism.po b/applications/luci-app-photoprism/po/zh-cn/photoprism.po index ff98767..15ce2ba 100644 --- a/applications/luci-app-photoprism/po/zh-cn/photoprism.po +++ b/applications/luci-app-photoprism/po/zh-cn/photoprism.po @@ -42,3 +42,9 @@ msgstr "可不填,所有硬盘都在" msgid "Picture path" msgstr "图片路径" + +msgid "Default Password" +msgstr "初始密码" + +msgid "Default User:" +msgstr "默认用户:" diff --git a/applications/luci-app-photoprism/root/etc/config/photoprism b/applications/luci-app-photoprism/root/etc/config/photoprism index 9c2109b..069abdf 100644 --- a/applications/luci-app-photoprism/root/etc/config/photoprism +++ b/applications/luci-app-photoprism/root/etc/config/photoprism @@ -2,4 +2,5 @@ config main option 'http_port' '2342' option 'image_name' 'photoprism/photoprism' option 'config_path' '' + option 'password' '' diff --git a/applications/luci-app-photoprism/root/usr/libexec/istorec/photoprism.sh b/applications/luci-app-photoprism/root/usr/libexec/istorec/photoprism.sh index f1389f0..eda78c3 100755 --- a/applications/luci-app-photoprism/root/usr/libexec/istorec/photoprism.sh +++ b/applications/luci-app-photoprism/root/usr/libexec/istorec/photoprism.sh @@ -9,6 +9,7 @@ do_install() { local image_name=`uci get photoprism.@main[0].image_name 2>/dev/null` local config=`uci get photoprism.@main[0].config_path 2>/dev/null` local picture=`uci get photoprism.@main[0].picture_path 2>/dev/null` + local password=`uci get photoprism.@main[0].password 2>/dev/null` [ -z "$image_name" ] && image_name="photoprism/photoprism:latest" echo "docker pull ${image_name}" @@ -24,7 +25,7 @@ do_install() { local cmd="docker run --restart=unless-stopped -d -v \"$config:/photoprism/storage\" --dns=172.17.0.1 -p $http_port:2342 \ -e PHOTOPRISM_UPLOAD_NSFW=\"true\" \ - -e PHOTOPRISM_ADMIN_PASSWORD=\"insecure\" " + -e PHOTOPRISM_ADMIN_PASSWORD=\"$password\" " local tz="`cat /tmp/TZ`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"