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

Factorio: remove staging folder for mod assembly (#2519)

This commit is contained in:
Fabian Dill 2023-12-10 19:11:57 +01:00 committed by GitHub
parent 1312884fa2
commit 19b8624818
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
worlds/factorio/Mod.py
View File

@ -5,7 +5,7 @@ import os
import shutil import shutil
import threading import threading
import zipfile import zipfile
from typing import Optional, TYPE_CHECKING, Any, List, Callable, Tuple from typing import Optional, TYPE_CHECKING, Any, List, Callable, Tuple, Union
import jinja2 import jinja2
@ -63,7 +63,7 @@ recipe_time_ranges = {
class FactorioModFile(worlds.Files.APContainer): class FactorioModFile(worlds.Files.APContainer):
game = "Factorio" game = "Factorio"
compression_method = zipfile.ZIP_DEFLATED # Factorio can't load LZMA archives compression_method = zipfile.ZIP_DEFLATED # Factorio can't load LZMA archives
writing_tasks: List[Callable[[], Tuple[str, str]]] writing_tasks: List[Callable[[], Tuple[str, Union[str, bytes]]]]
def __init__(self, *args: Any, **kwargs: Any): def __init__(self, *args: Any, **kwargs: Any):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
@ -164,9 +164,7 @@ def generate_mod(world: "Factorio", output_directory: str):
template_data["free_sample_blacklist"].update({item: 1 for item in multiworld.free_sample_blacklist[player].value}) template_data["free_sample_blacklist"].update({item: 1 for item in multiworld.free_sample_blacklist[player].value})
template_data["free_sample_blacklist"].update({item: 0 for item in multiworld.free_sample_whitelist[player].value}) template_data["free_sample_blacklist"].update({item: 0 for item in multiworld.free_sample_whitelist[player].value})
mod_dir = os.path.join(output_directory, versioned_mod_name) zf_path = os.path.join(output_directory, versioned_mod_name + ".zip")
zf_path = os.path.join(mod_dir + ".zip")
mod = FactorioModFile(zf_path, player=player, player_name=multiworld.player_name[player]) mod = FactorioModFile(zf_path, player=player, player_name=multiworld.player_name[player])
if world.zip_path: if world.zip_path:
@ -177,7 +175,13 @@ def generate_mod(world: "Factorio", output_directory: str):
mod.writing_tasks.append(lambda arcpath=versioned_mod_name+"/"+path_part, content=zf.read(file): mod.writing_tasks.append(lambda arcpath=versioned_mod_name+"/"+path_part, content=zf.read(file):
(arcpath, content)) (arcpath, content))
else: else:
shutil.copytree(os.path.join(os.path.dirname(__file__), "data", "mod"), mod_dir, dirs_exist_ok=True) basepath = os.path.join(os.path.dirname(__file__), "data", "mod")
for dirpath, dirnames, filenames in os.walk(basepath):
base_arc_path = versioned_mod_name+"/"+os.path.relpath(dirpath, basepath)
for filename in filenames:
mod.writing_tasks.append(lambda arcpath=base_arc_path+"/"+filename,
file_path=os.path.join(dirpath, filename):
(arcpath, open(file_path, "rb").read()))
mod.writing_tasks.append(lambda: (versioned_mod_name + "/data.lua", mod.writing_tasks.append(lambda: (versioned_mod_name + "/data.lua",
data_template.render(**template_data))) data_template.render(**template_data)))
@ -197,5 +201,3 @@ def generate_mod(world: "Factorio", output_directory: str):
# write the mod file # write the mod file
mod.write() mod.write()
# clean up
shutil.rmtree(mod_dir)