fix: 🐛 check if mod zip is structured correctly (#303)

* fix: 🐛 check if mod zip is structured correctly

* fix: 🐛 Check if mod is loaded before setting active state

Author: KANAjetzt

addons/mod_loader/api/profile.gd

@@ -208,7 +208,8 @@ static func _update_disabled_mods() -> void:
 	# Iterate through the mod list in the current user profile to find disabled mods
 	for mod_id in current_user_profile.mod_list:
 		var mod_list_entry: Dictionary = current_user_profile.mod_list[mod_id]
-		ModLoaderStore.mod_data[mod_id].is_active = mod_list_entry.is_active
+		if ModLoaderStore.mod_data.has(mod_id):
+			ModLoaderStore.mod_data[mod_id].is_active = mod_list_entry.is_active
 
 	ModLoaderLog.debug(
 		"Updated the active state of all mods, based on the current user profile \"%s\""

addons/mod_loader/internal/file.gd

@@ -45,6 +45,7 @@ static func _get_json_string_as_dict(string: String) -> Dictionary:
 
 # Load the mod ZIP from the provided directory
 static func load_zips_in_folder(folder_path: String) -> Dictionary:
+	var URL_MOD_STRUCTURE_DOCS := "https://github.com/GodotModding/godot-mod-loader/wiki/Mod-Structure"
 	var zip_data := {}
 
 	var mod_dir := Directory.new()
@@ -85,13 +86,23 @@ static func load_zips_in_folder(folder_path: String) -> Dictionary:
 		# Get the current directories inside UNPACKED_DIR
 		# This array is used to determine which directory is new
 		var current_mod_dirs := _ModLoaderPath.get_dir_paths_in_dir(_ModLoaderPath.get_unpacked_mods_dir_path())
+
 		# Create a backup to reference when the next mod is loaded
 		var current_mod_dirs_backup := current_mod_dirs.duplicate()
 
 		# Remove all directory paths that existed before, leaving only the one added last
 		for previous_mod_dir in ModLoaderStore.previous_mod_dirs:
 			current_mod_dirs.erase(previous_mod_dir)
 
+		# If the mod zip is not structured correctly, it may not be in the UNPACKED_DIR.
+		if current_mod_dirs.empty():
+			ModLoaderLog.fatal(
+				"The mod zip at path \"%s\" does not have the correct file structure. For more information, please visit \"%s\"."
+				% [mod_zip_global_path, URL_MOD_STRUCTURE_DOCS],
+				LOG_NAME
+			)
+			continue
+
 		# The key is the mod_id of the latest loaded mod, and the value is the path to the zip file
 		zip_data[current_mod_dirs[0].get_slice("/", 3)] = mod_zip_global_path
 

addons/mod_loader/internal/path.gd

@@ -113,8 +113,8 @@ static func get_file_paths_in_dir(src_dir_path: String) -> Array:
 	var error := directory.open(src_dir_path)
 
 	if not error  == OK:
+		ModLoaderLog.fatal("Encountered an error (%s) when attempting to open a directory, with the path: %s" % [error, src_dir_path], LOG_NAME)
 		return file_paths
-		ModLoaderLog.error("Error opening directory", LOG_NAME)
 
 	directory.list_dir_begin()
 	var file_name := directory.get_next()
@@ -133,9 +133,9 @@ static func get_dir_paths_in_dir(src_dir_path: String) -> Array:
 	var directory := Directory.new()
 	var error := directory.open(src_dir_path)
 
-	if not error  == OK:
+	if not error == OK:
+		ModLoaderLog.fatal("Encountered an error (%s) when attempting to open a directory, with the path: %s" % [error, src_dir_path], LOG_NAME)
 		return dir_paths
-		ModLoaderLog.error("Error opening directory", LOG_NAME)
 
 	directory.list_dir_begin()
 	var file_name := directory.get_next()