monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FactorioClient: allow setting a folder and find the executable in it, instead of trying to run a folder.

This commit is contained in:
Fabian Dill 2021-08-15 13:46:58 +02:00
parent aec39c919c
commit 0f55fa4f45
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
FactorioClient.py
View File

@ -354,13 +354,13 @@ if __name__ == '__main__':
factorio_server_logger = logging.getLogger("FactorioServer") factorio_server_logger = logging.getLogger("FactorioServer")
options = Utils.get_options() options = Utils.get_options()
executable = options["factorio_options"]["executable"] executable = options["factorio_options"]["executable"]
bin_dir = os.path.dirname(executable)
if not os.path.exists(bin_dir): if not os.path.exists(os.path.dirname(executable)):
raise FileNotFoundError(f"Path {bin_dir} does not exist or could not be accessed.") raise FileNotFoundError(f"Path {os.path.dirname(executable)} does not exist or could not be accessed.")
if not os.path.isdir(bin_dir): if os.path.isdir(executable): # user entered a path to a directory, let's find the executable therein
raise NotADirectoryError(f"Path {bin_dir} is not a directory.") executable = os.path.join(executable, "factorio")
if not os.path.exists(executable): if not os.path.isfile(executable):
if os.path.exists(executable + ".exe"): if os.path.isfile(executable + ".exe"):
executable = executable + ".exe" executable = executable + ".exe"
else: else:
raise FileNotFoundError(f"Path {executable} is not an executable file.") raise FileNotFoundError(f"Path {executable} is not an executable file.")