Skip to content

fix(remote_editor_install): restore correct editor name on macOS #189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shiena wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(remote_editor_install): restore correct editor name on macOS #189

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/components/editors/remote/remote_editor_install/remote_editor_install.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ signal installed(editor_name: String, editor_exec_path: String)
@onready var _show_all_check_box := %ShowAllCheckBox as CheckBox

var _dir_content: Array[edir.DirListResult]
var _initial_editor_name: String = ""
var _show_all: bool:
get: return _show_all_check_box.button_pressed

Expand All @@ -27,7 +28,7 @@ func _ready() -> void:
continue
c.set_checked(0, false)
if selected:
_editor_name_edit.text = utils.guess_editor_name(
_editor_name_edit.text = _pick_editor_name(
selected.get_meta("full_path") as String
)
)
Expand All @@ -40,6 +41,7 @@ func init(editor_name: String, editor_exec_path: String) -> void:
assert(editor_exec_path.ends_with("/"))
Output.push("Installing editor: %s" % editor_exec_path)
_dir_content = edir.list_recursive(editor_exec_path)
_initial_editor_name = editor_name
_editor_name_edit.text = editor_name
_select_exec_file_tree.show()
_setup_editor_select_tree()
Expand All @@ -65,7 +67,7 @@ func _setup_editor_select_tree() -> void:
selected = true
item.set_checked(0, true)
item.select(0)
_editor_name_edit.text = utils.guess_editor_name(x.path)
_editor_name_edit.text = _pick_editor_name(x.path)

var filter: Variant
var should_be_selected: Variant
Expand Down Expand Up @@ -110,5 +112,14 @@ func _on_confirmed() -> void:
queue_free()


func _pick_editor_name(path: String) -> String:
var guessed := utils.guess_editor_name(path)
# When guess_editor_name cannot extract a version (e.g. macOS "Godot.app"),
# it returns the bare filename — fall back to the name derived from the zip.
if guessed == path.get_file() and not _initial_editor_name.is_empty():
return _initial_editor_name
return guessed


func _on_canceled() -> void:
queue_free()