From 7487c63859ad9ef09763a403987cf36819134c3a Mon Sep 17 00:00:00 2001
From: Robert Honz <exislow+github@gmail.com>
Date: Wed, 20 Dec 2023 11:48:27 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=9B=A0=EF=B8=8F=20Release=20GUI=20fix.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/on-release-master.yml | 37 ++++++++++++++++++++-----
 pyproject.toml                          |  4 +--
 tidal_dl_ng/gui.py                      |  1 +
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/on-release-master.yml b/.github/workflows/on-release-master.yml
index e96ded4..d160f83 100644
--- a/.github/workflows/on-release-master.yml
+++ b/.github/workflows/on-release-master.yml
@@ -72,6 +72,7 @@ jobs:
       - name: Deploy documentation
         run: poetry run mkdocs gh-deploy --force
   compute:
+    # Workaround to be able to use variables in matrix.
     runs-on: ubuntu-latest
     outputs:
       ASSET_EXTENSION: ${{ env.ASSET_EXTENSION }}
@@ -81,7 +82,6 @@ jobs:
         run: |
           echo "ASSET_EXTENSION=${{ env.ASSET_EXTENSION }}" >> $GITHUB_OUTPUT
           echo "OUT_NAME_FILE=${{ env.OUT_NAME_FILE }}" >> $GITHUB_OUTPUT
-
   build-gui-and-upload-assets:
     needs: ["publish", "compute"]
     env:
@@ -98,12 +98,35 @@ jobs:
               source .venv/bin/activate &&
               poetry run make gui-macos &&
               cd dist &&
-              pwd &&
-              echo zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}}.dmg -x "*.DS_Store"
-              zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}}.dmg/ -x "*.DS_Store"
-    #          - os: "windows-2019"
-    #            TARGET: "windows-2019"
-    #            CMD_BUILD: pyinstaller -F -w -n clipster -i resources/clipster.ico cli.py
+              zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}}.dmg/ -x "*.DS_Store" &&
+              cd ..
+          - os: "macos-13"
+            TARGET: "macos-13"
+            CMD_BUILD: >
+              brew install create-dmg &&
+              source .venv/bin/activate &&
+              poetry run make gui-macos &&
+              cd dist &&
+              zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}}.dmg/ -x "*.DS_Store" &&
+              cd ..
+          - os: "ubuntu-20.04"
+            TARGET: "ubuntu-20.04"
+            CMD_BUILD: >
+              source .venv/bin/activate &&
+              poetry run make gui &&
+              cd dist &&
+              zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}} &&
+              cd ..
+          - os: "windows-2019"
+            TARGET: "windows-2019"
+            CMD_BUILD: >
+              choco feature enable -n=allowGlobalConfirmation
+              choco install zip make
+              source .venv/bin/activate &&
+              poetry run make gui &&
+              cd dist &&
+              zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}}.exe &&
+              cd ..
     runs-on: ${{ matrix.os }}
     steps:
       - name: Check out
diff --git a/pyproject.toml b/pyproject.toml
index 139ad6a..95d3fd3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "tidal-dl-ng"
-version = "0.4.18"
+version = "0.4.19"
 description = "TIDAL Medial Downloader Next Generation!"
 authors = ["Robert Honz <cen.sored@gmail.com>"]
 repository = "https://github.com/exislow/tidal-dl-ng"
@@ -13,7 +13,7 @@ packages = [
 [tool.poetry]
 name = "tidal-dl-ng"
 authors = ["Robert Honz <cen.sored@gmail.com>"]
-version = "0.4.18"
+version = "0.4.19"
 description = "TIDAL Medial Downloader Next Generation!"
 repository = "https://github.com/exislow/tidal-dl-ng"
 documentation = "https://exislow.github.io/tidal-dl-ng/"
diff --git a/tidal_dl_ng/gui.py b/tidal_dl_ng/gui.py
index a995c01..6c7f22f 100644
--- a/tidal_dl_ng/gui.py
+++ b/tidal_dl_ng/gui.py
@@ -25,6 +25,7 @@ from tidal_dl_ng.worker import Worker
 
 
 # TODO: Make more use of Exceptions
+# TODO: Add File -> Version
 class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
     settings: Settings = None
     tidal: Tidal = None