asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #26283 from neikeq/issue-25330

Browse source 
Make export templates extraction handle subdirectories
This commit is contained in:
Rémi Verschelde 2019-02-25 20:46:58 +01:00 committed by GitHub
commit 51c1d55cf9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
editor/export_template_manager.cpp
View file

@ -193,6 +193,7 @@ bool ExportTemplateManager::_install_from_file(const String &p_file, bool p_use_
int fc = 0; //count them and find version int fc = 0; //count them and find version
String version; String version;
String contents_dir;
while (ret == UNZ_OK) { while (ret == UNZ_OK) {
@ -225,6 +226,7 @@ bool ExportTemplateManager::_install_from_file(const String &p_file, bool p_use_
} }
version = data_str; version = data_str;
contents_dir = file.get_base_dir().trim_suffix("/").trim_suffix("\\");
} }
if (file.get_file().size() != 0) { if (file.get_file().size() != 0) {
@ -268,7 +270,9 @@ bool ExportTemplateManager::_install_from_file(const String &p_file, bool p_use_
char fname[16384]; char fname[16384];
unzGetCurrentFileInfo(pkg, &info, fname, 16384, NULL, 0, NULL, 0); unzGetCurrentFileInfo(pkg, &info, fname, 16384, NULL, 0, NULL, 0);
String file = String(fname).get_file(); String file_path(fname);
String file = file_path.get_file();
if (file.size() == 0) { if (file.size() == 0) {
ret = unzGoToNextFile(pkg); ret = unzGoToNextFile(pkg);
@ -283,6 +287,23 @@ bool ExportTemplateManager::_install_from_file(const String &p_file, bool p_use_
unzReadCurrentFile(pkg, data.ptrw(), data.size()); unzReadCurrentFile(pkg, data.ptrw(), data.size());
unzCloseCurrentFile(pkg); unzCloseCurrentFile(pkg);
String base_dir = file_path.get_base_dir().trim_suffix("/").trim_suffix("\\");
if (base_dir != contents_dir && base_dir.begins_with(contents_dir)) {
base_dir = base_dir.substr(contents_dir.length(), file_path.length()).trim_prefix("/").trim_prefix("\\");
file = base_dir.plus_file(file);
DirAccessRef da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
ERR_CONTINUE(!da);
String output_dir = template_path.plus_file(base_dir);
if (!DirAccess::exists(output_dir)) {
Error mkdir_err = da->make_dir_recursive(output_dir);
ERR_CONTINUE(mkdir_err != OK);
}
}
if (p) { if (p) {
p->step(TTR("Importing:") + " " + file, fc); p->step(TTR("Importing:") + " " + file, fc);
} }