- updating macOS build to use python3.12 and not 3.13

requirements.txt

@@ -10,7 +10,5 @@ PySide6
 requests
 hue_shift
 Markdown
-rich # Only needed by CLI
 ffmpeg-progress-yield
-mutagen
-pywin32 # Only needed on Windows for Porn Fetch installation
+mutagen

requirements_cli.txt

@@ -10,6 +10,5 @@ requests
 hue_shift
 markdown
 rich
-tqdm
 ffmpeg-progress-yield
 mutagen

src/scripts/install.sh

@@ -46,7 +46,7 @@ case $OS in
             echo "Homebrew is not installed. Installing now..."
             /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
         fi
-        brew install python3 git
+        brew install python@3.12 git # Python3.13 is not yet supported by nuitka
         ;;
     esac
 
@@ -75,11 +75,12 @@ fi
 # Common commands
 git clone https://github.com/EchterAlsFake/Porn_Fetch
 cd Porn_Fetch
-git checkout 3.4  # This is only temporary for testing, don't worry...
+git checkout  # This is only temporary for testing, don't worry...
 python3 -m venv /tmp/.venv # This is needed, because Qt has some issues if the virtual environment is in the same directory, as there the script gets executed in
 source /tmp/.venv/bin/activate
 pip install -r requirements.txt
 pyside6-deploy -c src/build/pysidedeploy_linux.spec -f -v
+mv "main.bin" "PornFetch_Linux_GUI_x64.bin"
 deactivate
 echo "Deleting the temporary created virtual environment..."
 rm -rf /tmp/.venv

src/scripts/install_windows.ps1

@@ -71,6 +71,7 @@ Set-Location -Path $projectDir
 py -m venv ..\venv\
 ..\venv\Scripts\activate.ps1
 pip install -r requirements.txt
+pip install pywin32
 $env:NUITKA_ASSUME_YES_FOR_DOWNLOADS = "1"
 Write-Host "NUITKA_ASSUME_YES_FOR_DOWNLOADS is set to $env:NUITKA_ASSUME_YES_FOR_DOWNLOADS"
 
@@ -87,7 +88,9 @@ Set-Location -Path $projectDir
 pyside6-deploy -c src/build/pysidedeploy_windows.spec -f -v
 
 # Move the final executable to the user's Desktop
+$finalExePath = Join-Path -Path $projectDir -ChildPath "Porn Fetch.exe"
 $renamedExe = Join-Path -Path $projectDir -ChildPath "Porn Fetch.exe"
+Rename-Item -Path $finalExePath -NewName "PornFetch_Windows_GUI_x64.exe"
 Move-Item -Path $renamedExe -Destination (Join-Path $desktopDir "Porn Fetch.exe")
 
 # Clean up
@@ -97,5 +100,3 @@ Write-Output "Cleaning up..."
 Remove-Item -Path $projectZipPath -Force
 Remove-Item -Recurse -Force -Path (Join-Path $downloadsDir "Porn_Fetch-master")
 Write-Output "Done!"
-Write-Output "Porn Fetch is now on your Desktop. It's named 'Porn Fetch.exe'"
-Write-Output "You can now close the terminal..."