Merge pull request #45706 from Faless/js/3.x_editor_preload

[3.2] [HTML5] Better editor persistent folders, automatically open zip import popup
godotengine · Feb 4, 2021 · f9bf6fc · f9bf6fc
2 parents f42f6ed + 2668ca7
commit f9bf6fc
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp
@@ -2326,6 +2326,11 @@ void ProjectManager::_install_project(const String &p_zip_path, const String &p_
 }
 
 void ProjectManager::_files_dropped(PoolStringArray p_files, int p_screen) {
+ if (p_files.size() == 1 && p_files[0].ends_with(".zip")) {
+ const String file = p_files[0].get_file();
+ _install_project(p_files[0], file.substr(0, file.length() - 4).capitalize());
+ return;
+ }
  Set<String> folders_set;
  DirAccess *da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
  for (int i = 0; i < p_files.size(); i++) {

diff --git a/misc/dist/html/editor.html b/misc/dist/html/editor.html
@@ -327,7 +327,7 @@
  function startEditor(zip) {
 
  const INDETERMINATE_STATUS_STEP_MS = 100;
- const persistentPaths = ['/home/web_user/.config', '/home/web_user/.cache', '/home/web_user/projects'];
+ const persistentPaths = ['/home/web_user/'];
 
  var editorCanvas = document.getElementById('editor-canvas');
  var gameCanvas = document.getElementById('game-canvas');
@@ -498,11 +498,11 @@
  engine.setUnloadAfterInit(false); // Don't want to reload when starting game.
  engine.init('godot.tools').then(function() {
  if (zip) {
- engine.copyToFS("/home/web_user/preload.zip", zip);
+ engine.copyToFS("/tmp/preload.zip", zip);
  }
  try {
  // Avoid user creating project in the persistent root folder.
- engine.copyToFS("/home/web_user/projects/keep", new Uint8Array());
+ engine.copyToFS("/home/web_user/keep", new Uint8Array());
  } catch(e) {
  // File exists
  }

diff --git a/platform/javascript/javascript_main.cpp b/platform/javascript/javascript_main.cpp
@@ -87,6 +87,13 @@ extern EMSCRIPTEN_KEEPALIVE int godot_js_main(int argc, char *argv[]) {
  ResourceLoader::set_abort_on_missing_resources(false);
  Main::start();
  os->get_main_loop()->init();
+#ifdef TOOLS_ENABLED
+ if (Main::is_project_manager() && FileAccess::exists("/tmp/preload.zip")) {
+ PoolStringArray ps;
+ ps.push_back("/tmp/preload.zip");
+ os->get_main_loop()->emit_signal("files_dropped", ps, -1);
+ }
+#endif
  emscripten_set_main_loop(main_loop_callback, -1, false);
  // Immediately run the first iteration.
  // We are inside an animation frame, we want to immediately draw on the newly setup canvas.