From 40e9ef34c91911326bcf6c81db9bb4e04bfa84fb Mon Sep 17 00:00:00 2001
From: monlor <me@monlor.com>
Date: Thu, 27 Feb 2025 15:48:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E5=AE=B9=E5=99=A8=E5=86=85xiaoya=E8=87=AA=E5=8A=A8=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md              |  1 -
 alist/README.md        |  2 --
 alist/fix_media.sh     |  2 ++
 alist/start.sh         | 17 ++++---------
 docker-compose-all.yml | 58 ------------------------------------------
 docker-compose.yml     |  2 ++
 env                    |  4 +--
 helmfile.yaml          |  1 -
 8 files changed, 10 insertions(+), 77 deletions(-)
 delete mode 100644 docker-compose-all.yml

diff --git a/README.md b/README.md
index f13f3b1..a209d09 100644
--- a/README.md
+++ b/README.md
@@ -217,7 +217,6 @@ docker run -d --name alist \
     -e ALIYUN_OPEN_TOKEN=阿里云盘Open Token \
     -e ALIYUN_FOLDER_ID=阿里云盘文件夹ID \
     -e QUARK_COOKIE=夸克网盘cookie \
-    -e AUTO_UPDATE_ENABLED=true \
     -e AUTO_CLEAR_ENABLED=true \
     --network=xiaoya \
     ghcr.io/monlor/xiaoya-alist 
diff --git a/alist/README.md b/alist/README.md
index 4f6dd6f..c97f7a0 100644
--- a/alist/README.md
+++ b/alist/README.md
@@ -50,8 +50,6 @@ docker run -d -p 5678:80 -p 2345:2345 -p 2346:2346 --restart=unless-stopped --na
 
 `EMBY_APIKEY`: 填入一个emby的api key，用于在infuse中播放emby
 
-`AUTO_UPDATE_ENABLED`: 每天自动更新小雅的文件，true/false，默认false
-
 `AUTO_CLEAR_ENABLED`: 自动清理阿里云云盘的文件，true/false，默认false
 
 `AUTO_CLEAR_INTERVAL`: 自动清理间隔，单位分钟，范围0-60分钟，默认10分钟
diff --git a/alist/fix_media.sh b/alist/fix_media.sh
index f0fd0f2..5819dfe 100644
--- a/alist/fix_media.sh
+++ b/alist/fix_media.sh
@@ -5,6 +5,8 @@ while ! test -f /etc/nginx/http.d/emby.js; do
     sleep 2
 done
 
+echo "修复emby.js..."
+
 sed -i '/async function fetchXYApi/{:a;N;$!ba;d}' /etc/nginx/http.d/emby.js
 
 cat >> /etc/nginx/http.d/emby.js <<-\EOF
diff --git a/alist/start.sh b/alist/start.sh
index b7cb0a1..0148a98 100644
--- a/alist/start.sh
+++ b/alist/start.sh
@@ -189,15 +189,7 @@ echo "http://127.0.0.1:5233/data" > /data/download_url.txt
 
 crontabs=""
 
-if [ "${AUTO_UPDATE_ENABLED:=false}" = "true" ]; then
-    echo "启动定时更新定时任务..."
-    # 随机生成一个时间，避免给服务器造成压力
-    random_min=$(shuf -i 0-59 -n 1)
-    random_hour=$(shuf -i 2-6 -n 1)
-    crontabs="${random_min} ${random_hour} * * * /service.sh update"
-fi
-
-if [ "${AUTO_CLEAR_ENABLED:=false}" = "true" ]; then
+if [ "${AUTO_CLEAR_ENABLED:=true}" = "true" ]; then
     echo "启动定时清理定时任务..."
     AUTO_CLEAR_INTERVAL=${AUTO_CLEAR_INTERVAL:=10}
     HOURS=$(($AUTO_CLEAR_INTERVAL / 60))
@@ -226,13 +218,14 @@ fi
 # 设置本地变量
 echo "${EMBY_APIKEY:-e825ed6f7f8f44ffa0563cddaddce14d}" > /data/infuse_api_key.txt
 
-if [ "${AUTO_UPDATE_MEDIA_ADDR:=true}" = "true" ]; then
+if [ "${AUTO_UPDATE_MEDIA_ADDR:=false}" = "true" ]; then
     echo "开始自动更新媒体服务地址..."
     /update_media_addr.sh &> /dev/null &
 fi
 
 /fix_media.sh &
 
-/entrypoint.sh /opt/alist/alist server --no-prefix &
+crond
 
-exec crond -f
+/entrypoint.sh /opt/alist/alist server --no-prefix
+ 
diff --git a/docker-compose-all.yml b/docker-compose-all.yml
deleted file mode 100644
index 56e2f29..0000000
--- a/docker-compose-all.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-services:
-  alist:
-    image: ghcr.io/monlor/xiaoya-alist:latest
-    volumes:
-      - xiaoya:/data
-    ports:
-      - "5678:5678"
-      - "2345:2345"
-      - "2346:2346"
-    env_file:
-      - env
-    restart: unless-stopped
-    networks:
-      - default
-  metadata:
-    image: ghcr.io/monlor/xiaoya-metadata:latest
-    environment:
-      - EMBY_ENABLED=true
-    env_file:
-      - env
-    volumes:
-      - xiaoya:/etc/xiaoya
-      - media:/media/xiaoya
-      - config:/media/config
-      - cache:/media/config/cache
-      - meta:/media/temp
-    depends_on:
-      - alist
-    restart: unless-stopped
-    networks:
-      - default
-  emby:
-    image: ghcr.io/monlor/xiaoya-embyserver:latest
-    env_file:
-      - env
-    depends_on:
-      - metadata
-      - alist
-    volumes:
-      - media:/media
-      - config:/config
-      - cache:/cache
-    ports:
-      - "6908:6908"
-    restart: unless-stopped
-    networks:
-      - default
-
-networks:
-  default:
-
-volumes:
-  xiaoya:
-  media:
-  config:
-  cache:
-  meta:
-  
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 8cfa517..eb7ed3f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,6 +7,8 @@ services:
       - "5678:5678"
       - "2345:2345"
       - "2346:2346"
+    environment:
+      - AUTO_UPDATE_MEDIA_ADDR=true
     env_file:
       - env
     restart: unless-stopped
diff --git a/env b/env
index 247a5da..af671e3 100644
--- a/env
+++ b/env
@@ -13,10 +13,8 @@ PAN115_COOKIE=
 ALIYUN_TO_115=
 # 115网盘文件夹ID
 PAN115_FOLDER_ID=
-# 自动更新小雅alist文件
-AUTO_UPDATE_ENABLED=false
 # 自动清理阿里云盘
-AUTO_CLEAR_ENABLED=true
+AUTO_CLEAR_ENABLED=
 # 阿里云盘自动清理间隔，单位分钟，范围0-60分钟，默认10分钟
 AUTO_CLEAR_INTERVAL=
 # pikpak 账号，用来观看小雅中pikpak分享给你的资源，格式：`qqq@qq.com:aaadds`
diff --git a/helmfile.yaml b/helmfile.yaml
index 0f941a6..0135b0b 100644
--- a/helmfile.yaml
+++ b/helmfile.yaml
@@ -24,7 +24,6 @@ releases:
           pullPolicy: Always
         env:
           TZ: Asia/Shanghai
-          AUTO_UPDATE_ENABLED: true
           AUTO_CLEAR_ENABLED: true
           WEBDAV_PASSWORD: 
           ALIYUN_TOKEN: