diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-08-09 13:45:30 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2019-08-12 13:31:59 +0200 |
| commit | 37a16fee05f2ee528c8556af9f4337a909e58de5 (patch) | |
| tree | fbb29752990919ee836128994a194a2370bfa3e0 /platform/javascript/export/export.cpp | |
| parent | 5441aaf768d6dd4c3d8465e6b340ae38ddc7db1d (diff) | |
| download | redot-engine-37a16fee05f2ee528c8556af9f4337a909e58de5.tar.gz | |
Export: Remove temp files from cache after export
So far we left most temporary files lying around, so this attempts to
fix that.
I added a helper method to DirAccess to factor out the boilerplate of
creating a DirAccess, checking if the file exists, remove it or print
an error on failure.
Diffstat (limited to 'platform/javascript/export/export.cpp')
| -rw-r--r-- | platform/javascript/export/export.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/platform/javascript/export/export.cpp b/platform/javascript/export/export.cpp index c68b420c61..69dd038709 100644 --- a/platform/javascript/export/export.cpp +++ b/platform/javascript/export/export.cpp @@ -362,12 +362,21 @@ int EditorExportPlatformJavaScript::get_device_count() const { Error EditorExportPlatformJavaScript::run(const Ref<EditorExportPreset> &p_preset, int p_device, int p_debug_flags) { - String path = EditorSettings::get_singleton()->get_cache_dir().plus_file("tmp_export.html"); + String basepath = EditorSettings::get_singleton()->get_cache_dir().plus_file("tmp_js_export"); + String path = basepath + ".html"; Error err = export_project(p_preset, true, path, p_debug_flags); - if (err) { + if (err != OK) { + // Export generates several files, clean them up on failure. + DirAccess::remove_file_or_error(basepath + ".html"); + DirAccess::remove_file_or_error(basepath + ".js"); + DirAccess::remove_file_or_error(basepath + ".pck"); + DirAccess::remove_file_or_error(basepath + ".png"); + DirAccess::remove_file_or_error(basepath + ".wasm"); return err; } OS::get_singleton()->shell_open(String("file://") + path); + // FIXME: Find out how to clean up export files after running the successfully + // exported game. Might not be trivial. return OK; } |