update

tonquer · Oct 29, 2024 · 2596466 · 2596466
1 parent 86324d1
commit 2596466
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 5 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -80,6 +80,7 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install pyinstaller==4.8
+        pip install https://github.com/tonquer/waifu2x-vulkan/releases/download/v1.1.6/waifu2x_vulkan-1.1.6-cp37-cp37m-macosx_10_15_x86_64.whl
         pip install -r src\requirements.txt
     - name: Build
       run: |
@@ -102,12 +103,84 @@ jobs:
         path: ${{ env.PACKAGENAME }}
         retention-days: 7
 
+  windows-nosr:
+    runs-on: windows-latest
+    env:
+      PACKAGENAME: bika_py37_nosr_windows_x64
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python 3.7
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.7
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install pyinstaller==4.8
+        pip install -r src\requirements.txt
+    - name: Build
+      run: |
+        cd src
+        cp ..\res\icon\icon.ico .\
+
+        pyinstaller -F -w -i icon.ico start.py
+        mv dist bika
+        Copy-Item -Verbose -Recurse -Path db -Destination bika/
+        cp ..\LICENSE bika\
+        cp ..\CHANGELOG bika\
+        cd ..
+        mkdir ${{ env.PACKAGENAME }}
+        mv src\bika ${{ env.PACKAGENAME }}
+        7z a -r "$($Env:PACKAGENAME + '.zip')" "bika"
+    - name: Upload
+      uses: actions/upload-artifact@v4
+      with:
+        name: ${{ env.PACKAGENAME }}
+        path: ${{ env.PACKAGENAME }}
+        retention-days: 7
+
   windows7:
     runs-on: windows-latest
     env:
       PACKAGENAME: bika_py37_windows7_x64
     steps:
     - uses: actions/checkout@v4
+    - name: Set up Python 3.7
+      uses: actions/setup-python@v5
+      with:
+        python-version: 3.7
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install pyinstaller==4.6
+        pip install https://github.com/tonquer/waifu2x-vulkan/releases/download/v1.1.6/waifu2x_vulkan-1.1.6-cp37-cp37m-macosx_10_15_x86_64.whl
+        pip install -r src\requirements_win7.txt
+    - name: Build
+      run: |
+        cd src
+        cp ..\res\icon\icon.ico .\
+        pyinstaller -F -w -i icon.ico start.py
+        mv dist bika
+        Copy-Item -Verbose -Recurse -Path db -Destination bika/
+        cp ..\LICENSE bika\
+        cp ..\CHANGELOG bika\
+        cd ..
+        mkdir ${{ env.PACKAGENAME }}
+        mv src\bika ${{ env.PACKAGENAME }}
+        7z a -r "$($Env:PACKAGENAME + '.zip')" "bika"
+    - name: Upload
+      uses: actions/upload-artifact@v4
+      with:
+        name: ${{ env.PACKAGENAME }}
+        path: ${{ env.PACKAGENAME }}
+        retention-days: 7
+
+  windows7-nosr:
+    runs-on: windows-latest
+    env:
+      PACKAGENAME: bika_py37_nosr_windows7_x64
+    steps:
+    - uses: actions/checkout@v4
     - name: Set up Python 3.7
       uses: actions/setup-python@v5
       with:

diff --git a/src/component/list/category_list_widget.py b/src/component/list/category_list_widget.py
@@ -125,7 +125,7 @@ def Waifu2xPicture(self, index, isIfSize=False):
             assert isinstance(widget, ComicItemWidget)
             w, h, mat,_ = ToolUtil.GetPictureSize(widget.picData)
             if max(w, h) <= Setting.CoverMaxNum.value or not isIfSize:
-                model = ToolUtil.GetModelByIndex(Setting.CoverLookNoise.value, Setting.CoverLookScale.value, Setting.CoverLookModel.value, mat)
+                model = ToolUtil.GetModelByIndex(Setting.CoverLookModelName.value, Setting.CoverLookScale.value, mat)
                 widget.isWaifu2xLoading = True
                 self.AddConvertTask(widget.path, widget.picData, model, self.Waifu2xPictureBack, index)
 

diff --git a/src/config/config.py b/src/config/config.py
@@ -50,9 +50,9 @@
 Issues2 = "https://hub.ggo.icu/tonquer/picacg-qt/issues"
 Issues3 = "https://hub.fastgit.xyz/tonquer/picacg-qt/issues"
 
-UpdateVersion = "v1.5.1"
-RealVersion = "v1.5.1"
-TimeVersion = "2024-10-27"
+UpdateVersion = "v1.5.1.1"
+RealVersion = "v1.5.1.1"
+TimeVersion = "2024-10-29"
 DbVersion = ""
 
 Waifu2xVersion = "1.2.0"

diff --git a/src/tools/str.py b/src/tools/str.py
@@ -90,7 +90,7 @@ class Str:
     CvLink = 5008             # 连接中
     CvNotNet = 5009           # 没有网络存储
     CvSpace = 5010            # 空
-    CvZipError = 5010         # 打包出错了
+    CvZipError = 5011        # 打包出错了
 
     CvAuthError = 5101        # 验证失败
     CvFileNotFound = 5102     # 本地文件未找到