Build process implemented, adjusts for executable execution.

Author: Dracovanys

.gitignore

@@ -3,3 +3,4 @@ SMB/
 HDD/
 POPS_IOX.PAK
 __pycache__/
+release/

assets/icon.ico

@@ -0,0 +1,14 @@
+@echo off 
+
+:: Preparing environment for build
+rd /s /q "%~dp0\release"
+build.py
+
+:: Generate CidPOPS executable
+pyinstaller --onefile --distpath "release" --icon="%~dp0\assets\icon.ico" -n "CidPOPS" --add-data util:util main_toBuild.py
+
+:: Cleaning routine
+rd /s /q "%~dp0\build"
+del "%~dp0\*_toBuild.py"
+del "%~dp0\src\*_toBuild.py"
+del "%~dp0\*.spec"

build.bat

@@ -0,0 +1,16 @@
+import os
+
+root = os.path.dirname(os.path.abspath(__file__))
+
+files_toBuild = ['main', 'src\\setup']
+
+for script in files_toBuild:
+    _script = []
+    with open(f'{root}\\{script}.py', 'r') as file:
+        for line in file.readlines():
+            if line.find('# Build ') != -1:
+                line = line.replace('# Build ', '')
+            _script.append(line)
+    with open(f'{script}_toBuild.py', 'w') as file:
+        for line in _script:
+            file.write(line)

build.py

@@ -1,30 +1,33 @@
+import sys
 import os
 import argparse
 from src import setup
+# Build from src import setup_toBuild as setup
 from src import tool
 
 root = os.path.dirname(os.path.abspath(__file__))
+# Build root = os.path.dirname(os.path.abspath(sys.argv[0].replace('\\CidPOPS.exe', '')))
 
 # Setting up arguments
-parser = argparse.ArgumentParser(description='A tool for setup your POPS.')
+parser = argparse.ArgumentParser(description='A tool for setup your POPS! || By Dracovanys || Credits: israpps/ErikAndren (CUE2POPS); putnam/cgarz (binmerge); krHACKen/shaolinassassin (POPStarter)')
 # parser.add_argument('setup_type', help='Specify setup type (usb, smb, hdd).')
-parser.add_argument('games_dir', nargs='?', help='Directory where all PS1 games are stored.')
+parser.add_argument('games_dir', nargs='?', help='Directory where all your PS1 games are stored.')
 parser.add_argument('pops_iox', nargs='?', help='Path to "POPS_IOX.PAK" if not on CidPOPS directory.')
 parser.add_argument('-c', '--convertVCD', nargs='?', help='Convert a CUE file to VCD. (Usage.: -c "D:\\Downloads\\Crash Bandicoot (USA)\\Crash Bandicoot (USA).cue")')
-parser.add_argument('-m', '--mergeTracks', nargs='?', help='Merge Tracks and generate a new CUE file. (Usage.: -m "D:\\Downloads\\Crash Bandicoot (USA)\\Crash Bandicoot (USA).cue")')
+parser.add_argument('-m', '--mergeTracks', nargs='?', help='Merge tracks and generate a new CUE file. (Usage.: -m "D:\\Downloads\\Crash Bandicoot (USA)\\Crash Bandicoot (USA).cue")')
 parser.add_argument('--opl', action='store_true', help='Just create "conf_apps.cfg" file.')
 parser.add_argument('--ps1_pfx', action='store_true', help='Add "PS1 - " prefix to all OPL shortcuts on "conf_apps.cfg" file (Ex.: "PS1 - Crash Bandicoot (USA)").')
 args = parser.parse_args()
 
 # Convert VCD
 if args.convertVCD != None:
     tool.convert_VCD(args.convertVCD)
-    exit()
+    sys.exit()
 
 # Merge Tracks
 if args.mergeTracks != None:
     tool.merge_tracks(args.mergeTracks)
-    exit()
+    sys.exit()
 
 create_confApps = False
 if args.games_dir != None:
@@ -38,12 +41,8 @@
 
 # Create "conf_apps.cfg"
 if args.opl or create_confApps == True:
-    gameElfs = []
-    for file in os.listdir(f'{root}\\USB\\POPS'):
-        if str(file).find(".ELF") != -1:
-            gameElfs.append(file)
     if args.ps1_pfx:
-        setup.opl_setup(gameElfs)
+        setup.opl_setup()
     else:
-        setup.opl_setup(gameElfs, ps1_pfx=False)
-    exit()
+        setup.opl_setup(ps1_pfx=False)
+    sys.exit()

main.py

@@ -1,3 +1,4 @@
+# Build import sys
 import requests
 import wget
 import zipfile
@@ -7,9 +8,10 @@
 from bs4 import BeautifulSoup
 
 root = os.path.dirname(os.path.abspath(__file__)).replace('\\src', '')
+# Build root = os.path.dirname(os.path.abspath(sys.argv[0].replace('\\CidPOPS.exe', '')))
 
 # Create "conf_apps" with all paths requested
-def opl_setup(games: list, ps1_pfx: bool = True, setupType = 'usb'):
+def opl_setup(ps1_pfx: bool = True, setupType = 'usb'):
 
     # Check if setup folder exists
     if setupType == 'usb':
@@ -18,15 +20,21 @@ def opl_setup(games: list, ps1_pfx: bool = True, setupType = 'usb'):
         setupFolder = f'{root}\\SMB'
     if setupType == 'hdd':
         setupFolder = f'{root}\\HDD'
+
     if not os.path.exists(setupFolder):
-        print('[SETUP] Creating setup folder...')
-        os.makedirs(setupFolder)
+        print(f'[SETUP] Setup folder ({setupFolder}) not found!')
+        return
 
     if os.path.exists(f'{setupFolder}\\conf_apps.cfg'):
         os.remove(f'{setupFolder}\\conf_apps.cfg')
+
+    gameElfs = []
+    for file in os.listdir(f'{setupFolder}\\POPS'):
+        if str(file).find(".ELF") != -1:
+            gameElfs.append(file)
 
     print('[SETUP] Creating "conf_apps.cfg" file...')
-    for game in games:
+    for game in gameElfs:
         shortcutName = str(game).replace('XX.', '').replace('.ELF', '')
         if ps1_pfx:
             shortcutName = f'PS1 - {shortcutName}'