godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Follow-Up Fix Directory Open" 

This reverts commit ec787f0134.
This commit is contained in:
Nathan Franke 2020-07-09 14:23:59 -05:00 committed by Aaron Franke
parent 4c100a593f
commit 9de0439a45
No known key found for this signature in database
GPG Key ID: 40A1750B977E56BF
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/bind/core_bind.cpp
View File

@ -2421,15 +2421,8 @@ int _Directory::get_current_drive() {
} }
Error _Directory::change_dir(String p_dir) { Error _Directory::change_dir(String p_dir) {
ERR_FAIL_COND_V_MSG(!d, ERR_UNCONFIGURED, "Directory is not configured properly."); ERR_FAIL_COND_V_MSG(!is_open(), ERR_UNCONFIGURED, "Directory must be opened before use.");
Error err = d->change_dir(p_dir); return d->change_dir(p_dir);
if (err != OK) {
return err;
}
dir_open = true;
return OK;
} }
String _Directory::get_current_dir() { String _Directory::get_current_dir() {
ERR_FAIL_COND_V_MSG(!is_open(), "", "Directory must be opened before use."); ERR_FAIL_COND_V_MSG(!is_open(), "", "Directory must be opened before use.");
@ -2457,7 +2450,8 @@ Error _Directory::make_dir_recursive(String p_dir) {
} }
bool _Directory::file_exists(String p_file) { bool _Directory::file_exists(String p_file) {
ERR_FAIL_COND_V_MSG(!d, false, "Directory is not configured properly."); ERR_FAIL_COND_V_MSG(!is_open(), false, "Directory must be opened before use.");
if (!p_file.is_rel_path()) { if (!p_file.is_rel_path()) {
return FileAccess::exists(p_file); return FileAccess::exists(p_file);
} }
@ -2466,16 +2460,17 @@ bool _Directory::file_exists(String p_file) {
} }
bool _Directory::dir_exists(String p_dir) { bool _Directory::dir_exists(String p_dir) {
ERR_FAIL_COND_V_MSG(!d, false, "Directory is not configured properly."); ERR_FAIL_COND_V_MSG(!is_open(), false, "Directory must be opened before use.");
if (!p_dir.is_rel_path()) { if (!p_dir.is_rel_path()) {
DirAccess *d = DirAccess::create_for_path(p_dir); DirAccess *d = DirAccess::create_for_path(p_dir);
bool exists = d->dir_exists(p_dir); bool exists = d->dir_exists(p_dir);
memdelete(d); memdelete(d);
return exists; return exists;
}
return d->dir_exists(p_dir); } else {
return d->dir_exists(p_dir);
}
} }
int _Directory::get_space_left() { int _Directory::get_space_left() {

4
doc/classes/Directory.xml
View File

@ -5,7 +5,7 @@
</brief_description> </brief_description>
<description> <description>
Directory type. It is used to manage directories and their content (not restricted to the project folder). Directory type. It is used to manage directories and their content (not restricted to the project folder).
When creating a new [Directory], it must be explicitly opened using [method open] before most methods can be used. However, [method file_exists] and [method dir_exists] can be used without opening a directory. If so, they use a path relative to [code]res://[/code]. When creating a new [Directory], its default opened directory will be [code]res://[/code]. This may change in the future, so it is advised to always use [method open] to initialize your [Directory] where you want to operate, with explicit error checking.
Here is an example on how to iterate through the files of a directory: Here is an example on how to iterate through the files of a directory:
[codeblock] [codeblock]
func dir_contents(path): func dir_contents(path):
@ -63,7 +63,6 @@
</argument> </argument>
<description> <description>
Returns whether the target directory exists. The argument can be relative to the current directory, or an absolute path. Returns whether the target directory exists. The argument can be relative to the current directory, or an absolute path.
If the [Directory] is not open, the path is relative to [code]res://[/code].
</description> </description>
</method> </method>
<method name="file_exists"> <method name="file_exists">
@ -73,7 +72,6 @@
</argument> </argument>
<description> <description>
Returns whether the target file exists. The argument can be relative to the current directory, or an absolute path. Returns whether the target file exists. The argument can be relative to the current directory, or an absolute path.
If the [Directory] is not open, the path is relative to [code]res://[/code].
</description> </description>
</method> </method>
<method name="get_current_dir"> <method name="get_current_dir">