diff options
| -rw-r--r-- | core/io/dir_access.h | 4 | ||||
| -rw-r--r-- | core/io/file_access.h | 34 |
2 files changed, 19 insertions, 19 deletions
diff --git a/core/io/dir_access.h b/core/io/dir_access.h index ee675f1c89..bd24214e73 100644 --- a/core/io/dir_access.h +++ b/core/io/dir_access.h @@ -52,8 +52,10 @@ public: private: AccessType _access_type = ACCESS_FILESYSTEM; static CreateFunc create_func[ACCESS_MAX]; ///< set this to instance a filesystem object + static Ref<DirAccess> _open(const String &p_path); Error _copy_dir(Ref<DirAccess> &p_target_da, String p_to, int p_chmod_flags, bool p_copy_links); + PackedStringArray _get_contents(bool p_directories); thread_local static Error last_dir_open_error; bool include_navigational = false; @@ -134,7 +136,6 @@ public: } static Ref<DirAccess> open(const String &p_path, Error *r_error = nullptr); - static Ref<DirAccess> _open(const String &p_path); static int _get_drive_count(); static String get_drive_name(int p_idx); @@ -151,7 +152,6 @@ public: static PackedStringArray get_files_at(const String &p_path); PackedStringArray get_directories(); static PackedStringArray get_directories_at(const String &p_path); - PackedStringArray _get_contents(bool p_directories); String _get_next(); void set_include_navigational(bool p_enable); diff --git a/core/io/file_access.h b/core/io/file_access.h index f8c42d3c0d..8ca44306a0 100644 --- a/core/io/file_access.h +++ b/core/io/file_access.h @@ -53,6 +53,20 @@ public: ACCESS_MAX }; + enum ModeFlags { + READ = 1, + WRITE = 2, + READ_WRITE = 3, + WRITE_READ = 7, + }; + + enum CompressionMode { + COMPRESSION_FASTLZ = Compression::MODE_FASTLZ, + COMPRESSION_DEFLATE = Compression::MODE_DEFLATE, + COMPRESSION_ZSTD = Compression::MODE_ZSTD, + COMPRESSION_GZIP = Compression::MODE_GZIP + }; + typedef void (*FileCloseFailNotify)(const String &); typedef Ref<FileAccess> (*CreateFunc)(); @@ -69,6 +83,7 @@ protected: String fix_path(const String &p_path) const; virtual Error open_internal(const String &p_path, int p_mode_flags) = 0; ///< open a file virtual uint64_t _get_modified_time(const String &p_file) = 0; + virtual void _set_access_type(AccessType p_access); static FileCloseFailNotify close_fail_notify; @@ -83,25 +98,11 @@ private: return memnew(T); } + static Ref<FileAccess> _open(const String &p_path, ModeFlags p_mode_flags); + public: static void set_file_close_fail_notify_callback(FileCloseFailNotify p_cbk) { close_fail_notify = p_cbk; } - virtual void _set_access_type(AccessType p_access); - - enum ModeFlags { - READ = 1, - WRITE = 2, - READ_WRITE = 3, - WRITE_READ = 7, - }; - - enum CompressionMode { - COMPRESSION_FASTLZ = Compression::MODE_FASTLZ, - COMPRESSION_DEFLATE = Compression::MODE_DEFLATE, - COMPRESSION_ZSTD = Compression::MODE_ZSTD, - COMPRESSION_GZIP = Compression::MODE_GZIP - }; - virtual bool is_open() const = 0; ///< true when file is open virtual String get_path() const { return ""; } /// returns the path for the current open file @@ -173,7 +174,6 @@ public: static Ref<FileAccess> create_for_path(const String &p_path); static Ref<FileAccess> open(const String &p_path, int p_mode_flags, Error *r_error = nullptr); /// Create a file access (for the current platform) this is the only portable way of accessing files. - static Ref<FileAccess> _open(const String &p_path, ModeFlags p_mode_flags); static Ref<FileAccess> open_encrypted(const String &p_path, ModeFlags p_mode_flags, const Vector<uint8_t> &p_key); static Ref<FileAccess> open_encrypted_pass(const String &p_path, ModeFlags p_mode_flags, const String &p_pass); static Ref<FileAccess> open_compressed(const String &p_path, ModeFlags p_mode_flags, CompressionMode p_compress_mode = COMPRESSION_FASTLZ); |