update 2023-06-19 16:23:21

This commit is contained in:
github-actions[bot] 2023-06-19 16:23:21 +08:00
parent c0d29991dd
commit dbe129921f
25 changed files with 47 additions and 35 deletions

View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk
PKG_VERSION:=1.0.1-20230108
PKG_VERSION:=1.0.2-20230619
PKG_RELEASE:=
LUCI_TITLE:=LuCI support for Emby

View File

@ -18,7 +18,7 @@ local container_running = container_status == "running"
if container_running then
local port=util.trim(util.exec("/usr/libexec/istorec/emby.sh port"))
if port == "" then
port="8097"
port="8096"
end
-%>
<div class="cbi-value cbi-value-last">

View File

@ -39,3 +39,6 @@ msgstr "打开 Emby"
msgid "Not required, all disk is mounted in"
msgstr "可不填,所有硬盘都在"
msgid "Emby running in host network, for DLNA application, port is always 8096 if enabled"
msgstr "在宿主网络运行 Emby以支持 DLNA 等应用例如投屏如果启用则端口固定为8096需注意端口与 Jellyfin 冲突"

View File

@ -84,7 +84,7 @@ case ${ACTION} in
docker ps --all -f 'name=emby' --format '{{.State}}'
;;
"port")
docker ps --all -f 'name=emby' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://'
docker ps --all -f 'name=emby' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*->8096/tcp' | sed 's/0.0.0.0:\([0-9]*\)->.*/\1/'
;;
*)
usage

View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk
PKG_VERSION:=1.1.7-20230108
PKG_VERSION:=1.1.8-20230619
PKG_RELEASE:=
LUCI_TITLE:=LuCI support for jellyfin

View File

@ -38,7 +38,7 @@ msgid "Host network"
msgstr "宿主网络"
msgid "Jellyfin running in host network, for DLNA application, port is always 8096 if enabled"
msgstr "在宿主网络运行 Jellyfin以支持 DLNA 等应用例如投屏如果启用则端口固定为8096"
msgstr "在宿主网络运行 Jellyfin以支持 DLNA 等应用例如投屏如果启用则端口固定为8096,需注意端口与 Emby 冲突"
msgid "Default use 'transcodes' in 'config path' if not set, please make sure there has enough space"
msgstr "留空则使用配置文件路径下的 transcodes请确保有足够空间"

View File

@ -142,7 +142,7 @@ case ${ACTION} in
docker ps --all -f 'name=jellyfin' --format '{{.State}}'
;;
"port")
docker ps --all -f 'name=jellyfin' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://'
docker ps --all -f 'name=jellyfin' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*->8096/tcp' | sed 's/0.0.0.0:\([0-9]*\)->.*/\1/'
;;
*)
usage

View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk
PKG_VERSION:=1.0.1-20230108
PKG_VERSION:=1.0.2-20230619
PKG_RELEASE:=
LUCI_TITLE:=LuCI support for Owntone

View File

@ -18,7 +18,7 @@ s = m:section(TypedSection, "main", translate("Setup"), translate("The following
s.addremove=false
s.anonymous=true
o = s:option(Value, "image_name", translate("Image").."<b>*</b>", translate("Owntone only works in host network"))
o = s:option(Value, "image_name", translate("Image").."<b>*</b>", translate("Owntone only works in host network with port 3689"))
o.rmempty = false
o.datatype = "string"
o:value("lscr.io/linuxserver/daapd:latest", "lscr.io/linuxserver/daapd:latest")

View File

@ -34,5 +34,5 @@ msgstr "Owntone 未运行"
msgid "Open Owntone"
msgstr "打开 Owntone"
msgid "Owntone only works in host network"
msgstr "Owntone 只工作在 Host 网络"
msgid "Owntone only works in host network with port 3689"
msgstr "Owntone 只工作在宿主网络,管理端口 3689"

View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk
PKG_VERSION:=1.0.1-20230108
PKG_VERSION:=1.0.2-20230619
PKG_RELEASE:=
LUCI_TITLE:=LuCI support for PhotoPrism

View File

@ -23,7 +23,6 @@ o = s:option(Value, "http_port", translate("HTTP Port").."<b>*</b>")
o.rmempty = false
o.default = "2342"
o.datatype = "string"
o:depends("hostnet", 0)
o = s:option(Value, "image_name", translate("Image").."<b>*</b>")
o.rmempty = false

View File

@ -67,7 +67,7 @@ case ${ACTION} in
docker ps --all -f 'name=photoprism' --format '{{.State}}'
;;
"port")
docker ps --all -f 'name=photoprism' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://'
docker ps --all -f 'name=photoprism' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*->2342/tcp' | sed 's/0.0.0.0:\([0-9]*\)->.*/\1/'
;;
*)
usage

View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk
PKG_VERSION:=1.0.1-20230108
PKG_VERSION:=1.0.2-20230619
PKG_RELEASE:=
LUCI_TITLE:=LuCI support for Plex

View File

@ -98,9 +98,7 @@ case ${ACTION} in
docker ps --all -f 'name=plex' --format '{{.State}}'
;;
"port")
local port=`docker ps --all -f 'name=plex' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*->32400/tcp' | sed 's/0.0.0.0:\([0-9]*\)->.*/\1/'`
[ -z "$port" ] && port=32400
echo $port
docker ps --all -f 'name=plex' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*->32400/tcp' | sed 's/0.0.0.0:\([0-9]*\)->.*/\1/'
;;
*)
usage

View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-wechatpush
PKG_VERSION:=3.3.0
PKG_VERSION:=3.3.1
PKG_RELEASE:=12
PKG_MAINTAINER:=tty228 <tty228@yeah.net>

View File

@ -1129,20 +1129,34 @@ function get_disk() {
last_disk_time=$(date -r "${file_path}" +%s 2>/dev/null) || last_disk_time=0
if [ $(( $(date +%s) - $last_disk_time )) -gt 86000 ]; then
eval ${tmp_command} smartctl -i -n standby "/dev/${tmp_name}" | grep "STANDBY" && {
echo "STANDBY" > "${file_path}"
} || \
eval ${tmp_command} smartctl -i -n standby "/dev/${tmp_name}" | grep "No such device\|Unknown USB bridge" | grep "STANDBY" && {
disk_info=$(eval ${tmp_command} smartctl -i -n standby "/dev/${tmp_name}")
echo "$disk_info" | grep "No such device\|Unknown USB bridge\|QEMU HARDDISK" && {
continue
} || \
echo "$disk_info" | grep "STANDBY" && {
echo "$disk_info" > "${file_path}"
} || \
eval ${tmp_command} smartctl -a -j /dev/${tmp_name} > ${file_path}
fi
# 硬盘状态
if [ -f "${file_path}" ] && ( ! cat "${file_path}" | grep -q -v "STANDBY" ); then
printf "\n${str_title_start} 硬盘名称:${tmp_name}${disk_type}${str_title_end}\n${str_tab}硬盘休眠中" >> "$output_dir/get_disk"
disk_name=$(awk '/Device Model/{print $NF}' "$file_path")
[[ -n $disk_name && $disk_name != null && $disk_name != 0 ]] && {
[ $(length_str "$disk_name") -gt "20" ] && disk_name=$(echo "$disk_name" | awk '{print $1, $NF}')
[ $(length_str "$disk_name") -gt "20" ] && disk_name=$(cut_str "$disk_name" "20")
}
printf "\n${str_title_start} 硬盘名称:${disk_name}${disk_type}${str_title_end}\n${str_tab}硬盘休眠中" >> "$output_dir/get_disk"
elif [ -f "${file_path}" ]; then
printf "\n${str_title_start} 硬盘名称:${tmp_name}${disk_type}${str_title_end}" >> "$output_dir/get_disk"
# 硬盘名称
disk_name=$(jq -r .model_name ${file_path})
[[ -n $disk_name && $disk_name != null && $disk_name != 0 ]] && {
[ $(length_str "$disk_name") -gt "20" ] && disk_name=$(echo "$disk_name" | awk '{print $1, $NF}')
[ $(length_str "$disk_name") -gt "20" ] && disk_name=$(cut_str "$disk_name" "20")
}
printf "\n${str_title_start} 硬盘名称:${disk_name}${disk_type}${str_title_end}" >> "$output_dir/get_disk"
# 硬盘错误
disk_err=$(jq -r .ata_smart_error_log.summary.count ${file_path})
[[ -n $disk_err && $disk_err != null && $disk_err != 0 ]] && printf "\n${str_tab}硬盘错误:${disk_err}" >> "$output_dir/get_disk"

View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk
PKG_VERSION:=1.0.1-20230108
PKG_VERSION:=1.0.2-20230619
PKG_RELEASE:=
LUCI_TITLE:=LuCI support for UnifiController

View File

@ -18,7 +18,7 @@ s = m:section(TypedSection, "main", translate("Setup"), translate("The following
s.addremove=false
s.anonymous=true
o = s:option(Flag, "hostnet", translate("Host network"), translate("UnifiController running in host network, for DLNA application, port is always 8096 if enabled"))
o = s:option(Flag, "hostnet", translate("Host network"), translate("UnifiController running in host network, port is always 8443 if enabled"))
o.default = 0
o.rmempty = false

View File

@ -18,7 +18,7 @@ local container_running = container_status == "running"
if container_running then
local port=util.trim(util.exec("/usr/libexec/istorec/unifi.sh port"))
if port == "" then
port="8083"
port="8443"
end
-%>
<div class="cbi-value cbi-value-last">

View File

@ -37,5 +37,5 @@ msgstr "UnifiController 未运行"
msgid "Open UnifiController"
msgstr "打开 UnifiController"
msgid "Not required, all disk is mounted in"
msgstr "可不填,所有硬盘都在"
msgid "UnifiController running in host network, port is always 8443 if enabled"
msgstr "在宿主网络运行 UnifiController如果启用则端口固定为8443注意此端口可能与其他应用冲突"

View File

@ -75,8 +75,7 @@ case ${ACTION} in
docker ps --all -f 'name=unifi' --format '{{.State}}'
;;
"port")
http_port=`uci get unifi.@main[0].http_port 2>/dev/null`
echo $http_port
docker ps --all -f 'name=unifi' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*->8443/tcp' | sed 's/0.0.0.0:\([0-9]*\)->.*/\1/'
;;
*)
usage

View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk
PKG_VERSION:=1.0.1-20230108
PKG_VERSION:=1.0.2-20230619
PKG_RELEASE:=
LUCI_TITLE:=LuCI support for Xteve

View File

@ -26,7 +26,6 @@ s.anonymous=true
o = s:option(Value, "port", translate("Port").."<b>*</b>")
o.default = "32400"
o.datatype = "port"
o:depends("hostnet", 0)
o = s:option(Value, "image_name", translate("Image").."<b>*</b>")
o.rmempty = false

View File

@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=xray-core
PKG_VERSION:=1.8.1
PKG_VERSION:=1.8.3
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/XTLS/Xray-core/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=477ad92b80700b4742e59ad7848ca4726201841a57339e4c1bf9012e395622e2
PKG_HASH:=bdfa65c15cd25f931745d9c70c753503db5d119ff11960ca7b3a2e19c4b0a8d1
PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
PKG_LICENSE:=MPL-2.0