Rim/T7x-Workshop-Downloader
Rim/T7x-Workshop-Downloader
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

fixes

Browse Source
This commit is contained in:
faroukbmiled 2023-07-31 15:39:56 +01:00
parent 48bef46f6b
commit 3de103e86f
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
boiiiwd.py
View File

@ -19,10 +19,16 @@ CONFIG_FILE_PATH = "config.ini"
global stopped global stopped
stopped = False stopped = False
def cwd():
if getattr(sys, 'frozen', False):
return os.path.dirname(sys.executable)
else:
return os.path.dirname(os.path.abspath(__file__))
def create_default_config(): def create_default_config():
config = configparser.ConfigParser() config = configparser.ConfigParser()
config["Settings"] = { config["Settings"] = {
"SteamCMDPath": "steamcmd", "SteamCMDPath": cwd(),
"DestinationFolder": "" "DestinationFolder": ""
} }
with open(CONFIG_FILE_PATH, "w") as config_file: with open(CONFIG_FILE_PATH, "w") as config_file:
@ -30,7 +36,7 @@ def create_default_config():
def run_steamcmd_command(command): def run_steamcmd_command(command):
steamcmd_path = get_steamcmd_path() steamcmd_path = get_steamcmd_path()
process = subprocess.Popen([steamcmd_path] + command.split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True, bufsize=1, universal_newlines=True) process = subprocess.Popen([steamcmd_path + "\steamcmd.exe"] + command.split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True, bufsize=1, universal_newlines=True)
while True: while True:
output = process.stdout.readline().rstrip() output = process.stdout.readline().rstrip()
@ -40,7 +46,7 @@ def run_steamcmd_command(command):
def get_steamcmd_path(): def get_steamcmd_path():
config = configparser.ConfigParser() config = configparser.ConfigParser()
config.read(CONFIG_FILE_PATH) config.read(CONFIG_FILE_PATH)
return config.get("Settings", "SteamCMDPath", fallback="steamcmd") return config.get("Settings", "SteamCMDPath", fallback=cwd())
def set_steamcmd_path(steamcmd_path): def set_steamcmd_path(steamcmd_path):
config = configparser.ConfigParser() config = configparser.ConfigParser()
@ -92,7 +98,8 @@ def download_workshop_map(workshop_id, destination_folder, progress_bar):
show_message("Error", "Failed to retrieve file size.") show_message("Error", "Failed to retrieve file size.")
return return
download_folder = os.path.join("steamapps", "workshop", "downloads", "311210", workshop_id) download_folder = os.path.join(get_steamcmd_path(), "steamapps", "workshop", "downloads", "311210", workshop_id)
print(download_folder)
if not os.path.exists(download_folder): if not os.path.exists(download_folder):
os.makedirs(download_folder) os.makedirs(download_folder)
@ -107,7 +114,7 @@ def download_workshop_map(workshop_id, destination_folder, progress_bar):
stopped = True stopped = True
progress_bar.setValue(100) progress_bar.setValue(100)
map_folder = os.path.join("steamapps", "workshop", "content", "311210", workshop_id) map_folder = os.path.join(get_steamcmd_path(), "steamapps", "workshop", "content", "311210", workshop_id)
json_file_path = os.path.join(map_folder, "workshop.json") json_file_path = os.path.join(map_folder, "workshop.json")
@ -271,7 +278,7 @@ class WorkshopDownloaderApp(QWidget):
if os.path.exists(CONFIG_FILE_PATH): if os.path.exists(CONFIG_FILE_PATH):
config.read(CONFIG_FILE_PATH) config.read(CONFIG_FILE_PATH)
destination_folder = config.get("Settings", "DestinationFolder", fallback="") destination_folder = config.get("Settings", "DestinationFolder", fallback="")
steamcmd_path = config.get("Settings", "SteamCMDPath", fallback="") steamcmd_path = config.get("Settings", "SteamCMDPath", fallback=cwd())
self.edit_destination_folder.setText(destination_folder) self.edit_destination_folder.setText(destination_folder)
self.edit_steamcmd_path.setText(steamcmd_path) self.edit_steamcmd_path.setText(steamcmd_path)
else: else:

4
config.ini Normal file
View File

@ -0,0 +1,4 @@
[Settings]
steamcmdpath = steamcmd
destinationfolder =