Merge pull request emscripten-core#22 from rstz/minor-fixes

Remove spam from file packager script and fix main thread prejs

Author: rstz

pthreadfs/examples/jsops-tests/write_from_main_thread_pre.js

@@ -1,9 +1,12 @@
 if ("preRun" in Module) {
-  Module["preRun"].push(async () => {
-    await PThreadFS.init('persistent');
-    await PThreadFS.writeFile("persistent/file.txt", "the contents of persistent/file.txt !!", {});
-    await PThreadFS.createPath("/", "persistent/mainthreadfolder/subfolder/", true, true);
-    await PThreadFS.writeFile("persistent/mainthreadfolder/subfolder/ok now",
-      "the contents of persistent/mainthreadfolder/subfolder/ok now !!", {});
+  Module["preRun"].push( () => {
+    addRunDependency('writeFiles');
+    PThreadFS.init('persistent').then(async () => {
+      await PThreadFS.writeFile("persistent/file.txt", "the contents of persistent/file.txt !!", {});
+      await PThreadFS.createPath("/", "persistent/mainthreadfolder/subfolder/", true, true);
+      await PThreadFS.writeFile("persistent/mainthreadfolder/subfolder/ok now",
+        "the contents of persistent/mainthreadfolder/subfolder/ok now !!", {});
+      removeRunDependency('writeFiles');
+    });
   });
 }

pthreadfs/file_packager.py

@@ -518,12 +518,13 @@ def was_seen(name):
           var that = this;
 
           // Remove potential old versions of this file.
+          // TODO: Consider only removing if the file exists, for performance.
           try {
             await PThreadFS.unlink(this.name);
           }
           catch (e) {
-            // TODO: This error message might spam the console, consider removing it when the file packager matures.
-            console.log("Removing " + this.name + " failed with message " + e);
+            // Emitting an error will spam the console with unnecessary messages.
+            // console.log("Removing " + this.name + " failed with message " + e);
           }
           await PThreadFS.createDataFile(this.name, null, byteArray, true, true,
             true); // canOwn this data in the filesystem, it is a slide into the heap that will

tools/file_packager.py

@@ -518,12 +518,13 @@ def was_seen(name):
           var that = this;
 
           // Remove potential old versions of this file.
+          // TODO: Consider only removing if the file exists, for performance.
           try {
             await PThreadFS.unlink(this.name);
           }
           catch (e) {
-            // TODO: This error message might spam the console, consider removing it when the file packager matures.
-            console.log("Removing " + this.name + " failed with message " + e);
+            // Emitting an error will spam the console with unnecessary messages.
+            // console.log("Removing " + this.name + " failed with message " + e);
           }
           await PThreadFS.createDataFile(this.name, null, byteArray, true, true,
             true); // canOwn this data in the filesystem, it is a slide into the heap that will