From d6dd3fe4892f5c10af462080f8e40f329b83737d Mon Sep 17 00:00:00 2001 From: don-tnowe <67479453+don-tnowe@users.noreply.github.com> Date: Thu, 27 Oct 2022 11:02:17 +0300 Subject: [PATCH] Improve csv import stability --- addons/editor_icon_previewer/plugin.cfg | 7 +++++++ .../import_export/formats_import/import_csv.gd | 15 ++++++++------- .../import_export/import_export_dialog.gd | 7 ++++++- .../import_export/spreadsheet_import.gd | 3 ++- 4 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 addons/editor_icon_previewer/plugin.cfg diff --git a/addons/editor_icon_previewer/plugin.cfg b/addons/editor_icon_previewer/plugin.cfg new file mode 100644 index 0000000..7512bbd --- /dev/null +++ b/addons/editor_icon_previewer/plugin.cfg @@ -0,0 +1,7 @@ +[plugin] + +name="Editor Icon Previewer" +description="Preview available editor icons in Godot Editor." +author="Andrii Doroshenko (Xrayez)" +version="1.2" +script="editor_icon_previewer.gd" diff --git a/addons/resources_speadsheet_view/import_export/formats_import/import_csv.gd b/addons/resources_speadsheet_view/import_export/formats_import/import_csv.gd index 62096c4..f4cb4c5 100644 --- a/addons/resources_speadsheet_view/import_export/formats_import/import_csv.gd +++ b/addons/resources_speadsheet_view/import_export/formats_import/import_csv.gd @@ -18,13 +18,14 @@ static func import_as_arrays(import_data) -> Array: import_data.delimeter = "," line = line[0].split(import_data.delimeter) text_lines[0] = line - if line[1].begins_with(" "): - for i in line.size(): - line[i] = line[i].trim_prefix(" ") - - text_lines[0] = line - space_after_delimeter = true - import_data.delimeter = ", " + + if line[1].begins_with(" "): + for i in line.size(): + line[i] = line[i].trim_prefix(" ") + + text_lines[0] = line + space_after_delimeter = true + import_data.delimeter += " " while !file.eof_reached(): line = file.get_csv_line(import_data.delimeter[0]) diff --git a/addons/resources_speadsheet_view/import_export/import_export_dialog.gd b/addons/resources_speadsheet_view/import_export/import_export_dialog.gd index b4cb3a2..30ee32f 100644 --- a/addons/resources_speadsheet_view/import_export/import_export_dialog.gd +++ b/addons/resources_speadsheet_view/import_export/import_export_dialog.gd @@ -95,7 +95,8 @@ func _generate_class(save_script = true): # Properties for i in import_data.prop_names.size(): - new_script.source_code += import_data.create_property_line_for_prop(i) + if import_data.prop_names[i] != "resource_name": + new_script.source_code += import_data.create_property_line_for_prop(i) import_data.new_script = new_script new_script.reload() @@ -136,6 +137,10 @@ func _on_import_edit_pressed(): import_data.save() yield(get_tree(), "idle_frame") editor_view.display_folder(import_data.resource_path) + editor_view.hidden_columns[editor_view.current_path] = { + "resource_path" : true, + "resource_local_to_scene" : true, + } yield(get_tree(), "idle_frame") editor_view.refresh() diff --git a/addons/resources_speadsheet_view/import_export/spreadsheet_import.gd b/addons/resources_speadsheet_view/import_export/spreadsheet_import.gd index c8b27ef..121e910 100644 --- a/addons/resources_speadsheet_view/import_export/spreadsheet_import.gd +++ b/addons/resources_speadsheet_view/import_export/spreadsheet_import.gd @@ -83,6 +83,7 @@ func string_to_property(string : String, col_index : int): func property_to_string(value, col_index : int) -> String: + if value == null: return "" if prop_types[col_index] is PoolStringArray: return TextEditingUtils.string_snake_to_naming_case( prop_types[col_index][value] @@ -90,7 +91,7 @@ func property_to_string(value, col_index : int) -> String: match prop_types[col_index]: PropType.STRING: - return value + return str(value) PropType.BOOL: return str(value) # TODO: make this actually persist