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

---
 .github/workflows/on-release-master.yml | 29 +++++++++++++------------
 pyproject.toml                          |  4 ++--
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/on-release-master.yml b/.github/workflows/on-release-master.yml
index 8e51eb9..3dce7ff 100644
--- a/.github/workflows/on-release-master.yml
+++ b/.github/workflows/on-release-master.yml
@@ -7,22 +7,14 @@ on:
   #  release:
   #    types: [published]
   #    branches: [master]
-  workflow_dispatch: # or workflow_call
-    inputs:
-      asset_mime:
-        description: "MIME Type"
-        required: false
-        default: "application/zip"
-      out_name_file:
-        description: "App file name"
-        required: false
-        default: "TIDAL-Downloader-NG"
   push:
     tags:
       - "v*.*.*"
 
 env:
   RELEASE_UPLOAD_URL: "release_upload_url"
+  ASSET_EXTENSION: ".zip"
+  OUT_NAME_FILE: "TIDAL-Downloader-NG"
 
 jobs:
   publish:
@@ -57,7 +49,6 @@ jobs:
         with:
           name: ${{env.RELEASE_UPLOAD_URL}}
           path: ${{env.RELEASE_UPLOAD_URL}}.txt
-
   deploy-docs:
     needs: publish
     runs-on: ubuntu-latest
@@ -80,9 +71,19 @@ jobs:
         run: poetry install --no-interaction --with docs
       - name: Deploy documentation
         run: poetry run mkdocs gh-deploy --force
+  compute:
+    runs-on: ubuntu-latest
+    outputs:
+      ASSET_EXTENSION: ${{ env.ASSET_EXTENSION }}
+      OUT_NAME_FILE: ${{ env.OUT_NAME_FILE }}
+    steps:
+      - name: Compute outputs
+        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
+    needs: ["publish", "compute"]
     env:
       ASSET_MIME: "application/zip"
     strategy:
@@ -98,8 +99,8 @@ jobs:
               poetry run make gui-macos &&
               cd dist &&
               pwd &&
-              echo zip -r ${{inputs.out_name_file}}${{inputs.asset_extension}} ${{inputs.out_name_file}}.dmg -x "*.DS_Store"
-              zip -r ${{inputs.out_name_file}}${{inputs.asset_extension}} ${{inputs.out_name_file}}.dmg -x "*.DS_Store"
+              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
diff --git a/pyproject.toml b/pyproject.toml
index e9c67fa..139ad6a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "tidal-dl-ng"
-version = "0.4.17"
+version = "0.4.18"
 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.17"
+version = "0.4.18"
 description = "TIDAL Medial Downloader Next Generation!"
 repository = "https://github.com/exislow/tidal-dl-ng"
 documentation = "https://exislow.github.io/tidal-dl-ng/"