From dbe129921f9fc562d20d591b7f1c354aa0e34cb2 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 19 Jun 2023 16:23:21 +0800
Subject: [PATCH] update 2023-06-19 16:23:21

---
 luci-app-emby/Makefile                        |  2 +-
 luci-app-emby/luasrc/view/emby/status.htm     |  2 +-
 luci-app-emby/po/zh-cn/emby.po                |  3 +++
 .../root/usr/libexec/istorec/emby.sh          |  2 +-
 luci-app-jellyfin/Makefile                    |  2 +-
 luci-app-jellyfin/po/zh-cn/jellyfin.po        |  2 +-
 .../root/usr/libexec/istorec/jellyfin.sh      |  2 +-
 luci-app-owntone/Makefile                     |  2 +-
 luci-app-owntone/luasrc/model/cbi/owntone.lua |  2 +-
 luci-app-owntone/po/zh-cn/owntone.po          |  4 +--
 luci-app-photoprism/Makefile                  |  2 +-
 .../luasrc/model/cbi/photoprism.lua           |  1 -
 .../root/usr/libexec/istorec/photoprism.sh    |  2 +-
 luci-app-plex/Makefile                        |  2 +-
 .../root/usr/libexec/istorec/plex.sh          |  4 +--
 luci-app-serverchan/Makefile                  |  2 +-
 .../root/usr/share/wechatpush/wechatpush      | 26 ++++++++++++++-----
 luci-app-unifi/Makefile                       |  2 +-
 luci-app-unifi/luasrc/model/cbi/unifi.lua     |  2 +-
 luci-app-unifi/luasrc/view/unifi/status.htm   |  2 +-
 luci-app-unifi/po/zh-cn/unifi.po              |  4 +--
 .../root/usr/libexec/istorec/unifi.sh         |  3 +--
 luci-app-xteve/Makefile                       |  2 +-
 luci-app-xteve/luasrc/model/cbi/xteve.lua     |  1 -
 xray-core/Makefile                            |  4 +--
 25 files changed, 47 insertions(+), 35 deletions(-)

diff --git a/luci-app-emby/Makefile b/luci-app-emby/Makefile
index 63aac84d8..0cc75224c 100644
--- a/luci-app-emby/Makefile
+++ b/luci-app-emby/Makefile
@@ -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
diff --git a/luci-app-emby/luasrc/view/emby/status.htm b/luci-app-emby/luasrc/view/emby/status.htm
index 66da12aa5..d99e2e903 100644
--- a/luci-app-emby/luasrc/view/emby/status.htm
+++ b/luci-app-emby/luasrc/view/emby/status.htm
@@ -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">
diff --git a/luci-app-emby/po/zh-cn/emby.po b/luci-app-emby/po/zh-cn/emby.po
index 5770b5b88..c277ceb46 100644
--- a/luci-app-emby/po/zh-cn/emby.po
+++ b/luci-app-emby/po/zh-cn/emby.po
@@ -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 冲突"
\ No newline at end of file
diff --git a/luci-app-emby/root/usr/libexec/istorec/emby.sh b/luci-app-emby/root/usr/libexec/istorec/emby.sh
index 1bfa94b0a..a830ccaf4 100755
--- a/luci-app-emby/root/usr/libexec/istorec/emby.sh
+++ b/luci-app-emby/root/usr/libexec/istorec/emby.sh
@@ -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
diff --git a/luci-app-jellyfin/Makefile b/luci-app-jellyfin/Makefile
index e7fb51aa9..8fedb7702 100644
--- a/luci-app-jellyfin/Makefile
+++ b/luci-app-jellyfin/Makefile
@@ -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
diff --git a/luci-app-jellyfin/po/zh-cn/jellyfin.po b/luci-app-jellyfin/po/zh-cn/jellyfin.po
index 6f88172fb..1249de0a0 100644
--- a/luci-app-jellyfin/po/zh-cn/jellyfin.po
+++ b/luci-app-jellyfin/po/zh-cn/jellyfin.po
@@ -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，请确保有足够空间"
diff --git a/luci-app-jellyfin/root/usr/libexec/istorec/jellyfin.sh b/luci-app-jellyfin/root/usr/libexec/istorec/jellyfin.sh
index 07dd51419..65a302695 100755
--- a/luci-app-jellyfin/root/usr/libexec/istorec/jellyfin.sh
+++ b/luci-app-jellyfin/root/usr/libexec/istorec/jellyfin.sh
@@ -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
diff --git a/luci-app-owntone/Makefile b/luci-app-owntone/Makefile
index e8240dc36..d4f2313a1 100644
--- a/luci-app-owntone/Makefile
+++ b/luci-app-owntone/Makefile
@@ -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
diff --git a/luci-app-owntone/luasrc/model/cbi/owntone.lua b/luci-app-owntone/luasrc/model/cbi/owntone.lua
index 63eae7d10..4718fab24 100644
--- a/luci-app-owntone/luasrc/model/cbi/owntone.lua
+++ b/luci-app-owntone/luasrc/model/cbi/owntone.lua
@@ -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")
diff --git a/luci-app-owntone/po/zh-cn/owntone.po b/luci-app-owntone/po/zh-cn/owntone.po
index b8da24342..b480063a0 100644
--- a/luci-app-owntone/po/zh-cn/owntone.po
+++ b/luci-app-owntone/po/zh-cn/owntone.po
@@ -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"
diff --git a/luci-app-photoprism/Makefile b/luci-app-photoprism/Makefile
index efeaa86f6..47014d7ce 100644
--- a/luci-app-photoprism/Makefile
+++ b/luci-app-photoprism/Makefile
@@ -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
diff --git a/luci-app-photoprism/luasrc/model/cbi/photoprism.lua b/luci-app-photoprism/luasrc/model/cbi/photoprism.lua
index 901d98f8f..91366d57a 100644
--- a/luci-app-photoprism/luasrc/model/cbi/photoprism.lua
+++ b/luci-app-photoprism/luasrc/model/cbi/photoprism.lua
@@ -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
diff --git a/luci-app-photoprism/root/usr/libexec/istorec/photoprism.sh b/luci-app-photoprism/root/usr/libexec/istorec/photoprism.sh
index ce95d04a7..9194458a1 100755
--- a/luci-app-photoprism/root/usr/libexec/istorec/photoprism.sh
+++ b/luci-app-photoprism/root/usr/libexec/istorec/photoprism.sh
@@ -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
diff --git a/luci-app-plex/Makefile b/luci-app-plex/Makefile
index 6082c1257..53adb41fc 100644
--- a/luci-app-plex/Makefile
+++ b/luci-app-plex/Makefile
@@ -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
diff --git a/luci-app-plex/root/usr/libexec/istorec/plex.sh b/luci-app-plex/root/usr/libexec/istorec/plex.sh
index 2b0f3e6da..c782067f8 100755
--- a/luci-app-plex/root/usr/libexec/istorec/plex.sh
+++ b/luci-app-plex/root/usr/libexec/istorec/plex.sh
@@ -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
diff --git a/luci-app-serverchan/Makefile b/luci-app-serverchan/Makefile
index cab043458..2e598e448 100755
--- a/luci-app-serverchan/Makefile
+++ b/luci-app-serverchan/Makefile
@@ -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>
diff --git a/luci-app-serverchan/root/usr/share/wechatpush/wechatpush b/luci-app-serverchan/root/usr/share/wechatpush/wechatpush
index d60b96c72..4f18c87f3 100755
--- a/luci-app-serverchan/root/usr/share/wechatpush/wechatpush
+++ b/luci-app-serverchan/root/usr/share/wechatpush/wechatpush
@@ -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"
diff --git a/luci-app-unifi/Makefile b/luci-app-unifi/Makefile
index 2a813de61..057101363 100644
--- a/luci-app-unifi/Makefile
+++ b/luci-app-unifi/Makefile
@@ -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
diff --git a/luci-app-unifi/luasrc/model/cbi/unifi.lua b/luci-app-unifi/luasrc/model/cbi/unifi.lua
index ea53ec0cf..460ad5d51 100644
--- a/luci-app-unifi/luasrc/model/cbi/unifi.lua
+++ b/luci-app-unifi/luasrc/model/cbi/unifi.lua
@@ -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
 
diff --git a/luci-app-unifi/luasrc/view/unifi/status.htm b/luci-app-unifi/luasrc/view/unifi/status.htm
index 61ebb6782..340105fce 100644
--- a/luci-app-unifi/luasrc/view/unifi/status.htm
+++ b/luci-app-unifi/luasrc/view/unifi/status.htm
@@ -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">
diff --git a/luci-app-unifi/po/zh-cn/unifi.po b/luci-app-unifi/po/zh-cn/unifi.po
index b74fa190d..4c7a877fd 100644
--- a/luci-app-unifi/po/zh-cn/unifi.po
+++ b/luci-app-unifi/po/zh-cn/unifi.po
@@ -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，注意此端口可能与其他应用冲突"
diff --git a/luci-app-unifi/root/usr/libexec/istorec/unifi.sh b/luci-app-unifi/root/usr/libexec/istorec/unifi.sh
index 78ae5d264..c490395d4 100755
--- a/luci-app-unifi/root/usr/libexec/istorec/unifi.sh
+++ b/luci-app-unifi/root/usr/libexec/istorec/unifi.sh
@@ -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
diff --git a/luci-app-xteve/Makefile b/luci-app-xteve/Makefile
index 68238e2a7..d3d1d9298 100644
--- a/luci-app-xteve/Makefile
+++ b/luci-app-xteve/Makefile
@@ -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
diff --git a/luci-app-xteve/luasrc/model/cbi/xteve.lua b/luci-app-xteve/luasrc/model/cbi/xteve.lua
index e11fd5948..05e1a6770 100644
--- a/luci-app-xteve/luasrc/model/cbi/xteve.lua
+++ b/luci-app-xteve/luasrc/model/cbi/xteve.lua
@@ -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
diff --git a/xray-core/Makefile b/xray-core/Makefile
index 03dc56155..8b7fb170e 100644
--- a/xray-core/Makefile
+++ b/xray-core/Makefile
@@ -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