Add function to obtain filesystem type from DirAccess.

Change EditorFileSystem to not use directory modification times on FAT32, fixes #20946
This commit is contained in:
Juan Linietsky 2019-01-21 15:23:08 -03:00
parent 100154a131
commit 6fa632b821
11 changed files with 62 additions and 1 deletions

View File

@ -490,6 +490,10 @@ size_t DirAccessPack::get_space_left() {
return 0;
}
String DirAccessPack::get_filesystem_type() const {
return "PCK";
}
DirAccessPack::DirAccessPack() {
current = PackedData::get_singleton()->root;

View File

@ -221,6 +221,9 @@ public:
size_t get_space_left();
virtual String get_filesystem_type() const;
DirAccessPack();
~DirAccessPack();
};

View File

@ -98,6 +98,7 @@ public:
virtual Error rename(String p_from, String p_to) = 0;
virtual Error remove(String p_name) = 0;
virtual String get_filesystem_type() const=0 ;
static String get_full_path(const String &p_path, AccessType p_access);
static DirAccess *create_for_path(const String &p_path);

View File

@ -407,6 +407,10 @@ size_t DirAccessUnix::get_space_left() {
#endif
};
String DirAccessUnix::get_filesystem_type() const {
return ""; //TODO this should be implemented
}
DirAccessUnix::DirAccessUnix() {
dir_stream = 0;

View File

@ -82,6 +82,9 @@ public:
virtual size_t get_space_left();
virtual String get_filesystem_type() const;
DirAccessUnix();
~DirAccessUnix();
};

View File

@ -346,6 +346,35 @@ size_t DirAccessWindows::get_space_left() {
return (size_t)bytes;
}
String DirAccessWindows::get_filesystem_type() const {
String path = fix_path(const_cast<DirAccessWindows*>(this)->get_current_dir());
print_line("fixed path: "+path);
int unit_end = path.find(":");
ERR_FAIL_COND_V(unit_end==-1,String());
String unit = path.substr(0,unit_end+1) + "\\";
print_line("unit: "+unit);
TCHAR szVolumeName[100] = "";
TCHAR szFileSystemName[10] = "";
DWORD dwSerialNumber = 0;
DWORD dwMaxFileNameLength = 0;
DWORD dwFileSystemFlags = 0;
if(::GetVolumeInformation(unit.utf8().get_data(),
szVolumeName,
sizeof(szVolumeName),
&dwSerialNumber,
&dwMaxFileNameLength,
&dwFileSystemFlags,
szFileSystemName,
sizeof(szFileSystemName)) == TRUE) {
return String(szFileSystemName);
}
ERR_FAIL_V("");
}
DirAccessWindows::DirAccessWindows() {
p = memnew(DirAccessWindowsPrivate);

View File

@ -82,6 +82,9 @@ public:
//virtual FileType get_file_type() const;
size_t get_space_left();
virtual String get_filesystem_type() const;
DirAccessWindows();
~DirAccessWindows();
};

View File

@ -797,7 +797,7 @@ void EditorFileSystem::_scan_fs_changes(EditorFileSystemDirectory *p_dir, const
bool updated_dir = false;
String cd = p_dir->get_path();
if (current_mtime != p_dir->modified_time) {
if (current_mtime != p_dir->modified_time || using_fat_32) {
updated_dir = true;
p_dir->modified_time = current_mtime;
@ -1809,10 +1809,14 @@ EditorFileSystem::EditorFileSystem() {
if (da->change_dir("res://.import") != OK) {
da->make_dir("res://.import");
}
//this should probably also work on Unix and use the string it returns for FAT32
using_fat_32 = da->get_filesystem_type()=="FAT32";
memdelete(da);
scan_total = 0;
update_script_classes_queued = false;
}
EditorFileSystem::~EditorFileSystem() {

View File

@ -231,6 +231,8 @@ class EditorFileSystem : public Node {
static Error _resource_import(const String &p_path);
bool using_fat_32; //workaround for projects in FAT32 filesystem (pendrives, most of the time)
protected:
void _notification(int p_what);
static void _bind_methods();

View File

@ -212,6 +212,12 @@ Error DirAccessJAndroid::remove(String p_name) {
ERR_FAIL_V(ERR_UNAVAILABLE);
}
String DirAccessJAndroid::get_filesystem_type() const {
return "APK";
}
//FileType get_file_type() const;
size_t DirAccessJAndroid::get_space_left() {

View File

@ -75,6 +75,8 @@ public:
virtual Error rename(String p_from, String p_to);
virtual Error remove(String p_name);
virtual String get_filesystem_type() const;
//virtual FileType get_file_type() const;
size_t get_space_left();