更新

Author: tonquer

.github/workflows/CI.yml

@@ -141,19 +141,15 @@ jobs:
     env:
       PACKAGENAME: bika_py39_windows_x64
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python 3.9
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: 3.9
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
         pip install pyinstaller
-        pip install sr-vulkan
-        pip install sr-vulkan-model-waifu2x
-        pip install sr-vulkan-model-realcugan
-        pip install sr-vulkan-model-realesrgan
         pip install -r src\requirements.txt
     - name: Build
       run: |
@@ -186,16 +182,16 @@ jobs:
     env:
       PACKAGENAME: bika_py39_nosr_windows_x64
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python 3.9
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: 3.9
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
         pip install pyinstaller
-        pip install -r src\requirements.txt
+        pip install -r src\requirements_nosr.txt
     - name: Build
       run: |
         cd src
@@ -319,10 +315,6 @@ jobs:
         sudo apt-get install -y fuse libfuse2
         python -m pip install --upgrade pip
         pip install pyinstaller
-        pip install sr-vulkan
-        pip install sr-vulkan-model-waifu2x
-        pip install sr-vulkan-model-realcugan
-        pip install sr-vulkan-model-realesrgan
         pip install -r src/requirements.txt
     - name: Build
       run: |

.github/workflows/release.yml

@@ -237,10 +237,6 @@ jobs:
         run: |
           python -m pip install --upgrade pip        
           pip install pyinstaller
-          pip install sr-vulkan
-          pip install sr-vulkan-model-waifu2x
-          pip install sr-vulkan-model-realcugan
-          pip install sr-vulkan-model-realesrgan
           pip install -r src\requirements.txt
           Invoke-WebRequest -Uri "https://github.com/upx/upx/releases/download/v5.0.1/upx-5.0.1-win64.zip" -OutFile "upx.zip"
           Expand-Archive -Path "upx.zip" -DestinationPath "D:\"
@@ -308,7 +304,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install nuitka
-          pip install -r src\requirements.txt
+          pip install -r src\requirements_nosr.txt
           Invoke-WebRequest -Uri "https://github.com/upx/upx/releases/download/v5.0.1/upx-5.0.1-win64.zip" -OutFile "upx.zip"
           Expand-Archive -Path "upx.zip" -DestinationPath "D:\"
           Remove-Item "upx.zip"
@@ -491,8 +487,8 @@ jobs:
               tar -xf /tmp/upx.tar.xz -C /tmp/upx --strip-components=1
               export UPX_BIN=/tmp/upx/upx
               chmod +x "$UPX_BIN"
-              grep -v -i "^pyside6" requirements.txt > /tmp/requirements.txt
-              pip3 install -r /tmp/requirements.txt
+              grep -v -i "^pyside6" requirements_nosr.txt > /tmp/requirements_nosr.txt
+              pip3 install -r /tmp/requirements_nosr.txt
               mkdir -p db
               curl -L -o db/book.db \
                    https://github.com/bika-robot/picacg-database/releases/download/v1.5.3/book.db

src/requirements.txt

@@ -1,9 +1,9 @@
 PySide6==6.5.3
 websocket-client==0.59.0
-#sr-vulkan
-#sr-vulkan-model-waifu2x
-#sr-vulkan-model-realcugan
-#sr-vulkan-model-realesrgan
+sr-vulkan
+sr-vulkan-model-waifu2x
+sr-vulkan-model-realcugan
+sr-vulkan-model-realesrgan
 pillow
 Pysocks
 natsort

src/requirements_nosr.txt

@@ -0,0 +1,16 @@
+PySide6==6.5.3
+websocket-client==0.59.0
+sr-vulkan
+sr-vulkan-model-waifu2x
+sr-vulkan-model-realcugan
+sr-vulkan-model-realesrgan
+pillow
+Pysocks
+natsort
+webdavclient3
+tqdm
+pysmb
+lxml
+httpx
+httpx[http2]
+httpx[socks]

src/start.py

@@ -34,6 +34,19 @@
     if hasattr(es, "msg"):
         config.ErrorMsg = es.msg
 
+
+
+try:
+    import sr_vulkan_model_waifu2x
+    print("import sr_vulkan_model_waifu2x, {}".format(sr_vulkan_model_waifu2x))
+    import sr_vulkan_model_realcugan
+    print("import sr_vulkan_model_waifu2x, {}".format(sr_vulkan_model_realcugan))
+    import sr_vulkan_model_realesrgan
+    print("import sr_vulkan_model_waifu2x, {}".format(sr_vulkan_model_realesrgan))
+except Exception as es:
+    pass
+
+
 from PySide6.QtGui import QFont
 from PySide6 import QtWidgets, QtGui  # 导入PySide6部件
 from PySide6.QtNetwork import QLocalSocket, QLocalServer

src/view/nas/nas_item.py

@@ -180,7 +180,7 @@ def GetNextParams(self):
             upPath = nasInfo.path + "/"
         elif nasInfo.dir_index == 1:
             upPath = nasInfo.path + "/" + ToolUtil.GetCanSaveName(downloadInfo.title) + "/"
-            desFile = os.path.join(desPath, "{}.zip".format(epsInfo.epsTitle))
+            desFile = os.path.join(desPath, "{}.zip".format(ToolUtil.GetCanSaveName(epsInfo.epsTitle)))
         else :
             tick = int(time.time())
             day = time.strftime('%Y-%m-%d', time.localtime(tick))