From f7e08c8047b02161cfb5155d1f8028a9a1143eaf Mon Sep 17 00:00:00 2001
From: Jeffreytsai1004 <jeffreytsai1004@gmail.com>
Date: Mon, 17 Feb 2025 08:44:22 +0800
Subject: [PATCH] Update

---
 README_CN.md          | 12 ++++++------
 download_resource.bat | 23 +++++++++++++++++++++--
 install.bat           | 33 ++++++++++++++++++++-------------
 3 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/README_CN.md b/README_CN.md
index e951b62..63337fa 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -47,20 +47,20 @@ resource/
 ├── NeuralHaircut/
 │   ├── pretrained_models/
 │   │   ├── diffusion_prior/
-│   │   │   └── dif_ckpt.pt          ## 扩散先验模型
+│   │   │   └── dif_ckpt.pt          # 扩散先验模型
 │   │   └── strand_prior/
-│   │       └── strand_ckpt.pt       ## 股线先验模型
+│   │       └── strand_ckpt.pt       # 股线先验模型
 │   └── PIXIE/
-│       └── pixie_data.tar.gz
+│       └── pixie_data.tar.gz        # PIXIE 模型数据存档
 ├── Matte-Anything/
 │   └── pretrained/
-│       └── ViTMatte_B_DIS.pth
+│       └── ViTMatte_B_DIS.pth       # Matte-Anything 模型
 ├── openpose/
 │   └── models/
-│       └── models.tar.gz
+│       └── models.tar.gz            # OpenPose 模型
 └── hyperIQA/
     └── pretrained/
-        └── koniq_pretrained.pkl
+        └── koniq_pretrained.pkl     # 图像质量评估模型
 ```
 
 ## 环境配置
diff --git a/download_resource.bat b/download_resource.bat
index 11f77f6..5ace385 100644
--- a/download_resource.bat
+++ b/download_resource.bat
@@ -2,6 +2,25 @@
 set PROJECT_DIR=%~dp0
 cd %PROJECT_DIR%
 
+REM 检查是否安装了python
+if not exist "%PROJECT_DIR%\venv\Scripts\python.exe" (
+    echo 错误：未找到python.exe
+    echo 请确保python已安装并配置好环境变量
+    exit /b 1
+)
+
+REM pip安装检查更新
+python -m pip install --upgrade pip
+
+REM 安装gdown
+python -m pip install gdown
+
+REM 安装7z
+python -m pip install py7zr
+
+REM 安装tar
+python -m pip install tar
+
 mkdir %PROJECT_DIR%\resource\NeuralHaircut\
 cd %PROJECT_DIR%\resource\NeuralHaircut\
 python -m gdown --folder https://drive.google.com/drive/folders/1TCdJ0CKR3Q6LviovndOkJaKm8S1T9F_8
@@ -10,7 +29,7 @@ python -m gdown 1_9EOUXHayKiGH5nkrayncln3d6m1uV7f
 mkdir %PROJECT_DIR%\resource\NeuralHaircut\PIXIE
 cd %PROJECT_DIR%\resource\NeuralHaircut\PIXIE
 python -m gdown 1mPcGu62YPc4MdkT8FFiOCP629xsENHZf
-7z x pixie_data.tar.gz -o./
+7z x pixie_data.tar.gz -o./ && tar -xvzf pixie_data.tar.gz
 mkdir %PROJECT_DIR%\resource\hyperIQA\pretrained
 cd %PROJECT_DIR%\resource\hyperIQA\pretrained
 python -m gdown 1OOUmnbvpGea0LIGpIWEbOyxfWx6UCiiE
@@ -24,4 +43,4 @@ python -m gdown 1d97oKuITCeWgai2Tf3iNilt6rMSSYzkW
 
 mkdir %PROJECT_DIR%\resource\openpose\
 cd %PROJECT_DIR%\resource\openpose\
-python -m gdown 1Yn03cKKfVOq4qXmgBMQD20UMRRRkd_tV && tar -xvzf models.tar.gz && rm models.tar.gz
+python -m gdown 1Yn03cKKfVOq4qXmgBMQD20UMRRRkd_tV && tar -xvzf models.tar.gz
diff --git a/install.bat b/install.bat
index e281699..5b19c39 100644
--- a/install.bat
+++ b/install.bat
@@ -166,17 +166,22 @@ IF NOT EXIST "%PROJECT_DIR%\resource" (
     echo ├── NeuralHaircut/
     echo │   ├── pretrained_models/
     echo │   │   ├── diffusion_prior/
-    echo │   │   │   └── dif_ckpt.pt
+    echo │   │   │   └── dif_ckpt.pt          # 扩散先验模型
     echo │   │   └── strand_prior/
-    echo │   │       └── strand_ckpt.pt
+    echo │   │       └── strand_ckpt.pt       # 股线先验模型
     echo │   └── PIXIE/
-    echo │       └── pixie_data/
+    echo │       └── pixie_data/              # PIXIE 模型数据存档
     echo ├── Matte-Anything/
+    echo │   └── pretrained/
+    echo │       └── ViTMatte_B_DIS.pth       # Matte-Anything 模型
     echo ├── openpose/
+    echo │   └── models/
+    echo │       └── models/                  # OpenPose 模型
     echo └── hyperIQA/
+    echo     └── pretrained/
+    echo         └── koniq_pretrained.pkl     # 图像质量评估模型
     exit /b 1
 )
-
 REM 复制模型文件到对应位置
 echo 正在复制模型文件...
 
@@ -190,11 +195,18 @@ mkdir "%PROJECT_DIR%\ext\Matte-Anything\pretrained" 2>nul
 mkdir "%PROJECT_DIR%\ext\openpose\models\pose\coco" 2>nul
 mkdir "%PROJECT_DIR%\ext\hyperIQA\pretrained" 2>nul
 
-xcopy /E /I /Y "%PROJECT_DIR%\resource\NeuralHaircut\*" "%PROJECT_DIR%\ext\NeuralHaircut\"
+REM 复制NeuralHaircut相关文件
+xcopy /Y "%PROJECT_DIR%\resource\NeuralHaircut\*" "%PROJECT_DIR%\ext\NeuralHaircut\"
 xcopy /E /I /Y "%PROJECT_DIR%\resource\NeuralHaircut\PIXIE\*" "%PROJECT_DIR%\ext\PIXIE"
-xcopy /Y "%PROJECT_DIR%\resource\Matte-Anything\*" "%PROJECT_DIR%\ext\Matte-Anything\pretrained\"
-xcopy /Y "%PROJECT_DIR%\resource\openpose\*" "%PROJECT_DIR%\ext\openpose\*"
-xcopy /Y "%PROJECT_DIR%\resource\hyperIQA\*" "%PROJECT_DIR%\ext\hyperIQA\*"
+
+REM 复制Matte-Anything相关文件
+xcopy /Y "%PROJECT_DIR%\resource\Matte-Anything\*" "%PROJECT_DIR%\ext\Matte-Anything\"
+
+REM 复制OpenPose相关文件
+xcopy /E /I /Y "%PROJECT_DIR%\resource\openpose\*" "%PROJECT_DIR%\ext\openpose\"
+
+REM 复制hyperIQA相关文件
+xcopy /Y "%PROJECT_DIR%\resource\hyperIQA\*" "%PROJECT_DIR%\ext\hyperIQA\"
 
 REM 安装 PIXIE 环境
 CALL activate_pixie-env.bat
@@ -215,11 +227,6 @@ pip install -e .
 cd ..
 pip install supervision==0.22.0
 
-mkdir pretrained 2>nul
-cd pretrained
-xcopy /Y "%PROJECT_DIR%\resource\Matte-Anything\*" .
-cd ..
-xcopy /Y "%PROJECT_DIR%\resource\Matte-Anything\model.pth" .
 
 REM 安装 OpenPose
 CALL activate_openpose.bat