fix

woniuzfb · Mar 10, 2024 · 24b998c · 24b998c
1 parent 99dcad8
commit 24b998c
Show file tree

Hide file tree

Showing 31 changed files with 1,776 additions and 615 deletions.
diff --git a/README.md b/README.md
@@ -10,12 +10,12 @@
   - [IBM Cloud Foundry](#ibm-cloud-foundry)
   - [Cloudflare partner,workers](#cloudflare-partnerworkers)
   - [FFmpeg](#ffmpeg)
-    - [编译静态 FFmpeg](#编译静态-ffmpeg)
     - [自动解析直播源](#自动解析直播源)
     - [快捷键](#快捷键)
     - [参数详解](#参数详解)
     - [举例](#举例)
   - [Alist](#alist)
+  - [LianHuanHua](#lianhuanhua)
   - [Dev](#dev)
 
 ## V2ray
@@ -153,15 +153,6 @@ wget https://woniuzfb.github.io/iptv/iptv.sh && bash iptv.sh
 - 节目表
 - VIP
 
-### 编译静态 FFmpeg
-
-``` bash
-cd scripts
-docker build -t ffmpeg-h265-static .
-docker run -it ffmpeg-h265-static
-./build.sh
-```
-
 ### 自动解析直播源
 
 `cx` 打开 xtream codes 账号/频道 管理面板
@@ -266,6 +257,12 @@ docker run -it ffmpeg-h265-static
 ./debug ali
 ```
 
+## LianHuanHua
+
+```bash
+./debug lhh
+```
+
 ## Dev
 
 v2.0.0 broken atm

diff --git a/build b/build
@@ -8,7 +8,7 @@ ReplaceInclude()
         return
     elif [ "$replace_name" == "src/\$self" ] 
     then
-        echo "${2:-}if [ \"\$self\" == \"tv\" ]"
+        echo "${2:-}if [ \"\$self\" == \"tv\" ] || [ \"\$self\" == \"iptv\" ]"
         echo "${2:-}then"
         ReplaceInclude src/tv "    ${2:-}"
         bins=(v2 x nx or pve arm ibm cf cx ali)

diff --git a/core b/core
@@ -33,7 +33,8 @@ EleInArray()
 {
   local ele="$1"
   shift
-  local arr=("$@")
+  local var=("$1"[@])
+  local arr=("${!var}")
   [[ "$ele" == @($(JoinByChar '|' "${arr[@]//|/\\|}")) ]]
 }
 

diff --git a/debug b/debug
@@ -84,90 +84,4 @@ else
     args=("${@:-}")
 fi
 
-Include src/$self "${args[@]}"
-
-if [[ -n ${args[0]+x} ]]
-then
-    case ${args[0]} in
-        4g)
-            Include src/iptv/menu_4gtv "$@"
-        ;;
-        s) 
-            Include src/iptv/menu_listings "$@"
-        ;;
-        singtel) 
-            Include src/iptv/cmd_singtel "$@"
-        ;;
-        astro)
-            Include src/iptv/cmd_astro "$@"
-        ;;
-        m) 
-            Include src/iptv/cmd_monitor "$@"
-        ;;
-        e) 
-            Include src/iptv/cmd_e "$@"
-        ;;
-        ee) 
-            Include src/iptv/cmd_ee "$@"
-        ;;
-        d)
-            Include src/iptv/cmd_default "$@"
-        ;;
-        ffmpeg|FFmpeg) 
-            Include utils/mirror "$@"
-        ;;
-        ts) 
-            Include src/iptv/menu_ts "$@"
-        ;;
-        f|flv) 
-            [ ! -d "$IPTV_ROOT" ] && Println "$error 尚未安装, 请检查 !\n" && exit 1
-            kind="flv"
-            color="$blue"
-            shift
-        ;;
-        v|vip) 
-            [ ! -d "$IPTV_ROOT" ] && Println "$error 尚未安装, 请检查 !\n" && exit 1
-            vip=true
-            shift
-        ;;
-        l|ll) 
-            Include src/iptv/cmd_list "$@"
-        ;;
-        debug)
-            Include src/iptv/cmd_debug "$@"
-        ;;
-        ed|editor)
-            Include src/iptv/cmd_ed "$@"
-        ;;
-        a)
-            Include src/iptv/cmd_a "$@"
-        ;;
-        c)
-            Include src/iptv/cmd_c "$@"
-        ;;
-        color)
-            Include src/iptv/menu_color "$@"
-        ;;
-        curl)
-            Include src/iptv/cmd_curl "$@"
-        ;;
-        b)
-            Include src/iptv/cmd_backup "$@"
-        ;;
-        *)
-        ;;
-    esac
-fi
-
-if [ -z "$*" ]
-then
-    ShFileCheck
-    if [ "${vip:-false}" = true ] 
-    then
-        VipMenu
-    else
-        Menu
-    fi
-else
-    Include src/iptv/cmd_add "$@"
-fi
+Include src/"$self" "${args[@]}"