From 9c877a5a16fd0d0047d730038a68a0f8363ecd2a Mon Sep 17 00:00:00 2001
From: BombasticTom <85838311+BombasticTom@users.noreply.github.com>
Date: Thu, 23 May 2024 15:55:30 +0200
Subject: [PATCH] fix a galactic oversight

---
 .gitignore          | 1 +
 build.bat           | 6 +++---
 psychtobase/main.py | 6 ++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4688027..3675517 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ Weekend1/
 vs-skippa-psychengine/
 
 ## Files
+**/SONGTEST/*
 CodeTest.py
 fnf-porter.code-workspace
 Thumbs.db
diff --git a/build.bat b/build.bat
index 2808f3f..02b3398 100644
--- a/build.bat
+++ b/build.bat
@@ -1,3 +1,3 @@
-pyinstaller --onefile setup.py --icon=icon.png --clean -n "FNF Porter v0_1"
-cd dist\"FNF Porter v0_1"
-"FNF Porter v0_1"
\ No newline at end of file
+pyinstaller --onefile --icon=icon.ico -n "FNF Porter" setup.py
+cd dist
+"FNF Porter.exe"
\ No newline at end of file
diff --git a/psychtobase/main.py b/psychtobase/main.py
index 3f450af..8503f88 100644
--- a/psychtobase/main.py
+++ b/psychtobase/main.py
@@ -293,11 +293,9 @@ def convert(psych_mod_folder, result_folder, options):
                         if chart != None:
                             try:
                                 if os.path.basename(songFile) == 'Voices-Player.ogg':
-                                    fileCopy(songFile,
-                                    f'{result_folder}/{modFoldername}{bgSongs}{songKeyFormatted}/Voices-{chart.metadata['playData']['characters'].get('player')}.ogg')
+                                    fileCopy(songFile, f"{result_folder}/{modFoldername}{bgSongs}{songKeyFormatted}/Voices-{chart.metadata['playData']['characters'].get('player')}.ogg")
                                 elif os.path.basename(songFile) == 'Voices-Opponent.ogg':
-                                    fileCopy(songFile,
-                                    f'{result_folder}/{modFoldername}{bgSongs}{songKeyFormatted}/Voices-{chart.metadata['playData']['characters'].get('opponent')}.ogg')
+                                    fileCopy(songFile, f"{result_folder}/{modFoldername}{bgSongs}{songKeyFormatted}/Voices-{chart.metadata['playData']['characters'].get('opponent')}.ogg")
 
                             except Exception as e:
                                 logging.error(f'Could not copy asset {songFile}: {e}')