diff options
Diffstat (limited to 'editor/editor_file_system.cpp')
| -rw-r--r-- | editor/editor_file_system.cpp | 1038 |
1 files changed, 466 insertions, 572 deletions
diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp index cd151cd90b..b188a5760b 100644 --- a/editor/editor_file_system.cpp +++ b/editor/editor_file_system.cpp @@ -28,65 +28,61 @@ /*************************************************************************/ #include "editor_file_system.h" +#include "editor_node.h" +#include "editor_resource_preview.h" +#include "editor_settings.h" #include "global_config.h" +#include "io/resource_import.h" #include "io/resource_loader.h" -#include "os/os.h" -#include "os/file_access.h" -#include "editor_node.h" #include "io/resource_saver.h" -#include "io/resource_import.h" -#include "editor_settings.h" -#include "editor_resource_preview.h" +#include "os/file_access.h" +#include "os/os.h" #include "variant_parser.h" -EditorFileSystem *EditorFileSystem::singleton=NULL; +EditorFileSystem *EditorFileSystem::singleton = NULL; void EditorFileSystemDirectory::sort_files() { files.sort_custom<FileInfoSort>(); } -int EditorFileSystemDirectory::find_file_index(const String& p_file) const { +int EditorFileSystemDirectory::find_file_index(const String &p_file) const { - for(int i=0;i<files.size();i++) { - if (files[i]->file==p_file) + for (int i = 0; i < files.size(); i++) { + if (files[i]->file == p_file) return i; } return -1; - } -int EditorFileSystemDirectory::find_dir_index(const String& p_dir) const{ +int EditorFileSystemDirectory::find_dir_index(const String &p_dir) const { - - for(int i=0;i<subdirs.size();i++) { - if (subdirs[i]->name==p_dir) + for (int i = 0; i < subdirs.size(); i++) { + if (subdirs[i]->name == p_dir) return i; } return -1; } - int EditorFileSystemDirectory::get_subdir_count() const { return subdirs.size(); } -EditorFileSystemDirectory *EditorFileSystemDirectory::get_subdir(int p_idx){ +EditorFileSystemDirectory *EditorFileSystemDirectory::get_subdir(int p_idx) { - ERR_FAIL_INDEX_V(p_idx,subdirs.size(),NULL); + ERR_FAIL_INDEX_V(p_idx, subdirs.size(), NULL); return subdirs[p_idx]; - } -int EditorFileSystemDirectory::get_file_count() const{ +int EditorFileSystemDirectory::get_file_count() const { return files.size(); } -String EditorFileSystemDirectory::get_file(int p_idx) const{ +String EditorFileSystemDirectory::get_file(int p_idx) const { - ERR_FAIL_INDEX_V(p_idx,files.size(),""); + ERR_FAIL_INDEX_V(p_idx, files.size(), ""); return files[p_idx]->file; } @@ -94,41 +90,36 @@ String EditorFileSystemDirectory::get_file(int p_idx) const{ String EditorFileSystemDirectory::get_path() const { String p; - const EditorFileSystemDirectory *d=this; - while(d->parent) { - p=d->name+"/"+p; - d=d->parent; + const EditorFileSystemDirectory *d = this; + while (d->parent) { + p = d->name + "/" + p; + d = d->parent; } - return "res://"+p; - + return "res://" + p; } - String EditorFileSystemDirectory::get_file_path(int p_idx) const { String file = get_file(p_idx); - const EditorFileSystemDirectory *d=this; - while(d->parent) { - file=d->name+"/"+file; - d=d->parent; + const EditorFileSystemDirectory *d = this; + while (d->parent) { + file = d->name + "/" + file; + d = d->parent; } - return "res://"+file; + return "res://" + file; } - Vector<String> EditorFileSystemDirectory::get_file_deps(int p_idx) const { - ERR_FAIL_INDEX_V(p_idx,files.size(),Vector<String>()); + ERR_FAIL_INDEX_V(p_idx, files.size(), Vector<String>()); return files[p_idx]->deps; - } - StringName EditorFileSystemDirectory::get_file_type(int p_idx) const { - ERR_FAIL_INDEX_V(p_idx,files.size(),""); + ERR_FAIL_INDEX_V(p_idx, files.size(), ""); return files[p_idx]->type; } @@ -144,45 +135,38 @@ EditorFileSystemDirectory *EditorFileSystemDirectory::get_parent() { void EditorFileSystemDirectory::_bind_methods() { - ClassDB::bind_method(D_METHOD("get_subdir_count"),&EditorFileSystemDirectory::get_subdir_count); - ClassDB::bind_method(D_METHOD("get_subdir","idx"),&EditorFileSystemDirectory::get_subdir); - ClassDB::bind_method(D_METHOD("get_file_count"),&EditorFileSystemDirectory::get_file_count); - ClassDB::bind_method(D_METHOD("get_file","idx"),&EditorFileSystemDirectory::get_file); - ClassDB::bind_method(D_METHOD("get_file_path","idx"),&EditorFileSystemDirectory::get_file_path); - ClassDB::bind_method(D_METHOD("get_file_type","idx"),&EditorFileSystemDirectory::get_file_type); - ClassDB::bind_method(D_METHOD("get_name"),&EditorFileSystemDirectory::get_name); - ClassDB::bind_method(D_METHOD("get_path"),&EditorFileSystemDirectory::get_path); - ClassDB::bind_method(D_METHOD("get_parent:EditorFileSystemDirectory"),&EditorFileSystemDirectory::get_parent); - ClassDB::bind_method(D_METHOD("find_file_index","name"),&EditorFileSystemDirectory::find_file_index); - ClassDB::bind_method(D_METHOD("find_dir_index","name"),&EditorFileSystemDirectory::find_dir_index); - - + ClassDB::bind_method(D_METHOD("get_subdir_count"), &EditorFileSystemDirectory::get_subdir_count); + ClassDB::bind_method(D_METHOD("get_subdir", "idx"), &EditorFileSystemDirectory::get_subdir); + ClassDB::bind_method(D_METHOD("get_file_count"), &EditorFileSystemDirectory::get_file_count); + ClassDB::bind_method(D_METHOD("get_file", "idx"), &EditorFileSystemDirectory::get_file); + ClassDB::bind_method(D_METHOD("get_file_path", "idx"), &EditorFileSystemDirectory::get_file_path); + ClassDB::bind_method(D_METHOD("get_file_type", "idx"), &EditorFileSystemDirectory::get_file_type); + ClassDB::bind_method(D_METHOD("get_name"), &EditorFileSystemDirectory::get_name); + ClassDB::bind_method(D_METHOD("get_path"), &EditorFileSystemDirectory::get_path); + ClassDB::bind_method(D_METHOD("get_parent:EditorFileSystemDirectory"), &EditorFileSystemDirectory::get_parent); + ClassDB::bind_method(D_METHOD("find_file_index", "name"), &EditorFileSystemDirectory::find_file_index); + ClassDB::bind_method(D_METHOD("find_dir_index", "name"), &EditorFileSystemDirectory::find_dir_index); } - EditorFileSystemDirectory::EditorFileSystemDirectory() { - modified_time=0; - parent=NULL; + modified_time = 0; + parent = NULL; } EditorFileSystemDirectory::~EditorFileSystemDirectory() { - for(int i=0;i<files.size();i++) { + for (int i = 0; i < files.size(); i++) { memdelete(files[i]); } - for(int i=0;i<subdirs.size();i++) { + for (int i = 0; i < subdirs.size(); i++) { memdelete(subdirs[i]); } } - - - - void EditorFileSystem::_scan_filesystem() { ERR_FAIL_COND(!scanning || new_filesystem); @@ -193,335 +177,316 @@ void EditorFileSystem::_scan_filesystem() { sources_changed.clear(); file_cache.clear(); - String project=GlobalConfig::get_singleton()->get_resource_path(); + String project = GlobalConfig::get_singleton()->get_resource_path(); String fscache = EditorSettings::get_singleton()->get_project_settings_path().plus_file("filesystem_cache2"); - FileAccess *f =FileAccess::open(fscache,FileAccess::READ); + FileAccess *f = FileAccess::open(fscache, FileAccess::READ); if (f) { //read the disk cache - while(!f->eof_reached()) { + while (!f->eof_reached()) { String l = f->get_line().strip_edges(); - if (l==String()) + if (l == String()) continue; if (l.begins_with("::")) { Vector<String> split = l.split("::"); - ERR_CONTINUE( split.size() != 3); + ERR_CONTINUE(split.size() != 3); String name = split[1]; - cpath=name; + cpath = name; } else { Vector<String> split = l.split("::"); - ERR_CONTINUE( split.size() != 5); + ERR_CONTINUE(split.size() != 5); String name = split[0]; String file; - file=name; - name=cpath.plus_file(name); + file = name; + name = cpath.plus_file(name); FileCache fc; - fc.type=split[1]; - fc.modification_time=split[2].to_int64(); + fc.type = split[1]; + fc.modification_time = split[2].to_int64(); fc.import_modification_time = split[3].to_int64(); String deps = split[4].strip_edges(); if (deps.length()) { Vector<String> dp = deps.split("<>"); - for(int i=0;i<dp.size();i++) { - String path=dp[i]; + for (int i = 0; i < dp.size(); i++) { + String path = dp[i]; fc.deps.push_back(path); } } - file_cache[name]=fc; - + file_cache[name] = fc; } - } f->close(); memdelete(f); } - - - EditorProgressBG scan_progress("efs","ScanFS",1000); + EditorProgressBG scan_progress("efs", "ScanFS", 1000); ScanProgress sp; - sp.low=0; - sp.hi=1; - sp.progress=&scan_progress; - + sp.low = 0; + sp.hi = 1; + sp.progress = &scan_progress; - new_filesystem = memnew( EditorFileSystemDirectory ); - new_filesystem->parent=NULL; + new_filesystem = memnew(EditorFileSystemDirectory); + new_filesystem->parent = NULL; DirAccess *d = DirAccess::create(DirAccess::ACCESS_RESOURCES); d->change_dir("res://"); - _scan_new_dir(new_filesystem,d,sp); + _scan_new_dir(new_filesystem, d, sp); file_cache.clear(); //clear caches, no longer needed memdelete(d); - //save back the findings //String fscache = EditorSettings::get_singleton()->get_project_settings_path().plus_file("file_cache"); - f=FileAccess::open(fscache,FileAccess::WRITE); - _save_filesystem_cache(new_filesystem,f); + f = FileAccess::open(fscache, FileAccess::WRITE); + _save_filesystem_cache(new_filesystem, f); f->close(); memdelete(f); - scanning=false; - + scanning = false; } void EditorFileSystem::_save_filesystem_cache() { String fscache = EditorSettings::get_singleton()->get_project_settings_path().plus_file("filesystem_cache2"); - FileAccess *f=FileAccess::open(fscache,FileAccess::WRITE); - _save_filesystem_cache(filesystem,f); + FileAccess *f = FileAccess::open(fscache, FileAccess::WRITE); + _save_filesystem_cache(filesystem, f); f->close(); memdelete(f); } void EditorFileSystem::_thread_func(void *_userdata) { - EditorFileSystem *sd = (EditorFileSystem*)_userdata; + EditorFileSystem *sd = (EditorFileSystem *)_userdata; sd->_scan_filesystem(); - } bool EditorFileSystem::_update_scan_actions() { sources_changed.clear(); - bool fs_changed=false; + bool fs_changed = false; Vector<String> reimports; - for (List<ItemAction>::Element *E=scan_actions.front();E;E=E->next()) { + for (List<ItemAction>::Element *E = scan_actions.front(); E; E = E->next()) { - ItemAction&ia = E->get(); + ItemAction &ia = E->get(); - switch(ia.action) { + switch (ia.action) { case ItemAction::ACTION_NONE: { } break; case ItemAction::ACTION_DIR_ADD: { //print_line("*ACTION ADD DIR: "+ia.new_dir->get_name()); - int idx=0; - for(int i=0;i<ia.dir->subdirs.size();i++) { + int idx = 0; + for (int i = 0; i < ia.dir->subdirs.size(); i++) { - if (ia.new_dir->name<ia.dir->subdirs[i]->name) + if (ia.new_dir->name < ia.dir->subdirs[i]->name) break; idx++; } - if (idx==ia.dir->subdirs.size()) { + if (idx == ia.dir->subdirs.size()) { ia.dir->subdirs.push_back(ia.new_dir); } else { - ia.dir->subdirs.insert(idx,ia.new_dir); + ia.dir->subdirs.insert(idx, ia.new_dir); } - fs_changed=true; + fs_changed = true; } break; case ItemAction::ACTION_DIR_REMOVE: { ERR_CONTINUE(!ia.dir->parent); //print_line("*ACTION REMOVE DIR: "+ia.dir->get_name()); ia.dir->parent->subdirs.erase(ia.dir); - memdelete( ia.dir ); - fs_changed=true; + memdelete(ia.dir); + fs_changed = true; } break; case ItemAction::ACTION_FILE_ADD: { - int idx=0; - for(int i=0;i<ia.dir->files.size();i++) { + int idx = 0; + for (int i = 0; i < ia.dir->files.size(); i++) { - if (ia.new_file->file<ia.dir->files[i]->file) + if (ia.new_file->file < ia.dir->files[i]->file) break; idx++; } - if (idx==ia.dir->files.size()) { + if (idx == ia.dir->files.size()) { ia.dir->files.push_back(ia.new_file); } else { - ia.dir->files.insert(idx,ia.new_file); + ia.dir->files.insert(idx, ia.new_file); } - fs_changed=true; + fs_changed = true; //print_line("*ACTION ADD FILE: "+ia.new_file->file); } break; case ItemAction::ACTION_FILE_REMOVE: { int idx = ia.dir->find_file_index(ia.file); - ERR_CONTINUE(idx==-1); - memdelete( ia.dir->files[idx] ); + ERR_CONTINUE(idx == -1); + memdelete(ia.dir->files[idx]); ia.dir->files.remove(idx); - fs_changed=true; + fs_changed = true; //print_line("*ACTION REMOVE FILE: "+ia.file); } break; case ItemAction::ACTION_FILE_REIMPORT: { - int idx = ia.dir->find_file_index(ia.file); - ERR_CONTINUE(idx==-1); + ERR_CONTINUE(idx == -1); String full_path = ia.dir->get_file_path(idx); reimports.push_back(full_path); - fs_changed=true; + fs_changed = true; } break; - } } - if (reimports.size()) { reimport_files(reimports); - } scan_actions.clear(); return fs_changed; - } void EditorFileSystem::scan() { - if (false /*&& bool(Globals::get_singleton()->get("debug/disable_scan"))*/) - return; + if (false /*&& bool(Globals::get_singleton()->get("debug/disable_scan"))*/) + return; - if (scanning || scanning_changes|| thread) + if (scanning || scanning_changes || thread) return; _update_extensions(); - abort_scan=false; + abort_scan = false; if (!use_threads) { - scanning=true; - scan_total=0; + scanning = true; + scan_total = 0; _scan_filesystem(); if (filesystem) memdelete(filesystem); //file_type_cache.clear(); - filesystem=new_filesystem; - new_filesystem=NULL; + filesystem = new_filesystem; + new_filesystem = NULL; _update_scan_actions(); - scanning=false; + scanning = false; emit_signal("filesystem_changed"); - emit_signal("sources_changed",sources_changed.size()>0); + emit_signal("sources_changed", sources_changed.size() > 0); } else { ERR_FAIL_COND(thread); set_process(true); Thread::Settings s; - scanning=true; - scan_total=0; - s.priority=Thread::PRIORITY_LOW; - thread = Thread::create(_thread_func,this,s); + scanning = true; + scan_total = 0; + s.priority = Thread::PRIORITY_LOW; + thread = Thread::create(_thread_func, this, s); //tree->hide(); //progress->show(); - } - - - } -void EditorFileSystem::ScanProgress::update(int p_current,int p_total) const { +void EditorFileSystem::ScanProgress::update(int p_current, int p_total) const { - float ratio = low + ((hi-low)/p_total)*p_current; - progress->step(ratio*1000); - EditorFileSystem::singleton->scan_total=ratio; + float ratio = low + ((hi - low) / p_total) * p_current; + progress->step(ratio * 1000); + EditorFileSystem::singleton->scan_total = ratio; } -EditorFileSystem::ScanProgress EditorFileSystem::ScanProgress::get_sub(int p_current,int p_total) const{ +EditorFileSystem::ScanProgress EditorFileSystem::ScanProgress::get_sub(int p_current, int p_total) const { - ScanProgress sp=*this; - float slice = (sp.hi-sp.low)/p_total; - sp.low+=slice*p_current; - sp.hi=slice; + ScanProgress sp = *this; + float slice = (sp.hi - sp.low) / p_total; + sp.low += slice * p_current; + sp.hi = slice; return sp; - } -bool EditorFileSystem::_check_missing_imported_files(const String& p_path) { +bool EditorFileSystem::_check_missing_imported_files(const String &p_path) { if (!reimport_on_missing_imported_files) return true; Error err; - FileAccess *f= FileAccess::open(p_path+".import",FileAccess::READ,&err); + FileAccess *f = FileAccess::open(p_path + ".import", FileAccess::READ, &err); if (!f) { - print_line("could not open import for "+p_path); + print_line("could not open import for " + p_path); return false; } VariantParser::StreamFile stream; - stream.f=f; + stream.f = f; String assign; Variant value; VariantParser::Tag next_tag; - int lines=0; + int lines = 0; String error_text; List<String> to_check; - while(true) { + while (true) { - assign=Variant(); + assign = Variant(); next_tag.fields.clear(); - next_tag.name=String(); + next_tag.name = String(); - err = VariantParser::parse_tag_assign_eof(&stream,lines,error_text,next_tag,assign,value,NULL,true); - if (err==ERR_FILE_EOF) { + err = VariantParser::parse_tag_assign_eof(&stream, lines, error_text, next_tag, assign, value, NULL, true); + if (err == ERR_FILE_EOF) { memdelete(f); return OK; - } - else if (err!=OK) { - ERR_PRINTS("ResourceFormatImporter::load - "+p_path+".import:"+itos(lines)+" error: "+error_text); + } else if (err != OK) { + ERR_PRINTS("ResourceFormatImporter::load - " + p_path + ".import:" + itos(lines) + " error: " + error_text); memdelete(f); return false; } - if (assign!=String()) { + if (assign != String()) { if (assign.begins_with("path")) { to_check.push_back(value); - } else if (assign=="files") { + } else if (assign == "files") { Array fa = value; - for(int i=0;i<fa.size();i++) { + for (int i = 0; i < fa.size(); i++) { to_check.push_back(fa[i]); } } - } else if (next_tag.name!="remap" && next_tag.name!="deps") { + } else if (next_tag.name != "remap" && next_tag.name != "deps") { break; } } memdelete(f); - for (List<String>::Element *E=to_check.front();E;E=E->next()) { + for (List<String>::Element *E = to_check.front(); E; E = E->next()) { if (!FileAccess::exists(E->get())) { - print_line("missing "+E->get()+", reimport" ); + print_line("missing " + E->get() + ", reimport"); return false; } } return true; } -void EditorFileSystem::_scan_new_dir(EditorFileSystemDirectory *p_dir,DirAccess *da,const ScanProgress& p_progress) { +void EditorFileSystem::_scan_new_dir(EditorFileSystemDirectory *p_dir, DirAccess *da, const ScanProgress &p_progress) { List<String> dirs; List<String> files; @@ -530,13 +495,12 @@ void EditorFileSystem::_scan_new_dir(EditorFileSystemDirectory *p_dir,DirAccess p_dir->modified_time = FileAccess::get_modified_time(cd); - da->list_dir_begin(); while (true) { bool isdir; String f = da->get_next(&isdir); - if (f=="") + if (f == "") break; if (isdir) { @@ -553,7 +517,6 @@ void EditorFileSystem::_scan_new_dir(EditorFileSystemDirectory *p_dir,DirAccess files.push_back(f); } - } da->list_dir_end(); @@ -561,61 +524,57 @@ void EditorFileSystem::_scan_new_dir(EditorFileSystemDirectory *p_dir,DirAccess dirs.sort(); files.sort(); - int total = dirs.size()+files.size(); - int idx=0; - + int total = dirs.size() + files.size(); + int idx = 0; - for (List<String>::Element *E=dirs.front();E;E=E->next(),idx++) { + for (List<String>::Element *E = dirs.front(); E; E = E->next(), idx++) { - if (da->change_dir(E->get())==OK) { + if (da->change_dir(E->get()) == OK) { String d = da->get_current_dir(); - if (d==cd || !d.begins_with(cd)) { + if (d == cd || !d.begins_with(cd)) { da->change_dir(cd); //avoid recursion } else { + EditorFileSystemDirectory *efd = memnew(EditorFileSystemDirectory); - EditorFileSystemDirectory *efd = memnew( EditorFileSystemDirectory ); + efd->parent = p_dir; + efd->name = E->get(); - efd->parent=p_dir; - efd->name=E->get(); + _scan_new_dir(efd, da, p_progress.get_sub(idx, total)); - _scan_new_dir(efd,da,p_progress.get_sub(idx,total)); + int idx = 0; + for (int i = 0; i < p_dir->subdirs.size(); i++) { - int idx=0; - for(int i=0;i<p_dir->subdirs.size();i++) { - - if (efd->name<p_dir->subdirs[i]->name) + if (efd->name < p_dir->subdirs[i]->name) break; idx++; } - if (idx==p_dir->subdirs.size()) { + if (idx == p_dir->subdirs.size()) { p_dir->subdirs.push_back(efd); } else { - p_dir->subdirs.insert(idx,efd); + p_dir->subdirs.insert(idx, efd); } da->change_dir(".."); } } else { - ERR_PRINTS("Cannot go into subdir: "+E->get()); + ERR_PRINTS("Cannot go into subdir: " + E->get()); } - p_progress.update(idx,total); - + p_progress.update(idx, total); } - for (List<String>::Element*E=files.front();E;E=E->next(),idx++) { - + for (List<String>::Element *E = files.front(); E; E = E->next(), idx++) { String ext = E->get().get_extension().to_lower(); if (!valid_extensions.has(ext)) { continue; //invalid } - EditorFileSystemDirectory::FileInfo *fi = memnew( EditorFileSystemDirectory::FileInfo ); - fi->file=E->get(); + EditorFileSystemDirectory::FileInfo *fi = memnew(EditorFileSystemDirectory::FileInfo); + fi->file = E->get(); String path = cd.plus_file(fi->file); @@ -624,92 +583,87 @@ void EditorFileSystem::_scan_new_dir(EditorFileSystemDirectory *p_dir,DirAccess if (import_extensions.has(ext)) { - //is imported - uint64_t import_mt=0; - if (FileAccess::exists(path+".import")) { - import_mt=FileAccess::get_modified_time(path+".import"); + //is imported + uint64_t import_mt = 0; + if (FileAccess::exists(path + ".import")) { + import_mt = FileAccess::get_modified_time(path + ".import"); } + if (fc && fc->modification_time == mt && fc->import_modification_time == import_mt && _check_missing_imported_files(path)) { - if (fc && fc->modification_time==mt && fc->import_modification_time==import_mt && _check_missing_imported_files(path)) { - - fi->type=fc->type; - fi->modified_time=fc->modification_time; - fi->import_modified_time=fc->import_modification_time; + fi->type = fc->type; + fi->modified_time = fc->modification_time; + fi->import_modified_time = fc->import_modification_time; } else { if (!fc) { print_line("REIMPORT BECAUSE: not previously found"); - } else if (fc->modification_time!=mt) { - print_line("REIMPORT BECAUSE: modified resource time "+itos(fc->modification_time)+" vs "+itos(mt)); + } else if (fc->modification_time != mt) { + print_line("REIMPORT BECAUSE: modified resource time " + itos(fc->modification_time) + " vs " + itos(mt)); - } else if (fc->import_modification_time!=import_mt) { - print_line("REIMPORT BECAUSE: modified .import time"+itos(fc->import_modification_time)+" vs "+itos(import_mt)); + } else if (fc->import_modification_time != import_mt) { + print_line("REIMPORT BECAUSE: modified .import time" + itos(fc->import_modification_time) + " vs " + itos(import_mt)); } else { print_line("REIMPORT BECAUSE: missing imported files"); } - - fi->type=ResourceFormatImporter::get_singleton()->get_resource_type(path); - fi->modified_time=0; - fi->import_modified_time=0; + fi->type = ResourceFormatImporter::get_singleton()->get_resource_type(path); + fi->modified_time = 0; + fi->import_modified_time = 0; ItemAction ia; - ia.action=ItemAction::ACTION_FILE_REIMPORT; - ia.dir=p_dir; - ia.file=E->get(); + ia.action = ItemAction::ACTION_FILE_REIMPORT; + ia.dir = p_dir; + ia.file = E->get(); scan_actions.push_back(ia); } } else { //not imported, so just update type if changed if (fc && fc->modification_time == mt) { - fi->type=fc->type; - fi->modified_time=fc->modification_time; - fi->import_modified_time=0; + fi->type = fc->type; + fi->modified_time = fc->modification_time; + fi->import_modified_time = 0; } else { - fi->type=ResourceLoader::get_resource_type(path); - fi->modified_time=mt; - fi->import_modified_time=0; + fi->type = ResourceLoader::get_resource_type(path); + fi->modified_time = mt; + fi->import_modified_time = 0; } } p_dir->files.push_back(fi); - p_progress.update(idx,total); + p_progress.update(idx, total); } - } - - -void EditorFileSystem::_scan_fs_changes(EditorFileSystemDirectory *p_dir,const ScanProgress& p_progress) { +void EditorFileSystem::_scan_fs_changes(EditorFileSystemDirectory *p_dir, const ScanProgress &p_progress) { uint64_t current_mtime = FileAccess::get_modified_time(p_dir->get_path()); - bool updated_dir=false; + bool updated_dir = false; String cd = p_dir->get_path(); //print_line("dir: "+p_dir->get_path()+" MODTIME: "+itos(p_dir->modified_time)+" CTIME: "+itos(current_mtime)); - if (current_mtime!=p_dir->modified_time) { + if (current_mtime != p_dir->modified_time) { - updated_dir=true; - p_dir->modified_time=current_mtime; + updated_dir = true; + p_dir->modified_time = current_mtime; //ooooops, dir changed, see what's going on //first mark everything as veryfied - for(int i=0;i<p_dir->files.size();i++) { + for (int i = 0; i < p_dir->files.size(); i++) { - p_dir->files[i]->verified=false; + p_dir->files[i]->verified = false; } - for(int i=0;i<p_dir->subdirs.size();i++) { + for (int i = 0; i < p_dir->subdirs.size(); i++) { - p_dir->get_subdir(i)->verified=false; + p_dir->get_subdir(i)->verified = false; } //then scan files and directories and check what's different @@ -722,7 +676,7 @@ void EditorFileSystem::_scan_fs_changes(EditorFileSystemDirectory *p_dir,const S bool isdir; String f = da->get_next(&isdir); - if (f=="") + if (f == "") break; if (isdir) { @@ -731,32 +685,30 @@ void EditorFileSystem::_scan_fs_changes(EditorFileSystemDirectory *p_dir,const S continue; int idx = p_dir->find_dir_index(f); - if (idx==-1) { + if (idx == -1) { if (FileAccess::exists(cd.plus_file(f).plus_file("godot.cfg"))) // skip if another project inside this continue; - EditorFileSystemDirectory *efd = memnew( EditorFileSystemDirectory ); + EditorFileSystemDirectory *efd = memnew(EditorFileSystemDirectory); - efd->parent=p_dir; - efd->name=f; + efd->parent = p_dir; + efd->name = f; DirAccess *d = DirAccess::create(DirAccess::ACCESS_RESOURCES); d->change_dir(cd.plus_file(f)); - _scan_new_dir(efd,d,p_progress.get_sub(1,1)); + _scan_new_dir(efd, d, p_progress.get_sub(1, 1)); memdelete(d); - ItemAction ia; - ia.action=ItemAction::ACTION_DIR_ADD; - ia.dir=p_dir; - ia.file=f; - ia.new_dir=efd; + ia.action = ItemAction::ACTION_DIR_ADD; + ia.dir = p_dir; + ia.file = f; + ia.new_dir = efd; scan_actions.push_back(ia); } else { - p_dir->subdirs[idx]->verified=true; + p_dir->subdirs[idx]->verified = true; } - } else { String ext = f.get_extension().to_lower(); if (!valid_extensions.has(ext)) @@ -764,66 +716,59 @@ void EditorFileSystem::_scan_fs_changes(EditorFileSystemDirectory *p_dir,const S int idx = p_dir->find_file_index(f); - if (idx==-1) { + if (idx == -1) { //never seen this file, add actition to add it - EditorFileSystemDirectory::FileInfo *fi = memnew( EditorFileSystemDirectory::FileInfo ); - fi->file=f; + EditorFileSystemDirectory::FileInfo *fi = memnew(EditorFileSystemDirectory::FileInfo); + fi->file = f; String path = cd.plus_file(fi->file); - fi->modified_time=FileAccess::get_modified_time(path); - fi->import_modified_time=0; - fi->type=ResourceLoader::get_resource_type(path); + fi->modified_time = FileAccess::get_modified_time(path); + fi->import_modified_time = 0; + fi->type = ResourceLoader::get_resource_type(path); { ItemAction ia; - ia.action=ItemAction::ACTION_FILE_ADD; - ia.dir=p_dir; - ia.file=f; - ia.new_file=fi; + ia.action = ItemAction::ACTION_FILE_ADD; + ia.dir = p_dir; + ia.file = f; + ia.new_file = fi; scan_actions.push_back(ia); - - } if (import_extensions.has(ext)) { //if it can be imported, and it was added, it needs to be reimported print_line("REIMPORT: file was not found before, reimport"); - print_line("at dir: "+p_dir->get_path()+" file: "+f); - for(int i=0;i<p_dir->files.size();i++) { - print_line(itos(i)+": "+p_dir->files[i]->file); + print_line("at dir: " + p_dir->get_path() + " file: " + f); + for (int i = 0; i < p_dir->files.size(); i++) { + print_line(itos(i) + ": " + p_dir->files[i]->file); } ItemAction ia; - ia.action=ItemAction::ACTION_FILE_REIMPORT; - ia.dir=p_dir; - ia.file=f; + ia.action = ItemAction::ACTION_FILE_REIMPORT; + ia.dir = p_dir; + ia.file = f; scan_actions.push_back(ia); } } else { - p_dir->files[idx]->verified=true; + p_dir->files[idx]->verified = true; } - - } - } da->list_dir_end(); memdelete(da); - } - for(int i=0;i<p_dir->files.size();i++) { + for (int i = 0; i < p_dir->files.size(); i++) { if (updated_dir && !p_dir->files[i]->verified) { //this file was removed, add action to remove it ItemAction ia; - ia.action=ItemAction::ACTION_FILE_REMOVE; - ia.dir=p_dir; - ia.file=p_dir->files[i]->file; + ia.action = ItemAction::ACTION_FILE_REMOVE; + ia.dir = p_dir; + ia.file = p_dir->files[i]->file; scan_actions.push_back(ia); continue; - } if (import_extensions.has(p_dir->files[i]->file.get_extension().to_lower())) { @@ -833,150 +778,142 @@ void EditorFileSystem::_scan_fs_changes(EditorFileSystemDirectory *p_dir,const S uint64_t mt = FileAccess::get_modified_time(path); - bool reimport=false; + bool reimport = false; - if (mt!=p_dir->files[i]->modified_time) { + if (mt != p_dir->files[i]->modified_time) { print_line("REIMPORT: modified time changed, reimport"); - reimport=true; //it was modified, must be reimported. - } else if (!FileAccess::exists(path+".import")) { + reimport = true; //it was modified, must be reimported. + } else if (!FileAccess::exists(path + ".import")) { print_line("REIMPORT: no .import exists, reimport"); - reimport=true; //no .import file, obviously reimport + reimport = true; //no .import file, obviously reimport } else { - uint64_t import_mt=FileAccess::get_modified_time(path+".import"); - print_line(itos(import_mt)+" vs "+itos(p_dir->files[i]->import_modified_time)); - if (import_mt!=p_dir->files[i]->import_modified_time) { + uint64_t import_mt = FileAccess::get_modified_time(path + ".import"); + print_line(itos(import_mt) + " vs " + itos(p_dir->files[i]->import_modified_time)); + if (import_mt != p_dir->files[i]->import_modified_time) { print_line("REIMPORT: import modified changed, reimport"); - reimport=true; + reimport = true; } else if (!_check_missing_imported_files(path)) { print_line("REIMPORT: imported files removed"); - reimport=true; + reimport = true; } } if (reimport) { ItemAction ia; - ia.action=ItemAction::ACTION_FILE_REIMPORT; - ia.dir=p_dir; - ia.file=p_dir->files[i]->file; + ia.action = ItemAction::ACTION_FILE_REIMPORT; + ia.dir = p_dir; + ia.file = p_dir->files[i]->file; scan_actions.push_back(ia); } - } EditorResourcePreview::get_singleton()->check_for_invalidation(p_dir->get_file_path(i)); } - for(int i=0;i<p_dir->subdirs.size();i++) { + for (int i = 0; i < p_dir->subdirs.size(); i++) { if (updated_dir && !p_dir->subdirs[i]->verified) { //this directory was removed, add action to remove it ItemAction ia; - ia.action=ItemAction::ACTION_DIR_REMOVE; - ia.dir=p_dir->subdirs[i]; + ia.action = ItemAction::ACTION_DIR_REMOVE; + ia.dir = p_dir->subdirs[i]; scan_actions.push_back(ia); continue; - } - _scan_fs_changes(p_dir->get_subdir(i),p_progress); + _scan_fs_changes(p_dir->get_subdir(i), p_progress); } - } void EditorFileSystem::_thread_func_sources(void *_userdata) { - EditorFileSystem *efs = (EditorFileSystem*)_userdata; + EditorFileSystem *efs = (EditorFileSystem *)_userdata; if (efs->filesystem) { - EditorProgressBG pr("sources",TTR("ScanSources"),1000); + EditorProgressBG pr("sources", TTR("ScanSources"), 1000); ScanProgress sp; - sp.progress=≺ - sp.hi=1; - sp.low=0; - efs->_scan_fs_changes(efs->filesystem,sp); + sp.progress = ≺ + sp.hi = 1; + sp.low = 0; + efs->_scan_fs_changes(efs->filesystem, sp); } - efs->scanning_changes_done=true; + efs->scanning_changes_done = true; } void EditorFileSystem::get_changed_sources(List<String> *r_changed) { - *r_changed=sources_changed; + *r_changed = sources_changed; } void EditorFileSystem::scan_changes() { - if (scanning || scanning_changes|| thread) + if (scanning || scanning_changes || thread) return; _update_extensions(); sources_changed.clear(); - scanning_changes=true; - scanning_changes_done=false; + scanning_changes = true; + scanning_changes_done = false; - abort_scan=false; + abort_scan = false; if (!use_threads) { if (filesystem) { - EditorProgressBG pr("sources",TTR("ScanSources"),1000); + EditorProgressBG pr("sources", TTR("ScanSources"), 1000); ScanProgress sp; - sp.progress=≺ - sp.hi=1; - sp.low=0; - scan_total=0; - _scan_fs_changes(filesystem,sp); + sp.progress = ≺ + sp.hi = 1; + sp.low = 0; + scan_total = 0; + _scan_fs_changes(filesystem, sp); if (_update_scan_actions()) emit_signal("filesystem_changed"); } - scanning_changes=false; - scanning_changes_done=true; - emit_signal("sources_changed",sources_changed.size()>0); + scanning_changes = false; + scanning_changes_done = true; + emit_signal("sources_changed", sources_changed.size() > 0); } else { ERR_FAIL_COND(thread_sources); set_process(true); - scan_total=0; + scan_total = 0; Thread::Settings s; - s.priority=Thread::PRIORITY_LOW; - thread_sources = Thread::create(_thread_func_sources,this,s); + s.priority = Thread::PRIORITY_LOW; + thread_sources = Thread::create(_thread_func_sources, this, s); //tree->hide(); //print_line("SCAN BEGIN!"); //progress->show(); } - - - } void EditorFileSystem::_notification(int p_what) { - switch(p_what) { + switch (p_what) { case NOTIFICATION_ENTER_TREE: { - - scan(); + scan(); } break; case NOTIFICATION_EXIT_TREE: { if (use_threads && thread) { //abort thread if in progress - abort_scan=true; - while(scanning) { + abort_scan = true; + while (scanning) { OS::get_singleton()->delay_usec(1000); } Thread::wait_to_finish(thread); memdelete(thread); - thread=NULL; + thread = NULL; WARN_PRINTS("Scan thread aborted..."); set_process(false); - } if (filesystem) memdelete(filesystem); if (new_filesystem) memdelete(new_filesystem); - filesystem=NULL; - new_filesystem=NULL; + filesystem = NULL; + new_filesystem = NULL; } break; case NOTIFICATION_PROCESS: { @@ -987,17 +924,17 @@ void EditorFileSystem::_notification(int p_what) { if (scanning_changes_done) { - scanning_changes=false; + scanning_changes = false; set_process(false); Thread::wait_to_finish(thread_sources); memdelete(thread_sources); - thread_sources=NULL; + thread_sources = NULL; if (_update_scan_actions()) emit_signal("filesystem_changed"); //print_line("sources changed: "+itos(sources_changed.size())); - emit_signal("sources_changed",sources_changed.size()>0); + emit_signal("sources_changed", sources_changed.size() > 0); } } else if (!scanning) { @@ -1005,25 +942,22 @@ void EditorFileSystem::_notification(int p_what) { if (filesystem) memdelete(filesystem); - filesystem=new_filesystem; - new_filesystem=NULL; + filesystem = new_filesystem; + new_filesystem = NULL; Thread::wait_to_finish(thread); memdelete(thread); - thread=NULL; + thread = NULL; _update_scan_actions(); emit_signal("filesystem_changed"); - emit_signal("sources_changed",sources_changed.size()>0); + emit_signal("sources_changed", sources_changed.size() > 0); //print_line("initial sources changed: "+itos(sources_changed.size())); - - } else { //progress->set_text("Scanning...\n"+itos(total*100)+"%"); } } } break; } - } bool EditorFileSystem::is_scanning() const { @@ -1040,311 +974,283 @@ EditorFileSystemDirectory *EditorFileSystem::get_filesystem() { return filesystem; } -void EditorFileSystem::_save_filesystem_cache(EditorFileSystemDirectory*p_dir,FileAccess *p_file) { - +void EditorFileSystem::_save_filesystem_cache(EditorFileSystemDirectory *p_dir, FileAccess *p_file) { if (!p_dir) return; //none - p_file->store_line("::"+p_dir->get_path()+"::"+String::num(p_dir->modified_time)); + p_file->store_line("::" + p_dir->get_path() + "::" + String::num(p_dir->modified_time)); - for(int i=0;i<p_dir->files.size();i++) { + for (int i = 0; i < p_dir->files.size(); i++) { - String s=p_dir->files[i]->file+"::"+p_dir->files[i]->type+"::"+itos(p_dir->files[i]->modified_time)+"::"+itos(p_dir->files[i]->import_modified_time); - s+="::"; - for(int j=0;j<p_dir->files[i]->deps.size();j++) { + String s = p_dir->files[i]->file + "::" + p_dir->files[i]->type + "::" + itos(p_dir->files[i]->modified_time) + "::" + itos(p_dir->files[i]->import_modified_time); + s += "::"; + for (int j = 0; j < p_dir->files[i]->deps.size(); j++) { - if (j>0) - s+="<>"; - s+=p_dir->files[i]->deps[j]; + if (j > 0) + s += "<>"; + s += p_dir->files[i]->deps[j]; } p_file->store_line(s); } - for(int i=0;i<p_dir->subdirs.size();i++) { + for (int i = 0; i < p_dir->subdirs.size(); i++) { - _save_filesystem_cache(p_dir->subdirs[i],p_file); + _save_filesystem_cache(p_dir->subdirs[i], p_file); } - } - - - - - -bool EditorFileSystem::_find_file(const String& p_file,EditorFileSystemDirectory ** r_d, int &r_file_pos) const { +bool EditorFileSystem::_find_file(const String &p_file, EditorFileSystemDirectory **r_d, int &r_file_pos) const { //todo make faster if (!filesystem || scanning) return false; - String f = GlobalConfig::get_singleton()->localize_path(p_file); if (!f.begins_with("res://")) return false; - f=f.substr(6,f.length()); - f=f.replace("\\","/"); + f = f.substr(6, f.length()); + f = f.replace("\\", "/"); Vector<String> path = f.split("/"); - if (path.size()==0) + if (path.size() == 0) return false; - String file=path[path.size()-1]; - path.resize(path.size()-1); + String file = path[path.size() - 1]; + path.resize(path.size() - 1); - EditorFileSystemDirectory *fs=filesystem; + EditorFileSystemDirectory *fs = filesystem; - for(int i=0;i<path.size();i++) { + for (int i = 0; i < path.size(); i++) { if (path[i].begins_with(".")) return false; - int idx=-1; - for(int j=0;j<fs->get_subdir_count();j++) { + int idx = -1; + for (int j = 0; j < fs->get_subdir_count(); j++) { - if (fs->get_subdir(j)->get_name()==path[i]) { - idx=j; + if (fs->get_subdir(j)->get_name() == path[i]) { + idx = j; break; } } - if (idx==-1) { + if (idx == -1) { //does not exist, create i guess? - EditorFileSystemDirectory *efsd = memnew( EditorFileSystemDirectory ); - efsd->name=path[i]; - int idx2=0; - for(int j=0;j<fs->get_subdir_count();j++) { + EditorFileSystemDirectory *efsd = memnew(EditorFileSystemDirectory); + efsd->name = path[i]; + int idx2 = 0; + for (int j = 0; j < fs->get_subdir_count(); j++) { - if (efsd->name<fs->get_subdir(j)->get_name()) + if (efsd->name < fs->get_subdir(j)->get_name()) break; idx2++; } - if (idx2==fs->get_subdir_count()) + if (idx2 == fs->get_subdir_count()) fs->subdirs.push_back(efsd); else - fs->subdirs.insert(idx2,efsd); - fs=efsd; + fs->subdirs.insert(idx2, efsd); + fs = efsd; } else { - fs=fs->get_subdir(idx); + fs = fs->get_subdir(idx); } } + int cpos = -1; + for (int i = 0; i < fs->files.size(); i++) { - int cpos=-1; - for(int i=0;i<fs->files.size();i++) { - - if (fs->files[i]->file==file) { - cpos=i; + if (fs->files[i]->file == file) { + cpos = i; break; } } - r_file_pos=cpos; - *r_d=fs; + r_file_pos = cpos; + *r_d = fs; - if (cpos!=-1) { + if (cpos != -1) { return true; - } else { + } else { return false; } - - } -String EditorFileSystem::get_file_type(const String& p_file) const { - - EditorFileSystemDirectory *fs=NULL; - int cpos=-1; +String EditorFileSystem::get_file_type(const String &p_file) const { - if (!_find_file(p_file,&fs,cpos)) { + EditorFileSystemDirectory *fs = NULL; + int cpos = -1; - return ""; - } + if (!_find_file(p_file, &fs, cpos)) { + return ""; + } - return fs->files[cpos]->type; - + return fs->files[cpos]->type; } -EditorFileSystemDirectory* EditorFileSystem::find_file(const String& p_file,int* r_index) const { +EditorFileSystemDirectory *EditorFileSystem::find_file(const String &p_file, int *r_index) const { if (!filesystem || scanning) - return NULL; + return NULL; - EditorFileSystemDirectory *fs=NULL; - int cpos=-1; - if (!_find_file(p_file,&fs,cpos)) { + EditorFileSystemDirectory *fs = NULL; + int cpos = -1; + if (!_find_file(p_file, &fs, cpos)) { - return NULL; + return NULL; } - if (r_index) - *r_index=cpos; + *r_index = cpos; return fs; } +EditorFileSystemDirectory *EditorFileSystem::get_filesystem_path(const String &p_path) { -EditorFileSystemDirectory *EditorFileSystem::get_filesystem_path(const String& p_path) { - - if (!filesystem || scanning) - return NULL; - - - String f = GlobalConfig::get_singleton()->localize_path(p_path); - - if (!f.begins_with("res://")) - return NULL; + if (!filesystem || scanning) + return NULL; + String f = GlobalConfig::get_singleton()->localize_path(p_path); - f=f.substr(6,f.length()); - f=f.replace("\\","/"); - if (f==String()) - return filesystem; + if (!f.begins_with("res://")) + return NULL; - if (f.ends_with("/")) - f=f.substr(0,f.length()-1); + f = f.substr(6, f.length()); + f = f.replace("\\", "/"); + if (f == String()) + return filesystem; - Vector<String> path = f.split("/"); + if (f.ends_with("/")) + f = f.substr(0, f.length() - 1); - if (path.size()==0) - return NULL; + Vector<String> path = f.split("/"); - EditorFileSystemDirectory *fs=filesystem; + if (path.size() == 0) + return NULL; - for(int i=0;i<path.size();i++) { + EditorFileSystemDirectory *fs = filesystem; + for (int i = 0; i < path.size(); i++) { - int idx=-1; - for(int j=0;j<fs->get_subdir_count();j++) { + int idx = -1; + for (int j = 0; j < fs->get_subdir_count(); j++) { - if (fs->get_subdir(j)->get_name()==path[i]) { - idx=j; - break; - } - } + if (fs->get_subdir(j)->get_name() == path[i]) { + idx = j; + break; + } + } - if (idx==-1) { - return NULL; - } else { + if (idx == -1) { + return NULL; + } else { - fs=fs->get_subdir(idx); + fs = fs->get_subdir(idx); + } } - } - return fs; + return fs; } -void EditorFileSystem::_resource_saved(const String& p_path){ - +void EditorFileSystem::_resource_saved(const String &p_path) { //print_line("resource saved: "+p_path); EditorFileSystem::get_singleton()->update_file(p_path); - } +void EditorFileSystem::update_file(const String &p_file) { + EditorFileSystemDirectory *fs = NULL; + int cpos = -1; + if (!_find_file(p_file, &fs, cpos)) { -void EditorFileSystem::update_file(const String& p_file) { - - EditorFileSystemDirectory *fs=NULL; - int cpos=-1; - - if (!_find_file(p_file,&fs,cpos)) { + if (!fs) + return; + } - if (!fs) + if (!FileAccess::exists(p_file)) { + //was removed + memdelete(fs->files[cpos]); + fs->files.remove(cpos); + call_deferred("emit_signal", "filesystem_changed"); //update later return; - } - - if (!FileAccess::exists(p_file)) { - //was removed - memdelete( fs->files[cpos] ); - fs->files.remove(cpos); - call_deferred("emit_signal","filesystem_changed"); //update later - return; - - } - - String type = ResourceLoader::get_resource_type(p_file); - - if (cpos==-1) { + } - int idx=0; + String type = ResourceLoader::get_resource_type(p_file); - for(int i=0;i<fs->files.size();i++) { - if (p_file<fs->files[i]->file) - break; - idx++; - } + if (cpos == -1) { - EditorFileSystemDirectory::FileInfo *fi = memnew( EditorFileSystemDirectory::FileInfo ); - fi->file=p_file.get_file(); - fi->import_modified_time=0; + int idx = 0; - if (idx==fs->files.size()) { - fs->files.push_back(fi); - } else { + for (int i = 0; i < fs->files.size(); i++) { + if (p_file < fs->files[i]->file) + break; + idx++; + } - fs->files.insert(idx,fi); - } - cpos=idx; + EditorFileSystemDirectory::FileInfo *fi = memnew(EditorFileSystemDirectory::FileInfo); + fi->file = p_file.get_file(); + fi->import_modified_time = 0; + if (idx == fs->files.size()) { + fs->files.push_back(fi); + } else { - } + fs->files.insert(idx, fi); + } + cpos = idx; + } //print_line("UPDATING: "+p_file); - fs->files[cpos]->type=type; - fs->files[cpos]->modified_time=FileAccess::get_modified_time(p_file); + fs->files[cpos]->type = type; + fs->files[cpos]->modified_time = FileAccess::get_modified_time(p_file); //if (FileAccess::exists(p_file+".import")) { // fs->files[cpos]->import_modified_time=FileAccess::get_modified_time(p_file+".import"); //} - EditorResourcePreview::get_singleton()->call_deferred("check_for_invalidation",p_file); - call_deferred("emit_signal","filesystem_changed"); //update later - + EditorResourcePreview::get_singleton()->call_deferred("check_for_invalidation", p_file); + call_deferred("emit_signal", "filesystem_changed"); //update later } +void EditorFileSystem::_reimport_file(const String &p_file) { -void EditorFileSystem::_reimport_file(const String& p_file) { - - print_line("REIMPORTING: "+p_file); + print_line("REIMPORTING: " + p_file); - EditorFileSystemDirectory *fs=NULL; - int cpos=-1; - bool found = _find_file(p_file,&fs,cpos); + EditorFileSystemDirectory *fs = NULL; + int cpos = -1; + bool found = _find_file(p_file, &fs, cpos); ERR_FAIL_COND(!found); //try to obtain existing params - Map<StringName,Variant> params; + Map<StringName, Variant> params; String importer_name; - if (FileAccess::exists(p_file+".import")) { + if (FileAccess::exists(p_file + ".import")) { Ref<ConfigFile> cf; cf.instance(); - Error err = cf->load(p_file+".import"); - if (err==OK) { + Error err = cf->load(p_file + ".import"); + if (err == OK) { List<String> sk; - cf->get_section_keys("params",&sk); - for(List<String>::Element *E=sk.front();E;E=E->next()) { - params[E->get()]=cf->get_value("params",E->get()); + cf->get_section_keys("params", &sk); + for (List<String>::Element *E = sk.front(); E; E = E->next()) { + params[E->get()] = cf->get_value("params", E->get()); } - importer_name = cf->get_value("remap","importer"); + importer_name = cf->get_value("remap", "importer"); } } Ref<ResourceImporter> importer; //find the importer - if (importer_name!="") { + if (importer_name != "") { importer = ResourceFormatImporter::get_singleton()->get_importer_by_name(importer_name); } @@ -1354,7 +1260,6 @@ void EditorFileSystem::_reimport_file(const String& p_file) { if (importer.is_null()) { ERR_PRINT("BUG: File queued for import, but can't be imported!"); ERR_FAIL(); - } } @@ -1362,9 +1267,9 @@ void EditorFileSystem::_reimport_file(const String& p_file) { List<ResourceImporter::ImportOption> opts; importer->get_import_options(&opts); - for (List<ResourceImporter::ImportOption>::Element *E=opts.front();E;E=E->next()) { + for (List<ResourceImporter::ImportOption>::Element *E = opts.front(); E; E = E->next()) { if (!params.has(E->get().option.name)) { //this one is not present - params[E->get().option.name]=E->get().default_value; + params[E->get().option.name] = E->get().default_value; } } @@ -1374,72 +1279,65 @@ void EditorFileSystem::_reimport_file(const String& p_file) { List<String> import_variants; List<String> gen_files; - Error err = importer->import(p_file,base_path,params,&import_variants,&gen_files); + Error err = importer->import(p_file, base_path, params, &import_variants, &gen_files); - if (err!=OK) { - ERR_PRINTS("Error importing: "+p_file); + if (err != OK) { + ERR_PRINTS("Error importing: " + p_file); } //as import is complete, save the .import file - FileAccess *f = FileAccess::open(p_file+".import",FileAccess::WRITE); + FileAccess *f = FileAccess::open(p_file + ".import", FileAccess::WRITE); ERR_FAIL_COND(!f); //write manually, as order matters ([remap] has to go first for performance). f->store_line("[remap]"); f->store_line(""); - f->store_line("importer=\""+importer->get_importer_name()+"\""); - if (importer->get_resource_type()!="") { - f->store_line("type=\""+importer->get_resource_type()+"\""); + f->store_line("importer=\"" + importer->get_importer_name() + "\""); + if (importer->get_resource_type() != "") { + f->store_line("type=\"" + importer->get_resource_type() + "\""); } - - if (importer->get_save_extension()=="") { + if (importer->get_save_extension() == "") { //no path } else if (import_variants.size()) { //import with variants - for(List<String>::Element *E=import_variants.front();E;E=E->next()) { - - - String path = base_path.c_escape()+"."+E->get()+"."+importer->get_save_extension(); + for (List<String>::Element *E = import_variants.front(); E; E = E->next()) { - f->store_line("path."+E->get()+"=\""+path+"\""); + String path = base_path.c_escape() + "." + E->get() + "." + importer->get_save_extension(); + f->store_line("path." + E->get() + "=\"" + path + "\""); } } else { - f->store_line("path=\""+base_path+"."+importer->get_save_extension()+"\""); + f->store_line("path=\"" + base_path + "." + importer->get_save_extension() + "\""); } f->store_line(""); if (gen_files.size()) { f->store_line("[gen]"); Array genf; - for (List<String>::Element *E=gen_files.front();E;E=E->next()) { + for (List<String>::Element *E = gen_files.front(); E; E = E->next()) { genf.push_back(E->get()); } String value; - VariantWriter::write_to_string(genf,value); - f->store_line("files="+value); + VariantWriter::write_to_string(genf, value); + f->store_line("files=" + value); f->store_line(""); } - f->store_line("[params]"); f->store_line(""); //store options in provided order, to avoid file changing - - for (List<ResourceImporter::ImportOption>::Element *E=opts.front();E;E=E->next()) { + for (List<ResourceImporter::ImportOption>::Element *E = opts.front(); E; E = E->next()) { String base = E->get().option.name; String value; - VariantWriter::write_to_string(params[base],value); - f->store_line(base+"="+value); - - + VariantWriter::write_to_string(params[base], value); + f->store_line(base + "=" + value); } f->close(); @@ -1447,7 +1345,7 @@ void EditorFileSystem::_reimport_file(const String& p_file) { //update modified times, to avoid reimport fs->files[cpos]->modified_time = FileAccess::get_modified_time(p_file); - fs->files[cpos]->import_modified_time = FileAccess::get_modified_time(p_file+".import"); + fs->files[cpos]->import_modified_time = FileAccess::get_modified_time(p_file + ".import"); //if file is currently up, maybe the source it was loaded from changed, so import math must be updated for it //to reload properly @@ -1455,7 +1353,7 @@ void EditorFileSystem::_reimport_file(const String& p_file) { Resource *r = ResourceCache::get(p_file); - if (r->get_import_path()!=String()) { + if (r->get_import_path() != String()) { String dst_path = ResourceFormatImporter::get_singleton()->get_internal_resource_path(p_file); r->set_import_path(dst_path); @@ -1464,18 +1362,18 @@ void EditorFileSystem::_reimport_file(const String& p_file) { } } -void EditorFileSystem::reimport_files(const Vector<String>& p_files) { +void EditorFileSystem::reimport_files(const Vector<String> &p_files) { - importing=true; - EditorProgress pr("reimport",TTR("(Re)Importing Assets"),p_files.size()); - for(int i=0;i<p_files.size();i++) { - pr.step(p_files[i].get_file(),i); + importing = true; + EditorProgress pr("reimport", TTR("(Re)Importing Assets"), p_files.size()); + for (int i = 0; i < p_files.size(); i++) { + pr.step(p_files[i].get_file(), i); _reimport_file(p_files[i]); } _save_filesystem_cache(); - importing=false; + importing = false; if (!is_scanning()) { emit_signal("filesystem_changed"); } @@ -1483,19 +1381,17 @@ void EditorFileSystem::reimport_files(const Vector<String>& p_files) { void EditorFileSystem::_bind_methods() { - - ClassDB::bind_method(D_METHOD("get_filesystem:EditorFileSystemDirectory"),&EditorFileSystem::get_filesystem); - ClassDB::bind_method(D_METHOD("is_scanning"),&EditorFileSystem::is_scanning); - ClassDB::bind_method(D_METHOD("get_scanning_progress"),&EditorFileSystem::get_scanning_progress); - ClassDB::bind_method(D_METHOD("scan"),&EditorFileSystem::scan); - ClassDB::bind_method(D_METHOD("scan_sources"),&EditorFileSystem::scan_changes); - ClassDB::bind_method(D_METHOD("update_file","path"),&EditorFileSystem::update_file); - ClassDB::bind_method(D_METHOD("get_filesystem_path:EditorFileSystemDirectory","path"),&EditorFileSystem::get_filesystem_path); - ClassDB::bind_method(D_METHOD("get_file_type","path"),&EditorFileSystem::get_file_type); - - ADD_SIGNAL( MethodInfo("filesystem_changed") ); - ADD_SIGNAL( MethodInfo("sources_changed",PropertyInfo(Variant::BOOL,"exist")) ); - + ClassDB::bind_method(D_METHOD("get_filesystem:EditorFileSystemDirectory"), &EditorFileSystem::get_filesystem); + ClassDB::bind_method(D_METHOD("is_scanning"), &EditorFileSystem::is_scanning); + ClassDB::bind_method(D_METHOD("get_scanning_progress"), &EditorFileSystem::get_scanning_progress); + ClassDB::bind_method(D_METHOD("scan"), &EditorFileSystem::scan); + ClassDB::bind_method(D_METHOD("scan_sources"), &EditorFileSystem::scan_changes); + ClassDB::bind_method(D_METHOD("update_file", "path"), &EditorFileSystem::update_file); + ClassDB::bind_method(D_METHOD("get_filesystem_path:EditorFileSystemDirectory", "path"), &EditorFileSystem::get_filesystem_path); + ClassDB::bind_method(D_METHOD("get_file_type", "path"), &EditorFileSystem::get_file_type); + + ADD_SIGNAL(MethodInfo("filesystem_changed")); + ADD_SIGNAL(MethodInfo("sources_changed", PropertyInfo(Variant::BOOL, "exist"))); } void EditorFileSystem::_update_extensions() { @@ -1504,15 +1400,15 @@ void EditorFileSystem::_update_extensions() { import_extensions.clear(); List<String> extensionsl; - ResourceLoader::get_recognized_extensions_for_type("",&extensionsl); - for(List<String>::Element *E = extensionsl.front();E;E=E->next()) { + ResourceLoader::get_recognized_extensions_for_type("", &extensionsl); + for (List<String>::Element *E = extensionsl.front(); E; E = E->next()) { valid_extensions.insert(E->get()); } extensionsl.clear(); ResourceFormatImporter::get_singleton()->get_recognized_extensions(&extensionsl); - for(List<String>::Element *E = extensionsl.front();E;E=E->next()) { + for (List<String>::Element *E = extensionsl.front(); E; E = E->next()) { import_extensions.insert(E->get()); } @@ -1520,31 +1416,29 @@ void EditorFileSystem::_update_extensions() { EditorFileSystem::EditorFileSystem() { - reimport_on_missing_imported_files = GLOBAL_DEF("editor/reimport_missing_imported_files",true); + reimport_on_missing_imported_files = GLOBAL_DEF("editor/reimport_missing_imported_files", true); - singleton=this; - filesystem=memnew( EditorFileSystemDirectory ); //like, empty + singleton = this; + filesystem = memnew(EditorFileSystemDirectory); //like, empty thread = NULL; - scanning=false; - importing=false; - use_threads=true; - thread_sources=NULL; - new_filesystem=NULL; + scanning = false; + importing = false; + use_threads = true; + thread_sources = NULL; + new_filesystem = NULL; - scanning_changes=false; + scanning_changes = false; ResourceSaver::set_save_callback(_resource_saved); DirAccess *da = DirAccess::create(DirAccess::ACCESS_RESOURCES); - if (da->change_dir("res://.import")!=OK) { + if (da->change_dir("res://.import") != OK) { da->make_dir("res://.import"); } memdelete(da); - scan_total=0; + scan_total = 0; } EditorFileSystem::~EditorFileSystem() { - - } |