Move readFromStream back into main

Author: remcoder

src/extra/dom-utils.ts

@@ -36,51 +36,18 @@ export function makeDroppable(previewInstance: WebGLPreview): void {
  * @emits update - Custom event with file metadata when file ends
  */
 async function readFromFile(preview: WebGLPreview, file: File): Promise<void> {
-  const stream = file.stream();
-  const reader = stream.getReader();
-  let result;
-  let tail = '';
-  let size = 0;
-
-  do {
-    result = await reader.read();
-    const length = result.value?.length ?? 0;
-    if (length === 0) {
-      console.debug('stream ended');
-      break;
-    }
-    console.debug('reading from stream', Math.floor(length / 1024), 'kB');
-    size += length;
-    const str = decode(result.value);
-    const idxNewLine = str.lastIndexOf('\n');
-    const maxFullLine = str.slice(0, idxNewLine);
-
-    // parse increments but don't render yet
-    const { commands } = preview.parser.parseGCode(tail + maxFullLine);
-
-    // we'll execute the commands immediately, for now
-    preview.interpreter.execute(commands, preview.job);
-
-    tail = str.slice(idxNewLine);
-  } while (!result.done);
-  console.debug('total read from stream', Math.floor(size / 1024), 'kB');
-
+  await preview.readFromStream( file.stream());
+  
   preview.endLayer = preview.job.layers.length;
 
   // dispatch a custom event to notify that the file has been loaded
   const event = new CustomEvent('update', {
     detail: {
       filename: file.name,
-      size: size,
+      size: file.size,
       layers: preview.job.layers.length,
       paths: preview.job.paths.length
     }
   });
   preview.canvas.dispatchEvent(event);
-
-  preview.renderAnimated();
-}
-
-function decode(uint8array: Uint8Array) {
-  return new TextDecoder('utf-8').decode(uint8array);
 }

src/webgl-preview.ts

@@ -865,6 +865,38 @@ export class WebGLPreview {
     return batchedMesh;
   }
 
+async readFromStream(stream: ReadableStream): Promise<void> {
+  const reader = stream.getReader();
+  let result;
+  let tail = '';
+  let size = 0;
+
+  do {
+    result = await reader.read();
+    const length = result.value?.length ?? 0;
+    if (length === 0) {
+      console.debug('stream ended');
+      break;
+    }
+    console.debug('reading from stream', Math.floor(length / 1024), 'kB');
+    size += length;
+    const str = decode(result.value);
+    const idxNewLine = str.lastIndexOf('\n');
+    const maxFullLine = str.slice(0, idxNewLine);
+
+    // parse increments but don't render yet
+    const { commands } = this.parser.parseGCode(tail + maxFullLine);
+
+    // we'll execute the commands immediately, for now
+    this.interpreter.execute(commands, this.job);
+
+    tail = str.slice(idxNewLine);
+  } while (!result.done);
+  console.debug('total read from stream', Math.floor(size / 1024), 'kB');
+
+  this.renderAnimated();
+}
+
   /**
    * Initializes the developer GUI if dev mode is enabled
    */
@@ -890,3 +922,7 @@ export class WebGLPreview {
     }
   }
 }
+
+function decode(uint8array: Uint8Array) {
+  return new TextDecoder('utf-8').decode(uint8array);
+}