mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-01-12 20:22:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #78057 from KoBeWi/PR_snatcher_strikes_back

Browse Source 
Fix moving directories in filesystem
This commit is contained in:
Rémi Verschelde 2023-06-12 11:40:18 +02:00
commit 7db29c04cd
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
editor/filesystem_dock.cpp
View File

@ -1790,17 +1790,11 @@ void FileSystemDock::_overwrite_dialog_action(bool p_overwrite) {
Vector<String> FileSystemDock::_check_existing() { Vector<String> FileSystemDock::_check_existing() {
Vector<String> conflicting_items; Vector<String> conflicting_items;
String &p_to_path = to_move_path; for (const FileOrFolder &item : to_move) {
for (int i = 0; i < to_move.size(); i++) { String old_path = item.path.trim_suffix("/");
String ol_pth = to_move[i].path.ends_with("/") ? to_move[i].path.substr(0, to_move[i].path.length() - 1) : to_move[i].path; String new_path = to_move_path.path_join(old_path.get_file());
String p_new_path = p_to_path.path_join(ol_pth.get_file());
FileOrFolder p_item = to_move[i];
String old_path = (p_item.is_file || p_item.path.ends_with("/")) ? p_item.path : (p_item.path + "/"); if ((item.is_file && FileAccess::exists(new_path)) || (!item.is_file && DirAccess::exists(new_path))) {
String new_path = (p_item.is_file || p_new_path.ends_with("/")) ? p_new_path : (p_new_path + "/");
if ((p_item.is_file && FileAccess::exists(new_path)) ||
(!p_item.is_file && DirAccess::exists(new_path))) {
conflicting_items.push_back(old_path); conflicting_items.push_back(old_path);
} }
} }
@ -1843,11 +1837,15 @@ void FileSystemDock::_move_operation_confirm(const String &p_to_path, bool p_cop
if (p_copy) { if (p_copy) {
bool is_copied = false; bool is_copied = false;
for (int i = 0; i < to_move.size(); i++) { for (int i = 0; i < to_move.size(); i++) {
String old_path = to_move[i].path.ends_with("/") ? to_move[i].path.substr(0, to_move[i].path.length() - 1) : to_move[i].path; String old_path = to_move[i].path;
const String &new_path = new_paths[i]; String new_path = new_paths[i];
if (!to_move[i].is_file) {
new_path = new_path.path_join(old_path.trim_suffix("/").get_file());
}
if (old_path != new_path) { if (old_path != new_path) {
_try_duplicate_item(to_move[i], new_paths[i]); _try_duplicate_item(to_move[i], new_path);
is_copied = true; is_copied = true;
} }
} }
@ -1868,8 +1866,14 @@ void FileSystemDock::_move_operation_confirm(const String &p_to_path, bool p_cop
HashMap<String, String> folder_renames; HashMap<String, String> folder_renames;
for (int i = 0; i < to_move.size(); i++) { for (int i = 0; i < to_move.size(); i++) {
String old_path = to_move[i].path.ends_with("/") ? to_move[i].path.substr(0, to_move[i].path.length() - 1) : to_move[i].path; String old_path = to_move[i].path;
const String &new_path = new_paths[i]; String new_path = new_paths[i];
if (!to_move[i].is_file) {
new_path = new_path.path_join(old_path.trim_suffix("/").get_file());
print_line(new_path);
}
if (old_path != new_path) { if (old_path != new_path) {
_try_move_item(to_move[i], new_path, file_renames, folder_renames); _try_move_item(to_move[i], new_path, file_renames, folder_renames);
is_moved = true; is_moved = true;
@ -2614,7 +2618,7 @@ void FileSystemDock::drop_data_fw(const Point2 &p_point, const Variant &p_data,
Vector<String> fnames = drag_data["files"]; Vector<String> fnames = drag_data["files"];
to_move.clear(); to_move.clear();
for (int i = 0; i < fnames.size(); i++) { for (int i = 0; i < fnames.size(); i++) {
if (fnames[i].get_base_dir() != to_dir) { if (fnames[i].trim_suffix("/").get_base_dir() != to_dir.trim_suffix("/")) {
to_move.push_back(FileOrFolder(fnames[i], !fnames[i].ends_with("/"))); to_move.push_back(FileOrFolder(fnames[i], !fnames[i].ends_with("/")));
} }
} }