create temp dir and make errors more readable

Author: nklbdev

addons/nklbdev.importality/command_line_image_format_loader_extension.gd

@@ -91,7 +91,7 @@ func _load_image(
 		push_error("Unable to find command template for file extension: " + extension)
 		return ERR_UNCONFIGURED
 
-	var command_template_parts: PackedStringArray = split_words_with_quotes(command_template)
+	var command_template_parts: PackedStringArray = _Common.split_words_with_quotes(command_template)
 	if command_template_parts.is_empty():
 		push_error("Unable to recognize command template parts for extension: %s" % [extension])
 		return ERR_UNCONFIGURED
@@ -127,8 +127,11 @@ func _load_image(
 	if exit_code:
 		for arg_index in arguments.size():
 			arguments[arg_index] = "\nArgument: " + arguments[arg_index]
-		push_error("An error occurred while executing the OS command. Process exited with code %s:\nCommand: %s%s" %
-			[exit_code, command, "".join(arguments)])
+		push_error(" ".join([
+			"An error occurred while executing",
+			"the external image converting utility command.",
+			"Process exited with code %s:\nCommand: %s%s"
+			]) % [exit_code, command, "".join(arguments)])
 		return ERR_QUERY_FAILED
 
 	if not FileAccess.file_exists(global_output_path):
@@ -146,58 +149,3 @@ func _load_image(
 
 	return OK
 
-const backslash: String = "\\"
-const quote: String = "\""
-const space: String = " "
-const tab: String = "\t"
-const empty: String = ""
-static func split_words_with_quotes(source: String) -> PackedStringArray:
-	var parts: PackedStringArray
-	if source.is_empty():
-		return parts
-
-	var quotation: bool
-
-	var previous: String
-	var current: String
-	var next: String = source[0]
-	var chars_count = source.length()
-
-	var part: String
-	for char_idx in chars_count:
-		previous = current
-		current = next
-		next = source[char_idx + 1] if char_idx < chars_count - 1 else ""
-		if quotation:
-			# seek for quotation end
-			if previous != backslash and current == quote:
-				if next == space or next == tab or next == empty:
-					quotation = false
-					parts.push_back(part)
-					part = ""
-					continue
-				else:
-					push_error("Invalid quotation start at %s:\n%s\n%s" % [char_idx, source, " ".repeat(char_idx) + "^"])
-					return PackedStringArray()
-		else:
-			# seek for quotation start
-			if current == space or current == tab:
-				if not part.is_empty():
-					parts.push_back(part)
-					part = ""
-				continue
-			else:
-				if previous != backslash and current == quote:
-					if previous == space or previous == tab or previous == empty:
-						quotation = true
-						continue
-					else:
-						push_error("Invalid quotation end at %s:\n%s\n%s" % [char_idx, source, " ".repeat(char_idx) + "^"])
-						return PackedStringArray()
-		part += current
-	if quotation:
-		push_error("Invalid quotation end at %s:\n%s\n%s" % [chars_count - 1, source, " ".repeat(chars_count - 1) + "^"])
-		return PackedStringArray()
-	if not part.is_empty():
-		parts.push_back(part)
-	return parts

addons/nklbdev.importality/common.gd

@@ -148,3 +148,59 @@ static func get_vector2i(dict: Dictionary, x_key: String, y_key: String) -> Vect
 static var common_temporary_files_directory_path_project_setting: _ProjectSetting = _ProjectSetting.new(
 	"temporary_files_directory_path", "", TYPE_STRING, PROPERTY_HINT_GLOBAL_DIR,
 	"", true, func(v: String): return v.is_empty())
+
+const __backslash: String = "\\"
+const __quote: String = "\""
+const __space: String = " "
+const __tab: String = "\t"
+const __empty: String = ""
+static func split_words_with_quotes(source: String) -> PackedStringArray:
+	var parts: PackedStringArray
+	if source.is_empty():
+		return parts
+
+	var quotation: bool
+
+	var previous: String
+	var current: String
+	var next: String = source[0]
+	var chars_count = source.length()
+
+	var part: String
+	for char_idx in chars_count:
+		previous = current
+		current = next
+		next = source[char_idx + 1] if char_idx < chars_count - 1 else ""
+		if quotation:
+			# seek for quotation end
+			if previous != __backslash and current == __quote:
+				if next == __space or next == __tab or next == __empty:
+					quotation = false
+					parts.push_back(part)
+					part = ""
+					continue
+				else:
+					push_error("Invalid quotation start at %s:\n%s\n%s" % [char_idx, source, " ".repeat(char_idx) + "^"])
+					return PackedStringArray()
+		else:
+			# seek for quotation start
+			if current == __space or current == __tab:
+				if not part.is_empty():
+					parts.push_back(part)
+					part = ""
+				continue
+			else:
+				if previous != __backslash and current == __quote:
+					if previous == __space or previous == __tab or previous == __empty:
+						quotation = true
+						continue
+					else:
+						push_error("Invalid quotation end at %s:\n%s\n%s" % [char_idx, source, " ".repeat(char_idx) + "^"])
+						return PackedStringArray()
+		part += current
+	if quotation:
+		push_error("Invalid quotation end at %s:\n%s\n%s" % [chars_count - 1, source, " ".repeat(chars_count - 1) + "^"])
+		return PackedStringArray()
+	if not part.is_empty():
+		parts.push_back(part)
+	return parts

addons/nklbdev.importality/export/aseprite.gd

@@ -26,6 +26,7 @@ func _init(editor_file_system: EditorFileSystem) -> void:
 
 func _export(res_source_file_path: String, atlas_maker: AtlasMaker, options: Dictionary) -> _Common.ExportResult:
 	var result: _Common.ExportResult = _Common.ExportResult.new()
+	var err: Error
 
 	var os_command_result: _ProjectSetting.Result = __os_command_project_setting.get_value()
 	if os_command_result.error:
@@ -41,30 +42,44 @@ func _export(res_source_file_path: String, atlas_maker: AtlasMaker, options: Dic
 	if temp_dir_path_result.error:
 		result.fail(ERR_UNCONFIGURED, "Unable to get Temporary Files Directory Path to export spritesheet", temp_dir_path_result)
 		return result
+	var global_temp_dir_path: String = ProjectSettings.globalize_path(
+		temp_dir_path_result.value.strip_edges())
 
-	var png_path: String = temp_dir_path_result.value.path_join("temp.png")
-	var global_png_path: String = ProjectSettings.globalize_path(png_path)
-	var json_path: String = temp_dir_path_result.value.path_join("temp.json")
-	var global_json_path: String = ProjectSettings.globalize_path(json_path)
+	if not DirAccess.dir_exists_absolute(global_temp_dir_path):
+		err = DirAccess.make_dir_recursive_absolute(global_temp_dir_path)
+		if err:
+			result.fail(ERR_UNCONFIGURED, "Unable to create directory for temporary files \"%s\" with error %s \"%s\"" %
+				[global_temp_dir_path, err, error_string(err)])
+			return result
 
-	var output: Array = []
-	var exit_code: int = OS.execute(
-		os_command_result.value,
-		os_command_arguments_result.value + PackedStringArray([
+	var global_png_path: String = global_temp_dir_path.path_join("temp.png")
+	var global_json_path: String = global_temp_dir_path.path_join("temp.json")
+
+	var command: String = os_command_result.value.strip_edges()
+	var arguments: PackedStringArray = \
+		os_command_arguments_result.value + \
+		PackedStringArray([
 			"--batch",
 			"--format", "json-array",
 			"--list-tags",
 			"--sheet", global_png_path,
 			"--data", global_json_path,
-			ProjectSettings.globalize_path(res_source_file_path)]),
-		output, true, false)
+			ProjectSettings.globalize_path(res_source_file_path)])
+
+	var output: Array = []
+	var exit_code: int = OS.execute(command, arguments, output, true, false)
 	if exit_code:
-		result.fail(ERR_QUERY_FAILED, "An error occurred while executing the Aseprite command. Process exited with code %s" % [exit_code])
+		for arg_index in arguments.size():
+			arguments[arg_index] = "\nArgument: " + arguments[arg_index]
+		result.fail(ERR_QUERY_FAILED, " ".join([
+			"An error occurred while executing the Aseprite command.",
+			"Process exited with code %s:\nCommand: %s%s"
+			]) % [exit_code, command, "".join(arguments)])
 		return result
 	var raw_atlas_image: Image = Image.load_from_file(global_png_path)
 	DirAccess.remove_absolute(global_png_path)
 	var json = JSON.new()
-	var err: Error = json.parse(FileAccess.get_file_as_string(global_json_path))
+	err = json.parse(FileAccess.get_file_as_string(global_json_path))
 	if err:
 		result.fail(ERR_INVALID_DATA, "Unable to parse sprite sheet json data with error %s \"%s\"" % [err, error_string(err)])
 		return result
@@ -205,6 +220,7 @@ class CustomImageFormatLoaderExtension:
 
 	func _load_image(image: Image, file_access: FileAccess, flags: int, scale: float) -> Error:
 		var global_source_file_path: String = file_access.get_path_absolute()
+		var err: Error
 
 		var os_command_result: _ProjectSetting.Result = __os_command_project_setting.get_value()
 		if os_command_result.error:
@@ -220,30 +236,44 @@ class CustomImageFormatLoaderExtension:
 		if temp_dir_path_result.error:
 			push_error(temp_dir_path_result.error_description)
 			return temp_dir_path_result.error
-
-		var png_path: String = temp_dir_path_result.value.path_join("temp.png")
-		var global_png_path: String = ProjectSettings.globalize_path(png_path)
-		var json_path: String = temp_dir_path_result.value.path_join("temp.json")
-		var global_json_path: String = ProjectSettings.globalize_path(json_path)
-
-		var output: Array = []
-		var exit_code: int = OS.execute(
-			os_command_result.value,
-			os_command_arguments_result.value + PackedStringArray([
+		var global_temp_dir_path: String = ProjectSettings.globalize_path(temp_dir_path_result.value.strip_edges())
+
+		var global_png_path: String = global_temp_dir_path.path_join("temp.png")
+		var global_json_path: String = global_temp_dir_path.path_join("temp.json")
+		if not DirAccess.dir_exists_absolute(global_temp_dir_path):
+			err = DirAccess.make_dir_recursive_absolute(global_temp_dir_path)
+			if err:
+				push_error("Unable to create directory for temporary files \"%s\" with error %s \"%s\"" %
+					[global_temp_dir_path, err, error_string(err)])
+				return ERR_QUERY_FAILED
+
+		var command: String = os_command_result.value.strip_edges()
+		var arguments: PackedStringArray = \
+			os_command_arguments_result.value + \
+			PackedStringArray([
 				"--batch",
 				"--format", "json-array",
 				"--list-tags",
 				"--sheet", global_png_path,
 				"--data", global_json_path,
-				global_source_file_path]),
-			output, true, false)
+				global_source_file_path,
+			])
+
+		var output: Array = []
+		var exit_code: int = OS.execute(command, arguments, output, true, false)
 		if exit_code:
-			push_error("An error occurred while executing the Aseprite command. Process exited with code %s" % [exit_code])
+			for arg_index in arguments.size():
+				arguments[arg_index] = "\nArgument: " + arguments[arg_index]
+			push_error(" ".join([
+				"An error occurred while executing the Aseprite command.",
+				"Process exited with code %s:\nCommand: %s%s"
+				]) % [exit_code, command, "".join(arguments)])
 			return ERR_QUERY_FAILED
+
 		var raw_atlas_image: Image = Image.load_from_file(global_png_path)
 		DirAccess.remove_absolute(global_png_path)
 		var json = JSON.new()
-		var err: Error = json.parse(FileAccess.get_file_as_string(global_json_path))
+		err = json.parse(FileAccess.get_file_as_string(global_json_path))
 		if err:
 			push_error("Unable to parse sprite sheet json data with error %s \"%s\"" % [err, error_string(err)])
 			return ERR_INVALID_DATA

addons/nklbdev.importality/export/krita.gd

@@ -35,6 +35,7 @@ func __validate_image_name(image_name: String) -> _Common.Result:
 
 func _export(res_source_file_path: String, atlas_maker: AtlasMaker, options: Dictionary) -> _Common.ExportResult:
 	var result: _Common.ExportResult = _Common.ExportResult.new()
+	var err: Error
 
 	var os_command_result: _ProjectSetting.Result = __os_command_project_setting.get_value()
 	if os_command_result.error:
@@ -50,6 +51,7 @@ func _export(res_source_file_path: String, atlas_maker: AtlasMaker, options: Dic
 	if temp_dir_path_result.error:
 		result.fail(ERR_UNCONFIGURED, "Unable to get Temporary Files Directory Path to export spritesheet", temp_dir_path_result)
 		return result
+	var global_temp_dir_path: String = ProjectSettings.globalize_path(temp_dir_path_result.value.strip_edges())
 
 	var global_source_file_path: String = ProjectSettings.globalize_path(res_source_file_path)
 
@@ -104,8 +106,6 @@ func _export(res_source_file_path: String, atlas_maker: AtlasMaker, options: Dic
 	var last_animations_frame_index: int = -1
 	var png_base_name: String = "img"
 	var global_temp_kra_path: String
-	var global_temp_png_path: String = temp_dir_path_result.value.path_join("%s.png" % png_base_name)
-	DirAccess.make_dir_recursive_absolute(temp_dir_path_result.value)
 
 	var storyboard_index_file_name: String = "%s/storyboard/index.xml" % image_name
 	if storyboard_index_file_name in files_names_in_zip:
@@ -180,25 +180,31 @@ func _export(res_source_file_path: String, atlas_maker: AtlasMaker, options: Dic
 
 	zip_reader.close()
 
-	# Создать пользователя (например, KritaRunner) с паролем 111 с помощью Win+R -> netplwiz
-	# Запустить Krita из-под этого пользователя с помощью утилиты PsExec
-	# "C:\Program Files\WindowsApps\Microsoft.SysinternalsSuite_2023.6.0.0_x64__8wekyb3d8bbwe\Tools\PsExec.exe"
-	# -u DEV-STATION\KritaRunner -p 111
-	# "C:\Program Files\Krita (x64)\bin\krita.exe"
-	# --export-sequence
-	# --export-filename "R:\Temp\Godot\Krita Importers\img.png"
-	# "D:\Godot 4.1\brave-mouse\project\tst2.kra"
-
-	var output: Array
-	var exit_code: int = OS.execute(
-		os_command_result.value,
-		os_command_arguments_result.value + PackedStringArray([
+	if not DirAccess.dir_exists_absolute(global_temp_dir_path):
+		err = DirAccess.make_dir_recursive_absolute(global_temp_dir_path)
+		if err:
+			result.fail(ERR_QUERY_FAILED, "Unable to create directory temporary files \"%s\" with error %s \"%s\"" %
+				[global_temp_dir_path, err, error_string(err)])
+			return result
+	var global_temp_png_path: String = global_temp_dir_path.path_join("temp.png")
+
+	var command: String = os_command_result.value.strip_edges()
+	var arguments: PackedStringArray = \
+		os_command_arguments_result.value + \
+		PackedStringArray([
 			"--export-sequence",
 			"--export-filename", global_temp_png_path,
-			global_temp_kra_path]),
-		output, true, false)
+			global_temp_kra_path])
+
+	var output: Array
+	var exit_code: int = OS.execute(command, arguments, output, true, false)
 	if exit_code:
-		result.fail(ERR_QUERY_FAILED, "An error occurred while executing the Krita command. Process exited with code %s" % [exit_code])
+		for arg_index in arguments.size():
+			arguments[arg_index] = "\nArgument: " + arguments[arg_index]
+		result.fail(ERR_QUERY_FAILED, " ".join([
+			"An error occurred while executing the Krita command.",
+			"Process exited with code %s:\nCommand: %s%s"
+			]) % [exit_code, command, "".join(arguments)])
 		return result
 
 	if global_temp_kra_path != global_source_file_path: