maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #16430 from dragmz/download_tpl_to_file

Browse source 
Download export templates to a file (instead of memory) using separate thread
This commit is contained in:
Rémi Verschelde 2018-02-19 21:31:26 +01:00 committed by GitHub
parent 2a723519c0 b4f1a035e3
commit 3564895b63
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
editor/export_template_manager.cpp
View file

@ -402,19 +402,10 @@ void ExportTemplateManager::_http_download_templates_completed(int p_status, int
if (p_code != 200) { if (p_code != 200) {
template_list_state->set_text(TTR("Failed:") + " " + itos(p_code)); template_list_state->set_text(TTR("Failed:") + " " + itos(p_code));
} else { } else {
String path = EditorSettings::get_singleton()->get_cache_dir().plus_file("tmp_templates.tpz"); String path = download_templates->get_download_file();
FileAccess *f = FileAccess::open(path, FileAccess::WRITE); template_list_state->set_text(TTR("Download Complete."));
if (!f) { template_downloader->hide();
template_list_state->set_text(TTR("Can't write file.")); _install_from_file(path, false);
} else {
int size = p_data.size();
PoolVector<uint8_t>::Read r = p_data.read();
f->store_buffer(r.ptr(), size);
memdelete(f);
template_list_state->set_text(TTR("Download Complete."));
template_downloader->hide();
_install_from_file(path, false);
}
} }
} break; } break;
} }
@ -437,6 +428,8 @@ void ExportTemplateManager::_begin_template_download(const String &p_url) {
} }
download_data.clear(); download_data.clear();
download_templates->set_download_file(EditorSettings::get_singleton()->get_cache_dir().plus_file("tmp_templates.tpz"));
download_templates->set_use_threads(true);
Error err = download_templates->request(p_url); Error err = download_templates->request(p_url);
if (err != OK) { if (err != OK) {