From 811e9377f762129de1b80bae2bf7473ceac92cca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B6=B5=E6=9B=A6?= <im.hanxi@gmail.com>
Date: Thu, 19 Dec 2024 18:37:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 supervisor.conf    |  1 +
 xiaomusic/utils.py | 20 ++++++++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/supervisor.conf b/supervisor.conf
index 15fd1f6..1879464 100644
--- a/supervisor.conf
+++ b/supervisor.conf
@@ -17,6 +17,7 @@ command=/app/.venv/bin/python3 /app/xiaomusic.py
 directory=/app
 autostart=true
 autorestart=true
+startretries=0
 stderr_logfile=/app/xiaomusic.log.txt
 stdout_logfile=/app/xiaomusic.log.txt
 
diff --git a/xiaomusic/utils.py b/xiaomusic/utils.py
index 3903333..4411829 100644
--- a/xiaomusic/utils.py
+++ b/xiaomusic/utils.py
@@ -17,7 +17,6 @@ import re
 import shutil
 import string
 import subprocess
-import tarfile
 import tempfile
 import urllib.parse
 from collections.abc import AsyncIterator
@@ -1091,17 +1090,30 @@ async def download_and_extract(url: str, target_directory: str):
                     async for chunk in response.content.iter_any():
                         f.write(chunk)
                 log.info(f"文件下载完成: {file_name}")
+
                 # 解压下载的文件
                 if file_name.endswith(".tar.gz"):
-                    with tarfile.open(file_name, "r:gz") as tar:
-                        tar.extractall(path=target_directory)
-                        log.info(f"文件解压完成到: {target_directory}")
+                    await extract_tar_gz(file_name, target_directory)
+                else:
+                    ret = f"下载失败, 包有问题: {file_name}"
+                log.warning(ret)
+
             else:
                 ret = f"下载失败, 状态码: {response.status}"
                 log.warning(ret)
     return ret
 
 
+async def extract_tar_gz(file_name: str, target_directory: str):
+    # 使用 asyncio.create_subprocess_exec 执行 tar 解压命令
+    command = ["tar", "-xzvf", file_name, "-C", target_directory]
+    # 启动子进程执行解压命令
+    proc = await asyncio.create_subprocess_exec(*command)
+    exit_code = await proc.wait()  # 等待子进程完成
+    log.info(f"extract_tar_gz completed with exit code {exit_code}")
+    return exit_code
+
+
 def chmodfile(file_path: str):
     try:
         os.chmod(file_path, 0o775)