godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Fix some bugs in diraccess, closes #5288

Browse Source
This commit is contained in:
Juan Linietsky
2016-06-30 18:23:39 -03:00
parent 89bb72b2d3
commit ffbc2e56c9
3 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/unix/dir_access_unix.cpp
View File

@@ -67,8 +67,8 @@ bool DirAccessUnix::file_exists(String p_file) {
if (p_file.is_rel_path()) if (p_file.is_rel_path())
p_file=current_dir.plus_file(p_file); p_file=current_dir.plus_file(p_file);
else
p_file=fix_path(p_file); p_file=fix_path(p_file);
struct stat flags; struct stat flags;
bool success = (stat(p_file.utf8().get_data(),&flags)==0); bool success = (stat(p_file.utf8().get_data(),&flags)==0);
@@ -88,8 +88,8 @@ bool DirAccessUnix::dir_exists(String p_dir) {
if (p_dir.is_rel_path()) if (p_dir.is_rel_path())
p_dir=get_current_dir().plus_file(p_dir); p_dir=get_current_dir().plus_file(p_dir);
else
p_dir=fix_path(p_dir); p_dir=fix_path(p_dir);
struct stat flags; struct stat flags;
bool success = (stat(p_dir.utf8().get_data(),&flags)==0); bool success = (stat(p_dir.utf8().get_data(),&flags)==0);
@@ -105,8 +105,8 @@ uint64_t DirAccessUnix::get_modified_time(String p_file) {
if (p_file.is_rel_path()) if (p_file.is_rel_path())
p_file=current_dir.plus_file(p_file); p_file=current_dir.plus_file(p_file);
else
p_file=fix_path(p_file); p_file=fix_path(p_file);
struct stat flags; struct stat flags;
bool success = (stat(p_file.utf8().get_data(),&flags)==0); bool success = (stat(p_file.utf8().get_data(),&flags)==0);
@@ -201,8 +201,11 @@ Error DirAccessUnix::make_dir(String p_dir) {
if (p_dir.is_rel_path()) if (p_dir.is_rel_path())
p_dir=get_current_dir().plus_file(p_dir); p_dir=get_current_dir().plus_file(p_dir);
else
p_dir=fix_path(p_dir);
p_dir=fix_path(p_dir);
#if 1 #if 1
@@ -287,13 +290,13 @@ Error DirAccessUnix::rename(String p_path,String p_new_path) {
if (p_path.is_rel_path()) if (p_path.is_rel_path())
p_path=get_current_dir().plus_file(p_path); p_path=get_current_dir().plus_file(p_path);
else
p_path=fix_path(p_path); p_path=fix_path(p_path);
if (p_new_path.is_rel_path()) if (p_new_path.is_rel_path())
p_new_path=get_current_dir().plus_file(p_new_path); p_new_path=get_current_dir().plus_file(p_new_path);
else
p_new_path=fix_path(p_new_path); p_new_path=fix_path(p_new_path);
return ::rename(p_path.utf8().get_data(),p_new_path.utf8().get_data())==0?OK:FAILED; return ::rename(p_path.utf8().get_data(),p_new_path.utf8().get_data())==0?OK:FAILED;
} }
@@ -301,8 +304,8 @@ Error DirAccessUnix::remove(String p_path) {
if (p_path.is_rel_path()) if (p_path.is_rel_path())
p_path=get_current_dir().plus_file(p_path); p_path=get_current_dir().plus_file(p_path);
else
p_path=fix_path(p_path); p_path=fix_path(p_path);
struct stat flags; struct stat flags;
if ((stat(p_path.utf8().get_data(),&flags)!=0)) if ((stat(p_path.utf8().get_data(),&flags)!=0))

20
drivers/windows/dir_access_windows.cpp
View File

@@ -193,8 +193,8 @@ Error DirAccessWindows::make_dir(String p_dir) {
if (p_dir.is_rel_path()) if (p_dir.is_rel_path())
p_dir=get_current_dir().plus_file(p_dir); p_dir=get_current_dir().plus_file(p_dir);
else
p_dir=fix_path(p_dir); p_dir=fix_path(p_dir);
p_dir = p_dir.replace("/","\\"); p_dir = p_dir.replace("/","\\");
bool success; bool success;
@@ -268,8 +268,8 @@ bool DirAccessWindows::dir_exists(String p_dir) {
if (p_dir.is_rel_path()) if (p_dir.is_rel_path())
p_dir=get_current_dir().plus_file(p_dir); p_dir=get_current_dir().plus_file(p_dir);
else
p_dir=fix_path(p_dir); p_dir=fix_path(p_dir);
//p_dir.replace("/","\\"); //p_dir.replace("/","\\");
@@ -289,13 +289,13 @@ Error DirAccessWindows::rename(String p_path,String p_new_path) {
if (p_path.is_rel_path()) if (p_path.is_rel_path())
p_path=get_current_dir().plus_file(p_path); p_path=get_current_dir().plus_file(p_path);
else
p_path=fix_path(p_path); p_path=fix_path(p_path);
if (p_new_path.is_rel_path()) if (p_new_path.is_rel_path())
p_new_path=get_current_dir().plus_file(p_new_path); p_new_path=get_current_dir().plus_file(p_new_path);
else
p_new_path=fix_path(p_new_path); p_new_path=fix_path(p_new_path);
if (file_exists(p_new_path)) { if (file_exists(p_new_path)) {
if (remove(p_new_path) != OK) { if (remove(p_new_path) != OK) {
@@ -310,8 +310,8 @@ Error DirAccessWindows::remove(String p_path) {
if (p_path.is_rel_path()) if (p_path.is_rel_path())
p_path=get_current_dir().plus_file(p_path); p_path=get_current_dir().plus_file(p_path);
else
p_path=fix_path(p_path); p_path=fix_path(p_path);
printf("erasing %s\n",p_path.utf8().get_data()); printf("erasing %s\n",p_path.utf8().get_data());

8
tools/editor/editor_dir_dialog.cpp
View File

@@ -191,10 +191,14 @@ void EditorDirDialog::ok_pressed() {
void EditorDirDialog::_make_dir() { void EditorDirDialog::_make_dir() {
TreeItem *ti=tree->get_selected(); TreeItem *ti=tree->get_selected();
if (!ti) if (!ti) {
mkdirerr->set_text("Please select a base directory first");
mkdirerr->popup_centered_minsize();
return; return;
}
makedialog->popup_centered_minsize(Size2(250,80)); makedialog->popup_centered_minsize(Size2(250,80));
makedirname->grab_focus();
} }
void EditorDirDialog::_make_dir_confirm() { void EditorDirDialog::_make_dir_confirm() {
@@ -204,9 +208,11 @@ void EditorDirDialog::_make_dir_confirm() {
return; return;
String dir = ti->get_metadata(0); String dir = ti->get_metadata(0);
DirAccess *d = DirAccess::open(dir); DirAccess *d = DirAccess::open(dir);
ERR_FAIL_COND(!d); ERR_FAIL_COND(!d);
Error err = d->make_dir(makedirname->get_text()); Error err = d->make_dir(makedirname->get_text());
if (err!=OK) { if (err!=OK) {
mkdirerr->popup_centered_minsize(Size2(250,80)); mkdirerr->popup_centered_minsize(Size2(250,80));
} else { } else {