removed unused utility functions and filled missing fields on plugin settings

Author: sempitern0

addons/ninetailsrabbit.character_generator_importer_tool/plugin.cfg

@@ -3,5 +3,5 @@
 name="Character generator importer tool"
 description="This is an unofficial tool that can be used as a plugin in Godot to speed up the process of creating animations for the character generator"
 author="Ninetailsrabbit"
-version="1.0.0"
+version="1.0.1"
 script="ninetailsrabbit.character_generator_importer_tool.gd"

addons/ninetailsrabbit.character_generator_importer_tool/settings/plugin_settings.gd

@@ -4,7 +4,7 @@ class_name MyPluginSettings extends RefCounted
 const PluginPrefixName: String = "ninetailsrabbit.character_generator_importer_tool" ## The folder name
 const GitRepositoryName: String = "character-generator-importer-tool"
 
-static var PluginName: String = "MyPlugin"
+static var PluginName: String = "CharacterGeneratorImporterTool"
 static var PluginProjectName: String = ProjectSettings.get_setting("application/config/name")
 static var PluginBasePath: String = "res://addons/%s" % PluginPrefixName
 static var PluginLocalConfigFilePath = "%s/plugin.cfg" % PluginBasePath

addons/ninetailsrabbit.character_generator_importer_tool/src/importer.gd

@@ -103,12 +103,12 @@ func create_spritesheets_parts_as_resources() -> void:
 	image_format_regex.compile(".png$")
 
 	if DirAccess.dir_exists_absolute(input_folder_parts) and DirAccess.dir_exists_absolute(output_folder_parts):
-		var spritesheets = PluginUtilities.get_files_recursive(input_folder_parts, image_format_regex)
+		var spritesheets = CharacterGeneratorImporterToolPluginUtilities.get_files_recursive(input_folder_parts, image_format_regex)
 
 		if spritesheets.is_empty():
 			return
 
-		PluginUtilities.remove_files_recursive(output_folder_parts)
+		CharacterGeneratorImporterToolPluginUtilities.remove_files_recursive(output_folder_parts)
 		DirAccess.make_dir_absolute(output_folder_parts)
 
 		DirAccess.make_dir_absolute("%s/Adult" % output_folder_parts)
@@ -155,7 +155,7 @@ func create_spritesheets_parts_as_resources() -> void:
 
 		## We assume that each core has 2 threads
 		var available_threads: int = OS.get_processor_count() * 2
-		var spritesheet_chunks = PluginUtilities.chunk_array(spritesheets, ceil(spritesheets.size() / available_threads))
+		var spritesheet_chunks = CharacterGeneratorImporterToolPluginUtilities.chunk_array(spritesheets, ceil(spritesheets.size() / available_threads))
 
 		for spritesheet_chunk: Array in spritesheet_chunks:
 			var thread = Thread.new()
@@ -210,19 +210,19 @@ func generate_animations() -> void:
 
 	if _character_spritesheets_are_valid():
 
-		PluginUtilities.free_children(self)
+		CharacterGeneratorImporterToolPluginUtilities.free_children(self)
 
 		if not character_spritesheet.is_empty():
 			var sprite_frames: SpriteFrames = create_sprite_frames(character_spritesheet)
 			create_animated_sprite(character_spritesheet, sprite_frames)
 
 		if not character_spritesheet_folder.is_empty():
-			for spritesheet_path: String in PluginUtilities.get_files_recursive(character_spritesheet_folder, image_format_regex):
+			for spritesheet_path: String in CharacterGeneratorImporterToolPluginUtilities.get_files_recursive(character_spritesheet_folder, image_format_regex):
 				var sprite_frames: SpriteFrames = create_sprite_frames(spritesheet_path)
 				create_animated_sprite(spritesheet_path, sprite_frames)
 
 		if create_animation_player:
-			for animated_sprite: AnimatedSprite2D in PluginUtilities.find_nodes_of_type(self, AnimatedSprite2D.new()):
+			for animated_sprite: AnimatedSprite2D in CharacterGeneratorImporterToolPluginUtilities.find_nodes_of_type(self, AnimatedSprite2D.new()):
 				create_animation_player_for(animated_sprite)
 
 	create_spritesheets_parts_as_resources()
@@ -1053,5 +1053,5 @@ func _on_tool_button_pressed(text: String) -> void:
 		"Generate Animations":
 			generate_animations()
 		"Clear Animations":
-			PluginUtilities.free_children(self)
+			CharacterGeneratorImporterToolPluginUtilities.free_children(self)
 #endregion

addons/ninetailsrabbit.character_generator_importer_tool/updater/update_progress_bar.gd

@@ -29,7 +29,7 @@ func _ready() -> void:
 
 @warning_ignore("return_value_discarded")
 func run_update(progress_steps: int = 5, message: String = "Press 'Start Update' to start!") -> void:
-	if PluginUtilities.is_valid_url(download_url):
+	if _is_valid_url(download_url):
 		show()
 		set_process(true)
 		get_cancel_button().disabled = true
@@ -148,9 +148,9 @@ func on_http_request_request_completed(result: int, response_code: int, headers:
 
 			if MyPluginSettings.DebugMode:
 				if DirAccess.dir_exists_absolute(MyPluginSettings.PluginDebugDirectoryPath):
-					PluginUtilities.remove_files_recursive(MyPluginSettings.PluginDebugDirectoryPath)
+					_remove_files_recursive(MyPluginSettings.PluginDebugDirectoryPath)
 			else:
-				PluginUtilities.remove_files_recursive(MyPluginSettings.PluginBasePath)
+				_remove_files_recursive(MyPluginSettings.PluginBasePath)
 
 			EditorInterface.get_resource_filesystem().scan()
 
@@ -159,9 +159,9 @@ func on_http_request_request_completed(result: int, response_code: int, headers:
 			if MyPluginSettings.DebugMode:
 				if not DirAccess.dir_exists_absolute(MyPluginSettings.PluginDebugDirectoryPath):
 					DirAccess.make_dir_absolute(MyPluginSettings.PluginDebugDirectoryPath)
-				PluginUtilities.copy_directory_recursive(MyPluginSettings.PluginTemporaryReleaseUpdateDirectoryPath, MyPluginSettings.PluginDebugDirectoryPath)
+				_copy_directory_recursive(MyPluginSettings.PluginTemporaryReleaseUpdateDirectoryPath, MyPluginSettings.PluginDebugDirectoryPath)
 			else:
-				PluginUtilities.copy_directory_recursive(MyPluginSettings.PluginTemporaryReleaseUpdateDirectoryPath, "res://")
+				_copy_directory_recursive(MyPluginSettings.PluginTemporaryReleaseUpdateDirectoryPath, "res://")
 
 			EditorInterface.get_resource_filesystem().scan()
 
@@ -175,3 +175,80 @@ func on_http_request_request_completed(result: int, response_code: int, headers:
 			enable_plugin()
 			hide()
 			update_finished.emit()
+
+
+#region Utils
+func _is_valid_url(url: String) -> bool:
+	var regex = RegEx.new()
+	var url_pattern = "/(https:\\/\\/www\\.|http:\\/\\/www\\.|https:\\/\\/|http:\\/\\/)?[a-zA-Z]{2,}(\\.[a-zA-Z]{2,})(\\.[a-zA-Z]{2,})?\\/[a-zA-Z0-9]{2,}|((https:\\/\\/www\\.|http:\\/\\/www\\.|https:\\/\\/|http:\\/\\/)?[a-zA-Z]{2,}(\\.[a-zA-Z]{2,})(\\.[a-zA-Z]{2,})?)|(https:\\/\\/www\\.|http:\\/\\/www\\.|https:\\/\\/|http:\\/\\/)?[a-zA-Z0-9]{2,}\\.[a-zA-Z0-9]{2,}\\.[a-zA-Z0-9]{2,}(\\.[a-zA-Z0-9]{2,})?/g"
+	regex.compile(url_pattern)
+	
+	return regex.search(url) != null
+
+
+func _copy_directory_recursive(from_dir :String, to_dir :String) -> bool:
+	if not DirAccess.dir_exists_absolute(from_dir):
+		push_error("copy_directory_recursive: directory not found '%s'" % from_dir)
+		return false
+		
+	if not DirAccess.dir_exists_absolute(to_dir):
+		
+		var err := DirAccess.make_dir_recursive_absolute(to_dir)
+		if err != OK:
+			push_error("copy_directory_recursive: Can't create directory '%s'. Error: %s" % [to_dir, error_string(err)])
+			return false
+			
+	var source_dir := DirAccess.open(from_dir)
+	var dest_dir := DirAccess.open(to_dir)
+	
+	if source_dir != null:
+		source_dir.list_dir_begin()
+		var next := "."
+
+		while next != "":
+			next = source_dir.get_next()
+			if next == "" or next == "." or next == "..":
+				continue
+			var source := source_dir.get_current_dir() + "/" + next
+			var dest := dest_dir.get_current_dir() + "/" + next
+			
+			if source_dir.current_is_dir():
+				_copy_directory_recursive(source + "/", dest)
+				continue
+				
+			var err := source_dir.copy(source, dest)
+			
+			if err != OK:
+				push_error("_copy_directory_recursive: Error checked copy file '%s' to '%s'" % [source, dest])
+				return false
+				
+		return true
+	else:
+		push_error("copy_directory_recursive: Directory not found: " + from_dir)
+		return false
+
+
+func _remove_files_recursive(path: String, regex: RegEx = null) -> void:
+	var directory = DirAccess.open(path)
+	
+	if DirAccess.get_open_error() == OK:
+		directory.list_dir_begin()
+		
+		var file_name = directory.get_next()
+		
+		while file_name != "":
+			if directory.current_is_dir():
+				_remove_files_recursive(directory.get_current_dir().path_join(file_name), regex)
+			else:
+				if regex != null:
+					if regex.search(file_name):
+						directory.remove(file_name)
+				else:
+					directory.remove(file_name)
+					
+			file_name = directory.get_next()
+		
+		directory.remove(path)
+	else:
+		push_error("remove_recursive: An error %s happened open directory: %s " % [DirAccess.get_open_error(), path])
+#endregion

addons/ninetailsrabbit.character_generator_importer_tool/utils/plugin_utilities.gd

@@ -1,31 +1,6 @@
-class_name PluginUtilities
+class_name CharacterGeneratorImporterToolPluginUtilities
 
 
-static func is_valid_url(url: String) -> bool:
-	var regex = RegEx.new()
-	var url_pattern = "/(https:\\/\\/www\\.|http:\\/\\/www\\.|https:\\/\\/|http:\\/\\/)?[a-zA-Z]{2,}(\\.[a-zA-Z]{2,})(\\.[a-zA-Z]{2,})?\\/[a-zA-Z0-9]{2,}|((https:\\/\\/www\\.|http:\\/\\/www\\.|https:\\/\\/|http:\\/\\/)?[a-zA-Z]{2,}(\\.[a-zA-Z]{2,})(\\.[a-zA-Z]{2,})?)|(https:\\/\\/www\\.|http:\\/\\/www\\.|https:\\/\\/|http:\\/\\/)?[a-zA-Z0-9]{2,}\\.[a-zA-Z0-9]{2,}\\.[a-zA-Z0-9]{2,}(\\.[a-zA-Z0-9]{2,})?/g"
-	regex.compile(url_pattern)
-	
-	return regex.search(url) != null
-
-
-static func filepath_is_valid(path: String):
-	return not path.is_empty() and path.is_absolute_path() and ResourceLoader.exists(path)
-
-
-static func dirpath_is_valid(path: String):
-	return not path.is_empty() and path.is_absolute_path() and DirAccess.dir_exists_absolute(path)
-
-
-static func directory_exist_on_executable_path(directory_path: String) -> Error:
-	var real_path = OS.get_executable_path().get_base_dir().path_join(directory_path)
-	var directory = DirAccess.open(real_path)
-	
-	if directory == null:
-		return DirAccess.get_open_error()
-	
-	return OK
-	
 ## Supports RegEx expressions
 static func get_files_recursive(path: String, regex: RegEx = null) -> Array:
 	if path.is_empty() or not DirAccess.dir_exists_absolute(path):
@@ -59,48 +34,6 @@ static func get_files_recursive(path: String, regex: RegEx = null) -> Array:
 		return []
 
 
-static func copy_directory_recursive(from_dir :String, to_dir :String) -> bool:
-	if not DirAccess.dir_exists_absolute(from_dir):
-		push_error("PluginUtilities->copy_directory_recursive: directory not found '%s'" % from_dir)
-		return false
-		
-	if not DirAccess.dir_exists_absolute(to_dir):
-		
-		var err := DirAccess.make_dir_recursive_absolute(to_dir)
-		if err != OK:
-			push_error("PluginUtilities->copy_directory_recursive: Can't create directory '%s'. Error: %s" % [to_dir, error_string(err)])
-			return false
-			
-	var source_dir := DirAccess.open(from_dir)
-	var dest_dir := DirAccess.open(to_dir)
-	
-	if source_dir != null:
-		source_dir.list_dir_begin()
-		var next := "."
-
-		while next != "":
-			next = source_dir.get_next()
-			if next == "" or next == "." or next == "..":
-				continue
-			var source := source_dir.get_current_dir() + "/" + next
-			var dest := dest_dir.get_current_dir() + "/" + next
-			
-			if source_dir.current_is_dir():
-				copy_directory_recursive(source + "/", dest)
-				continue
-				
-			var err := source_dir.copy(source, dest)
-			
-			if err != OK:
-				push_error("PluginUtilities->copy_directory_recursive: Error checked copy file '%s' to '%s'" % [source, dest])
-				return false
-				
-		return true
-	else:
-		push_error("PluginUtilities->copy_directory_recursive: Directory not found: " + from_dir)
-		return false
-
-
 static func remove_files_recursive(path: String, regex: RegEx = null) -> void:
 	var directory = DirAccess.open(path)
 
@@ -126,7 +59,6 @@ static func remove_files_recursive(path: String, regex: RegEx = null) -> void:
 		push_error("PluginUtilities->remove_recursive: An error %s happened open directory: %s " % [DirAccess.get_open_error(), path])
 
 
-
 static func find_nodes_of_type(node: Node, type_to_find: Node) -> Array:
 	var  result := []
 

project.godot

@@ -12,7 +12,7 @@ config_version=5
 
 config/name="Character generator tool importer"
 config/description="This is an unofficial tool that can be used as a plugin in Godot to speed up the process of creating animations for the character generator 2.0"
-config/version="1.0.0"
+config/version="1.0.1"
 config/features=PackedStringArray("4.3", "GL Compatibility")
 config/icon="res://icon.svg"