livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More rework and fixes

master
Beq 2024-09-16 18:33:18 +01:00
parent 905857aee0
commit 5d99ac6d00
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fsutils/download_list.py
View File

@ -148,13 +148,13 @@ def get_hosted_folder_for_build_type(build_type, config):
config.build_type_hosted_folder.get("Unknown") config.build_type_hosted_folder.get("Unknown")
) )
def get_supported_build_type(build_type, config): def is_supported_build_type(build_type, config):
if build_type in config.build_type_hosted_folder: if build_type in config.build_type_hosted_folder:
return build_type return True
else: else:
return None return False
def get_hosted_folder_for_os_type(os_type, config): def get_hosted_folder_for_os_type(os_type, config):
return config.build_type_hosted_folder.get( return config.os_hosted_folder.get(
os_type os_type
) )
@ -177,13 +177,17 @@ def unpack_artifacts(path_to_artifacts_directory, config):
build_types_found = {} build_types_found = {}
zips = glob.glob(f"{path_to_artifacts_directory}/*.zip") zips = glob.glob(f"{path_to_artifacts_directory}/*.zip")
for file in zips: for file in zips:
print(f"Processing zip file {file}")
filename, build_type, platform = extract_vars_from_zipfile_name(file) filename, build_type, platform = extract_vars_from_zipfile_name(file)
print(f"Identified filename {filename}, build_type {build_type} and platform {platform} from file {file}")
build_type = get_supported_build_type( build_type, config) if is_supported_build_type( build_type, config) == False:
if build_type == None: print(f"Invalid build_type {build_type} from file {file} using 'Unknown' instead")
print(f"Invalid build_type {build_type} from file {file} using 'Unknown'")
build_type = "Unknown" build_type = "Unknown"
else:
print(f"Using build_type {build_type} from file {file}")
build_folder = get_hosted_folder_for_build_type(build_type, config) build_folder = get_hosted_folder_for_build_type(build_type, config)
print(f"build_folder {build_folder}")
build_type_dir = os.path.join(path_to_artifacts_directory, build_folder) build_type_dir = os.path.join(path_to_artifacts_directory, build_folder)
try: try: