summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2018-08-10 13:29:49 -0300
committerGitHub <noreply@github.com>2018-08-10 13:29:49 -0300
commitea3d997f9d4243c21a9f7a65d0320f31c4d57f54 (patch)
tree3987cd371656fd23d039c3f12905bd713e6ee8b8
parent275e0d5ee4e80d9d3cd124ffa29a691b9aed3e70 (diff)
Revert "added get_creation_time function for gdscript"
-rw-r--r--core/bind/core_bind.cpp8
-rw-r--r--core/bind/core_bind.h1
-rw-r--r--core/io/file_access_buffered_fa.h6
-rw-r--r--core/io/file_access_compressed.cpp9
-rw-r--r--core/io/file_access_compressed.h1
-rw-r--r--core/io/file_access_encrypted.cpp6
-rw-r--r--core/io/file_access_encrypted.h1
-rw-r--r--core/io/file_access_memory.h1
-rw-r--r--core/io/file_access_network.cpp18
-rw-r--r--core/io/file_access_network.h1
-rw-r--r--core/io/file_access_pack.h1
-rw-r--r--core/io/file_access_zip.h1
-rw-r--r--core/io/resource_loader.cpp1
-rw-r--r--core/io/resource_saver.cpp1
-rw-r--r--core/os/file_access.cpp13
-rw-r--r--core/os/file_access.h2
-rw-r--r--drivers/unix/dir_access_unix.cpp20
-rw-r--r--drivers/unix/dir_access_unix.h1
-rw-r--r--drivers/unix/file_access_unix.cpp16
-rw-r--r--drivers/unix/file_access_unix.h1
-rw-r--r--drivers/windows/file_access_windows.cpp20
-rw-r--r--drivers/windows/file_access_windows.h1
-rw-r--r--modules/mono/mono_gd/gd_mono_assembly.h2
-rw-r--r--platform/android/file_access_android.h1
24 files changed, 0 insertions, 133 deletions
diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp
index 1c3f4fad01..af1d49ae8c 100644
--- a/core/bind/core_bind.cpp
+++ b/core/bind/core_bind.cpp
@@ -1872,12 +1872,6 @@ uint64_t _File::get_modified_time(const String &p_file) const {
return FileAccess::get_modified_time(p_file);
}
-// NEW FUNCTION
-uint64_t _File::get_creation_time(const String &p_file) const {
-
- return FileAccess::get_creation_time(p_file);
-}
-
void _File::_bind_methods() {
ClassDB::bind_method(D_METHOD("open_encrypted", "path", "mode_flags", "key"), &_File::open_encrypted);
@@ -1929,7 +1923,6 @@ void _File::_bind_methods() {
ClassDB::bind_method(D_METHOD("file_exists", "path"), &_File::file_exists);
ClassDB::bind_method(D_METHOD("get_modified_time", "file"), &_File::get_modified_time);
- ClassDB::bind_method(D_METHOD("get_creation_time", "file"), &_File::get_creation_time); // NEW FUNCTION
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "endian_swap"), "set_endian_swap", "get_endian_swap");
@@ -2130,7 +2123,6 @@ void _Directory::_bind_methods() {
ClassDB::bind_method(D_METHOD("file_exists", "path"), &_Directory::file_exists);
ClassDB::bind_method(D_METHOD("dir_exists", "path"), &_Directory::dir_exists);
//ClassDB::bind_method(D_METHOD("get_modified_time","file"),&_Directory::get_modified_time);
- //ClassDB::bind_method(D_METHOD("get_creation_time","file"),&_Directory::get_creation_time); // NEW FUNCTION
ClassDB::bind_method(D_METHOD("get_space_left"), &_Directory::get_space_left);
ClassDB::bind_method(D_METHOD("copy", "from", "to"), &_Directory::copy);
ClassDB::bind_method(D_METHOD("rename", "from", "to"), &_Directory::rename);
diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h
index 18f84e0c04..1729c23779 100644
--- a/core/bind/core_bind.h
+++ b/core/bind/core_bind.h
@@ -485,7 +485,6 @@ public:
bool file_exists(const String &p_name) const; ///< return true if a file exists
uint64_t get_modified_time(const String &p_file) const;
- uint64_t get_creation_time(const String &p_file) const; // NEW FUNCTION
_File();
virtual ~_File();
diff --git a/core/io/file_access_buffered_fa.h b/core/io/file_access_buffered_fa.h
index f9b3b29b88..493fa1c243 100644
--- a/core/io/file_access_buffered_fa.h
+++ b/core/io/file_access_buffered_fa.h
@@ -143,12 +143,6 @@ public:
return f._get_modified_time(p_file);
}
-// NEW FUNCTION
- virtual uint64_t _get_creation_time(const String &p_file) {
-
- return f._get_creation_time(p_file);
- }
-
FileAccessBufferedFA(){
};
diff --git a/core/io/file_access_compressed.cpp b/core/io/file_access_compressed.cpp
index 5f08c4fc7c..d6547ba19f 100644
--- a/core/io/file_access_compressed.cpp
+++ b/core/io/file_access_compressed.cpp
@@ -372,15 +372,6 @@ uint64_t FileAccessCompressed::_get_modified_time(const String &p_file) {
return 0;
}
-// NEW FUNCTION
-uint64_t FileAccessCompressed::_get_creation_time(const String &p_file) {
-
- if (f)
- return f->get_creation_time(p_file);
- else
- return 0;
-}
-
FileAccessCompressed::FileAccessCompressed() {
f = NULL;
diff --git a/core/io/file_access_compressed.h b/core/io/file_access_compressed.h
index 834e5b1830..587f58a7c6 100644
--- a/core/io/file_access_compressed.h
+++ b/core/io/file_access_compressed.h
@@ -91,7 +91,6 @@ public:
virtual bool file_exists(const String &p_name); ///< return true if a file exists
virtual uint64_t _get_modified_time(const String &p_file);
- virtual uint64_t _get_creation_time(const String &p_file);// NEW FUNCTION
FileAccessCompressed();
virtual ~FileAccessCompressed();
diff --git a/core/io/file_access_encrypted.cpp b/core/io/file_access_encrypted.cpp
index 1e47be4c08..bb7a444ccc 100644
--- a/core/io/file_access_encrypted.cpp
+++ b/core/io/file_access_encrypted.cpp
@@ -302,12 +302,6 @@ uint64_t FileAccessEncrypted::_get_modified_time(const String &p_file) {
return 0;
}
-// NEW FUNCTION
-uint64_t FileAccessEncrypted::_get_creation_time(const String &p_file) {
-
- return 0;
-}
-
FileAccessEncrypted::FileAccessEncrypted() {
file = NULL;
diff --git a/core/io/file_access_encrypted.h b/core/io/file_access_encrypted.h
index 7cc9ab6637..b9365a9fd0 100644
--- a/core/io/file_access_encrypted.h
+++ b/core/io/file_access_encrypted.h
@@ -79,7 +79,6 @@ public:
virtual bool file_exists(const String &p_name); ///< return true if a file exists
virtual uint64_t _get_modified_time(const String &p_file);
- virtual uint64_t _get_creation_time(const String &p_file); // NEW FUNCTION
FileAccessEncrypted();
~FileAccessEncrypted();
diff --git a/core/io/file_access_memory.h b/core/io/file_access_memory.h
index 3317c20e01..2136f4cc0c 100644
--- a/core/io/file_access_memory.h
+++ b/core/io/file_access_memory.h
@@ -70,7 +70,6 @@ public:
virtual bool file_exists(const String &p_name); ///< return true if a file exists
virtual uint64_t _get_modified_time(const String &p_file) { return 0; }
- virtual uint64_t _get_creation_time(const String &p_file) { return 0; } // NEW FUNCTION
FileAccessMemory();
};
diff --git a/core/io/file_access_network.cpp b/core/io/file_access_network.cpp
index 561f56fd82..e0a2dbf507 100644
--- a/core/io/file_access_network.cpp
+++ b/core/io/file_access_network.cpp
@@ -498,24 +498,6 @@ uint64_t FileAccessNetwork::_get_modified_time(const String &p_file) {
return exists_modtime;
}
-// NEW FUNCTION
-uint64_t FileAccessNetwork::_get_creation_time(const String &p_file) {
-
- FileAccessNetworkClient *nc = FileAccessNetworkClient::singleton;
- nc->lock_mutex();
- nc->put_32(id);
- nc->put_32(COMMAND_GET_MODTIME);
- CharString cs = p_file.utf8();
- nc->put_32(cs.length());
- nc->client->put_data((const uint8_t *)cs.ptr(), cs.length());
- nc->unlock_mutex();
- DEBUG_PRINT("MODTIME POST");
- nc->sem->post();
- sem->wait();
-
- return exists_modtime;
-}
-
void FileAccessNetwork::configure() {
GLOBAL_DEF("network/remote_fs/page_size", 65536);
diff --git a/core/io/file_access_network.h b/core/io/file_access_network.h
index debd4386b8..be9bdb1af6 100644
--- a/core/io/file_access_network.h
+++ b/core/io/file_access_network.h
@@ -162,7 +162,6 @@ public:
virtual bool file_exists(const String &p_path); ///< return true if a file exists
virtual uint64_t _get_modified_time(const String &p_file);
- virtual uint64_t _get_creation_time(const String &p_file); // NEW FUNCTION
static void configure();
diff --git a/core/io/file_access_pack.h b/core/io/file_access_pack.h
index 513e2896c3..8a40e6d78c 100644
--- a/core/io/file_access_pack.h
+++ b/core/io/file_access_pack.h
@@ -142,7 +142,6 @@ class FileAccessPack : public FileAccess {
FileAccess *f;
virtual Error _open(const String &p_path, int p_mode_flags);
virtual uint64_t _get_modified_time(const String &p_file) { return 0; }
- virtual uint64_t _get_creation_time(const String &p_file) { return 0; } // NEW FUNCTION
public:
virtual void close();
diff --git a/core/io/file_access_zip.h b/core/io/file_access_zip.h
index 11f9687e77..df83575f6a 100644
--- a/core/io/file_access_zip.h
+++ b/core/io/file_access_zip.h
@@ -114,7 +114,6 @@ public:
virtual bool file_exists(const String &p_name); ///< return true if a file exists
virtual uint64_t _get_modified_time(const String &p_file) { return 0; } // todo
- virtual uint64_t _get_creation_time(const String &p_file) { return 0; } // NEW FUNCTION
FileAccessZip(const String &p_path, const PackedData::PackedFile &p_file);
~FileAccessZip();
diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp
index 0bb0fb48d4..c44d2597a7 100644
--- a/core/io/resource_loader.cpp
+++ b/core/io/resource_loader.cpp
@@ -231,7 +231,6 @@ RES ResourceLoader::load(const String &p_path, const String &p_type_hint, bool p
res->set_edited(false);
if (timestamp_on_load) {
uint64_t mt = FileAccess::get_modified_time(path);
- uint64_t ct = FileAccess::get_creation_time(path); // NEW FUNCTION
//printf("mt %s: %lli\n",remapped_path.utf8().get_data(),mt);
res->set_last_modified_time(mt);
}
diff --git a/core/io/resource_saver.cpp b/core/io/resource_saver.cpp
index e4bfd5a321..3dcd94880a 100644
--- a/core/io/resource_saver.cpp
+++ b/core/io/resource_saver.cpp
@@ -80,7 +80,6 @@ Error ResourceSaver::save(const String &p_path, const RES &p_resource, uint32_t
((Resource *)p_resource.ptr())->set_edited(false);
if (timestamp_on_save) {
uint64_t mt = FileAccess::get_modified_time(p_path);
- uint64_t ct = FileAccess::get_creation_time(p_path); // NEW FUNCTION
((Resource *)p_resource.ptr())->set_last_modified_time(mt);
}
diff --git a/core/os/file_access.cpp b/core/os/file_access.cpp
index a7730e5efe..59f07c03e7 100644
--- a/core/os/file_access.cpp
+++ b/core/os/file_access.cpp
@@ -488,19 +488,6 @@ uint64_t FileAccess::get_modified_time(const String &p_file) {
memdelete(fa);
return mt;
}
-// NEW FUNCTION
-uint64_t FileAccess::get_creation_time(const String &p_file) {
-
- if (PackedData::get_singleton() && !PackedData::get_singleton()->is_disabled() && PackedData::get_singleton()->has_path(p_file))
- return 0;
-
- FileAccess *fa = create_for_path(p_file);
- ERR_FAIL_COND_V(!fa, 0);
-
- uint64_t ct = fa->_get_creation_time(p_file);
- memdelete(fa);
- return ct;
-}
void FileAccess::store_string(const String &p_string) {
diff --git a/core/os/file_access.h b/core/os/file_access.h
index 2b9477a79c..c4635fdfbb 100644
--- a/core/os/file_access.h
+++ b/core/os/file_access.h
@@ -59,7 +59,6 @@ protected:
String fix_path(const String &p_path) const;
virtual Error _open(const String &p_path, int p_mode_flags) = 0; ///< open a file
virtual uint64_t _get_modified_time(const String &p_file) = 0;
- virtual uint64_t _get_creation_time(const String &p_file) = 0; // NEW FUNCTION
static FileCloseFailNotify close_fail_notify;
@@ -154,7 +153,6 @@ public:
static CreateFunc get_create_func(AccessType p_access);
static bool exists(const String &p_name); ///< return true if a file exists
static uint64_t get_modified_time(const String &p_file);
- static uint64_t get_creation_time(const String &p_file); // NEW FUNCTION
static void set_backup_save(bool p_enable) { backup_save = p_enable; };
static bool is_backup_save_enabled() { return backup_save; };
diff --git a/drivers/unix/dir_access_unix.cpp b/drivers/unix/dir_access_unix.cpp
index 8b2d05c7e9..5a4be6df4f 100644
--- a/drivers/unix/dir_access_unix.cpp
+++ b/drivers/unix/dir_access_unix.cpp
@@ -124,26 +124,6 @@ uint64_t DirAccessUnix::get_modified_time(String p_file) {
return 0;
};
-// NEW FUNCTION
-uint64_t DirAccessUnix::get_creation_time(String p_file) {
-
- if (p_file.is_rel_path())
- p_file = current_dir.plus_file(p_file);
-
- p_file = fix_path(p_file);
-
- struct stat flags;
- bool success = (stat(p_file.utf8().get_data(), &flags) == 0);
-
- if (success) {
- return flags.st_ctime;
- } else {
-
- ERR_FAIL_V(0);
- };
- return 0;
-};
-
String DirAccessUnix::get_next() {
if (!dir_stream)
diff --git a/drivers/unix/dir_access_unix.h b/drivers/unix/dir_access_unix.h
index 815de5239c..a55acdbd34 100644
--- a/drivers/unix/dir_access_unix.h
+++ b/drivers/unix/dir_access_unix.h
@@ -75,7 +75,6 @@ public:
virtual bool dir_exists(String p_dir);
virtual uint64_t get_modified_time(String p_file);
- virtual uint64_t get_creation_time(String p_file); // NEW FUNCTION
virtual Error rename(String p_path, String p_new_path);
virtual Error remove(String p_path);
diff --git a/drivers/unix/file_access_unix.cpp b/drivers/unix/file_access_unix.cpp
index 76b2676c71..c25d34125d 100644
--- a/drivers/unix/file_access_unix.cpp
+++ b/drivers/unix/file_access_unix.cpp
@@ -297,22 +297,6 @@ uint64_t FileAccessUnix::_get_modified_time(const String &p_file) {
};
}
-// NEW FUNCTION
-uint64_t FileAccessUnix::_get_creation_time(const String &p_file) {
-
- String file = fix_path(p_file);
- struct stat flags;
- int err = stat(file.utf8().get_data(), &flags);
-
- if (!err) {
- return flags.st_ctime;
- } else {
- print_line("ERROR IN: " + p_file);
-
- ERR_FAIL_V(0);
- };
-}
-
Error FileAccessUnix::_chmod(const String &p_path, int p_mod) {
int err = chmod(p_path.utf8().get_data(), p_mod);
if (!err) {
diff --git a/drivers/unix/file_access_unix.h b/drivers/unix/file_access_unix.h
index f81a4847d2..88bb39fbd1 100644
--- a/drivers/unix/file_access_unix.h
+++ b/drivers/unix/file_access_unix.h
@@ -84,7 +84,6 @@ public:
virtual bool file_exists(const String &p_path); ///< return true if a file exists
virtual uint64_t _get_modified_time(const String &p_file);
- virtual uint64_t _get_creation_time(const String &p_file); // NEW FUNCTION
virtual Error _chmod(const String &p_path, int p_mod);
diff --git a/drivers/windows/file_access_windows.cpp b/drivers/windows/file_access_windows.cpp
index c74d8853d4..ea194e5eae 100644
--- a/drivers/windows/file_access_windows.cpp
+++ b/drivers/windows/file_access_windows.cpp
@@ -311,26 +311,6 @@ uint64_t FileAccessWindows::_get_modified_time(const String &p_file) {
ERR_FAIL_V(0);
};
-// NEW FUNCTION
-uint64_t FileAccessWindows::_get_creation_time(const String &p_file) {
-
- String file = fix_path(p_file);
- if (file.ends_with("/") && file != "/")
- file = file.substr(0, file.length() - 1);
-
- struct _stat st;
- int rv = _wstat(file.c_str(), &st);
-
- if (rv == 0) {
-
- return st.st_ctime;
- } else {
- print_line("no access to " + file);
- }
-
- ERR_FAIL_V(0);
-};
-
FileAccessWindows::FileAccessWindows() {
f = NULL;
diff --git a/drivers/windows/file_access_windows.h b/drivers/windows/file_access_windows.h
index ee83acffd7..0462c1e942 100644
--- a/drivers/windows/file_access_windows.h
+++ b/drivers/windows/file_access_windows.h
@@ -77,7 +77,6 @@ public:
virtual bool file_exists(const String &p_name); ///< return true if a file exists
uint64_t _get_modified_time(const String &p_file);
- uint64_t _get_creation_time(const String &p_file); // NEW FUNCTION
FileAccessWindows();
virtual ~FileAccessWindows();
diff --git a/modules/mono/mono_gd/gd_mono_assembly.h b/modules/mono/mono_gd/gd_mono_assembly.h
index 187eb10af2..5cf744a5a2 100644
--- a/modules/mono/mono_gd/gd_mono_assembly.h
+++ b/modules/mono/mono_gd/gd_mono_assembly.h
@@ -77,7 +77,6 @@ class GDMonoAssembly {
String name;
String path;
uint64_t modified_time;
- uint64_t creation_time; // NEW FUNCTION
HashMap<ClassKey, GDMonoClass *, ClassKey::Hasher> cached_classes;
Map<MonoClass *, GDMonoClass *> cached_raw;
@@ -117,7 +116,6 @@ public:
_FORCE_INLINE_ String get_name() const { return name; }
_FORCE_INLINE_ String get_path() const { return path; }
_FORCE_INLINE_ uint64_t get_modified_time() const { return modified_time; }
- _FORCE_INLINE_ uint64_t get_creation_time() const { return creation_time; } // NEW FUNCTION
GDMonoClass *get_class(const StringName &p_namespace, const StringName &p_name);
GDMonoClass *get_class(MonoClass *p_mono_class);
diff --git a/platform/android/file_access_android.h b/platform/android/file_access_android.h
index 3d51e31005..03f4c59521 100644
--- a/platform/android/file_access_android.h
+++ b/platform/android/file_access_android.h
@@ -70,7 +70,6 @@ public:
virtual bool file_exists(const String &p_path); ///< return true if a file exists
virtual uint64_t _get_modified_time(const String &p_file) { return 0; }
- virtual uint64_t _get_creation_time(const String &p_file) { return 0; } // NEW FUNCTION
//static void make_default();