From b3fa50c4c5fd9a80c7b0aaa68316b07e2e8474b7 Mon Sep 17 00:00:00 2001
From: Z-fly <10470892+Z-fly@users.noreply.github.com>
Date: Wed, 23 Oct 2024 09:37:59 +0800
Subject: [PATCH 01/20] Update release.yml

---
 .github/workflows/release.yml | 61 +++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d5b3a5b..151cec9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -105,6 +105,67 @@ jobs:
         asset_path: ${{ env.PACKAGENAME }}.dmg
         asset_name: ${{ env.PACKAGENAME }}.dmg
         asset_content_type: application/gzip
+  macos-arm:
+    needs: [setup, release]
+    runs-on: macos-13
+    env:
+      PACKAGENAME: ${{ needs.setup.outputs.PACKAGE_PREFIX }}_macos_arm64
+    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_11_0_arm64.whl
+        pip install -r src/requirements_macos.txt
+        brew install create-dmg
+    - name: Build
+      run: |
+        cd src
+        cp ../res/icon/Icon.icns ./
+        pyinstaller --clean --onedir --name PicACG \
+            --hidden-import waifu2x_vulkan --hidden-import PySide6 --hidden-import requests \
+            --hidden-import urllib3 --hidden-import websocket-client --hidden-import pillow \
+            --hidden-import config \
+            --hidden-import component \
+            --hidden-import server \
+            --hidden-import task \
+            --hidden-import tools \
+            --hidden-import view \
+            --strip --windowed -i Icon.icns \
+            start.py
+        cp -avf db dist/PicACG.app/Contents/MacOS
+        xattr -cr dist/PicACG.app
+        create-dmg --volname "PicACG" --volicon "Icon.icns" --icon "PicACG.app" 200 190 \
+            --window-pos 200 120 \
+            --window-size 800 400 \
+            --icon-size 100 \
+            --hide-extension "PicACG.app" --app-drop-link 600 185 \
+            ${{ env.PACKAGENAME }}.dmg dist/PicACG.app
+
+        zip -9 bika.zip ${{ env.PACKAGENAME }}.dmg
+        mv ${{ env.PACKAGENAME }}.dmg ..
+        mv bika.zip ..
+        cd ..
+    - name: Upload
+      uses: actions/upload-artifact@v2
+      with:
+        name: ${{ env.PACKAGENAME }}
+        path: bika.zip
+    - name: upload-macos-arm
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ needs.release.outputs.Up_Url }}
+        asset_path: ${{ env.PACKAGENAME }}.dmg
+        asset_name: ${{ env.PACKAGENAME }}.dmg
+        asset_content_type: application/gzip
 
   windows:
     needs: [setup, release]

From 48c22b1a6447e2a80e648ad6c1f8451047f974f6 Mon Sep 17 00:00:00 2001
From: Z-fly <10470892+Z-fly@users.noreply.github.com>
Date: Wed, 23 Oct 2024 09:42:17 +0800
Subject: [PATCH 02/20] Update release.yml

---
 .github/workflows/release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 151cec9..3c5fe45 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -120,8 +120,8 @@ jobs:
     - 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_11_0_arm64.whl
+        pip install pyinstaller
+        pip install https://github.com/tonquer/waifu2x-vulkan/releases/download/v1.1.1/waifu2x_vulkan-1.1.1-cp39-cp39-macosx_10_9_universal2.whl
         pip install -r src/requirements_macos.txt
         brew install create-dmg
     - name: Build

From fca90195788c707eafdac185e192872d8e2834de Mon Sep 17 00:00:00 2001
From: Z-fly <10470892+Z-fly@users.noreply.github.com>
Date: Wed, 23 Oct 2024 09:44:25 +0800
Subject: [PATCH 03/20] Update release.yml

---
 .github/workflows/release.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3c5fe45..2d70ef5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -3,6 +3,7 @@ on:
   push:
     tags:
       - '*'
+  workflow_dispatch:
 jobs:
   setup:
     runs-on: ubuntu-latest

From a927cb72afc77faf4ccb7f802e4177ae39a55987 Mon Sep 17 00:00:00 2001
From: Z-fly <10470892+Z-fly@users.noreply.github.com>
Date: Wed, 23 Oct 2024 09:49:58 +0800
Subject: [PATCH 04/20] Update release.yml

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2d70ef5..0c9da7b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -154,7 +154,7 @@ jobs:
         mv bika.zip ..
         cd ..
     - name: Upload
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ env.PACKAGENAME }}
         path: bika.zip

From 3676cf8be9e2d228b5c8ec5d685409835702f5c4 Mon Sep 17 00:00:00 2001
From: Z-fly <10470892+Z-fly@users.noreply.github.com>
Date: Wed, 23 Oct 2024 09:52:49 +0800
Subject: [PATCH 05/20] Update release.yml

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0c9da7b..1a84ac0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -122,7 +122,7 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install pyinstaller
-        pip install https://github.com/tonquer/waifu2x-vulkan/releases/download/v1.1.1/waifu2x_vulkan-1.1.1-cp39-cp39-macosx_10_9_universal2.whl
+        # pip install https://github.com/tonquer/waifu2x-vulkan/releases/download/v1.1.1/waifu2x_vulkan-1.1.1-cp39-cp39-macosx_10_9_universal2.whl
         pip install -r src/requirements_macos.txt
         brew install create-dmg
     - name: Build

From 9b4884edb0ba54140658d316503cfdfcad19588e Mon Sep 17 00:00:00 2001
From: Z-fly <10470892+Z-fly@users.noreply.github.com>
Date: Wed, 23 Oct 2024 09:54:14 +0800
Subject: [PATCH 06/20] Create requirements_macos_arm.txt

---
 src/requirements_macos_arm.txt | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 src/requirements_macos_arm.txt

diff --git a/src/requirements_macos_arm.txt b/src/requirements_macos_arm.txt
new file mode 100644
index 0000000..fe1b7bd
--- /dev/null
+++ b/src/requirements_macos_arm.txt
@@ -0,0 +1,12 @@
+PySide6
+websocket-client
+requests
+urllib3
+pillow
+# waifu2x-vulkan
+Pysocks
+natsort
+webdavclient3
+tqdm
+pysmb
+# pywin32==302

From 9dbc4e5d917891ffc9bb95c2e09603a38de1303c Mon Sep 17 00:00:00 2001
From: Z-fly <10470892+Z-fly@users.noreply.github.com>
Date: Wed, 23 Oct 2024 09:55:29 +0800
Subject: [PATCH 07/20] Update release.yml

---
 .github/workflows/release.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1a84ac0..eafaf90 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -106,6 +106,7 @@ jobs:
         asset_path: ${{ env.PACKAGENAME }}.dmg
         asset_name: ${{ env.PACKAGENAME }}.dmg
         asset_content_type: application/gzip
+
   macos-arm:
     needs: [setup, release]
     runs-on: macos-13
@@ -123,7 +124,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install pyinstaller
         # pip install https://github.com/tonquer/waifu2x-vulkan/releases/download/v1.1.1/waifu2x_vulkan-1.1.1-cp39-cp39-macosx_10_9_universal2.whl
-        pip install -r src/requirements_macos.txt
+        pip install -r src/requirements_macos_arm.txt
         brew install create-dmg
     - name: Build
       run: |

From 29d879f1c5e8ef286a32760a84988e76f8b0fb51 Mon Sep 17 00:00:00 2001
From: Z-fly <10470892+Z-fly@users.noreply.github.com>
Date: Wed, 23 Oct 2024 10:00:34 +0800
Subject: [PATCH 08/20] Update release.yml

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index eafaf90..647ead9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -109,7 +109,7 @@ jobs:
 
   macos-arm:
     needs: [setup, release]
-    runs-on: macos-13
+    runs-on: macos-latest
     env:
       PACKAGENAME: ${{ needs.setup.outputs.PACKAGE_PREFIX }}_macos_arm64
     steps:

From b542fb6c28a98615a0b647158658b05c81ece46a Mon Sep 17 00:00:00 2001
From: Z-fly <10470892+Z-fly@users.noreply.github.com>
Date: Wed, 23 Oct 2024 10:03:53 +0800
Subject: [PATCH 09/20] Update release.yml

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 647ead9..bc04061 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -117,7 +117,7 @@ jobs:
     - name: Set up Python 3.7
       uses: actions/setup-python@v5
       with:
-        python-version: 3.7
+        python-version: 3.8
 
     - name: Install dependencies
       run: |

From e572d33c2708a99f42e5b7107662b8e0a389f49f Mon Sep 17 00:00:00 2001
From: Z-fly <10470892+Z-fly@users.noreply.github.com>
Date: Wed, 23 Oct 2024 10:04:18 +0800
Subject: [PATCH 10/20] Update release.yml

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index bc04061..1073514 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -123,7 +123,7 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install pyinstaller
-        # pip install https://github.com/tonquer/waifu2x-vulkan/releases/download/v1.1.1/waifu2x_vulkan-1.1.1-cp39-cp39-macosx_10_9_universal2.whl
+        pip install https://github.com/tonquer/waifu2x-vulkan/releases/download/v1.1.1/waifu2x_vulkan-1.1.1-cp39-cp39-macosx_10_9_universal2.whl
         pip install -r src/requirements_macos_arm.txt
         brew install create-dmg
     - name: Build

From 440ef045aeb9731259c8d2165e9a1feb924a56d4 Mon Sep 17 00:00:00 2001
From: Z-fly <10470892+Z-fly@users.noreply.github.com>
Date: Wed, 23 Oct 2024 10:07:38 +0800
Subject: [PATCH 11/20] Update release.yml

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1073514..bc04061 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -123,7 +123,7 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install pyinstaller
-        pip install https://github.com/tonquer/waifu2x-vulkan/releases/download/v1.1.1/waifu2x_vulkan-1.1.1-cp39-cp39-macosx_10_9_universal2.whl
+        # pip install https://github.com/tonquer/waifu2x-vulkan/releases/download/v1.1.1/waifu2x_vulkan-1.1.1-cp39-cp39-macosx_10_9_universal2.whl
         pip install -r src/requirements_macos_arm.txt
         brew install create-dmg
     - name: Build

From 17114cc1aa6e76362dde84e4962662c15070a921 Mon Sep 17 00:00:00 2001
From: Z-fly <10470892+Z-fly@users.noreply.github.com>
Date: Fri, 25 Oct 2024 09:40:50 +0800
Subject: [PATCH 12/20] Update requirements_macos_arm.txt

---
 src/requirements_macos_arm.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/requirements_macos_arm.txt b/src/requirements_macos_arm.txt
index fe1b7bd..8f9c55c 100644
--- a/src/requirements_macos_arm.txt
+++ b/src/requirements_macos_arm.txt
@@ -1,4 +1,4 @@
-PySide6
+PySide6==6.5
 websocket-client
 requests
 urllib3

From 42fe3aa597f68ba6a23673d737630ebda48747ed Mon Sep 17 00:00:00 2001
From: Z-fly <10470892+Z-fly@users.noreply.github.com>
Date: Fri, 25 Oct 2024 09:45:05 +0800
Subject: [PATCH 13/20] Update release.yml

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index bc04061..9b8b5c3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ jobs:
       TAG_NAME: ${{ steps.get-package_prefix.outputs.TAG_NAME }}
       HEAD_SHA_SHORT: ${{ steps.get-package_prefix.outputs.HEAD_SHA_SHORT }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: '0'
       - name: get-package_prefix

From 1d18f5ccc79285f1206dd2664ae8be1a6ec4227b Mon Sep 17 00:00:00 2001
From: Z-fly <10470892+Z-fly@users.noreply.github.com>
Date: Fri, 25 Oct 2024 09:52:57 +0800
Subject: [PATCH 14/20] Update release.yml

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9b8b5c3..a50791e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -160,7 +160,7 @@ jobs:
         name: ${{ env.PACKAGENAME }}
         path: bika.zip
     - name: upload-macos-arm
-      uses: actions/upload-release-asset@v1
+      uses: softprops/action-gh-release@v2
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:

From 1e031248ca682c7c5eac246bb8a7d951005f912a Mon Sep 17 00:00:00 2001
From: Z-fly <10470892+Z-fly@users.noreply.github.com>
Date: Fri, 25 Oct 2024 09:53:59 +0800
Subject: [PATCH 15/20] Update release.yml

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a50791e..e46df27 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -114,7 +114,7 @@ jobs:
       PACKAGENAME: ${{ needs.setup.outputs.PACKAGE_PREFIX }}_macos_arm64
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python 3.7
+    - name: Set up Python 3.8
       uses: actions/setup-python@v5
       with:
         python-version: 3.8

From 3b9ace000272ad33e53f9ff3ab41e9263aa2211e Mon Sep 17 00:00:00 2001
From: Z-fly <10470892+Z-fly@users.noreply.github.com>
Date: Fri, 25 Oct 2024 09:54:44 +0800
Subject: [PATCH 16/20] Update requirements_macos_arm.txt

---
 src/requirements_macos_arm.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/requirements_macos_arm.txt b/src/requirements_macos_arm.txt
index 8f9c55c..1857d73 100644
--- a/src/requirements_macos_arm.txt
+++ b/src/requirements_macos_arm.txt
@@ -1,4 +1,4 @@
-PySide6==6.5
+PySide6==6.4
 websocket-client
 requests
 urllib3

From 3b221900604445a72031a24b07fffa206479bc1a Mon Sep 17 00:00:00 2001
From: Z-fly <10470892+Z-fly@users.noreply.github.com>
Date: Fri, 25 Oct 2024 09:58:45 +0800
Subject: [PATCH 17/20] Update requirements_macos_arm.txt

---
 src/requirements_macos_arm.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/requirements_macos_arm.txt b/src/requirements_macos_arm.txt
index 1857d73..306e3be 100644
--- a/src/requirements_macos_arm.txt
+++ b/src/requirements_macos_arm.txt
@@ -1,4 +1,4 @@
-PySide6==6.4
+PySide6==6.4.3
 websocket-client
 requests
 urllib3

From 82bf696c10b1a6005b498d437f68a04df3a06b48 Mon Sep 17 00:00:00 2001
From: Z-fly <10470892+Z-fly@users.noreply.github.com>
Date: Fri, 25 Oct 2024 10:14:17 +0800
Subject: [PATCH 18/20] Update release.yml

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e46df27..f7a0ccb 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -125,7 +125,7 @@ jobs:
         pip install pyinstaller
         # pip install https://github.com/tonquer/waifu2x-vulkan/releases/download/v1.1.1/waifu2x_vulkan-1.1.1-cp39-cp39-macosx_10_9_universal2.whl
         pip install -r src/requirements_macos_arm.txt
-        brew install create-dmg
+        brew install create-dmg upx
     - name: Build
       run: |
         cd src

From 57b0cf8c9f14866623926ad419f1de4ba921f486 Mon Sep 17 00:00:00 2001
From: Z-fly <10470892+Z-fly@users.noreply.github.com>
Date: Fri, 25 Oct 2024 10:21:43 +0800
Subject: [PATCH 19/20] Update release.yml

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f7a0ccb..e46df27 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -125,7 +125,7 @@ jobs:
         pip install pyinstaller
         # pip install https://github.com/tonquer/waifu2x-vulkan/releases/download/v1.1.1/waifu2x_vulkan-1.1.1-cp39-cp39-macosx_10_9_universal2.whl
         pip install -r src/requirements_macos_arm.txt
-        brew install create-dmg upx
+        brew install create-dmg
     - name: Build
       run: |
         cd src

From 15e6dd64554024f181e3a6bbae0fcede8cdd013e Mon Sep 17 00:00:00 2001
From: Z-fly <10470892+Z-fly@users.noreply.github.com>
Date: Fri, 25 Oct 2024 10:35:33 +0800
Subject: [PATCH 20/20] Update release.yml

---
 .github/workflows/release.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e46df27..89409f4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -164,10 +164,7 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: ${{ needs.release.outputs.Up_Url }}
-        asset_path: ${{ env.PACKAGENAME }}.dmg
-        asset_name: ${{ env.PACKAGENAME }}.dmg
-        asset_content_type: application/gzip
+        files: ${{ env.PACKAGENAME }}.dmg
 
   windows:
     needs: [setup, release]