Revert "Update web_io.dart"

This reverts commit c22b22f.
ardriveapp · Nov 17, 2023 · e9a8827 · e9a8827
1 parent c22b22f
commit e9a8827
Showing 1 changed file with 17 additions and 21 deletions.
diff --git a/lib/src/web/web_io.dart b/lib/src/web/web_io.dart
@@ -184,17 +184,13 @@ class WebIO implements ArDriveIO {
     );
 
     try {
-      ardriveIODebugPrint('Creating writable stream...');
-
       final writable = createWriteStream(file.name, {
-        'size': totalBytes,
+        'size': await file.length,
       });
 
       final writer = writable.getWriter();
 
-      await for (final chunk in file.openReadStream(0, totalBytes)) {
-        ardriveIODebugPrint('Writing ${chunk.length} bytes to file...');
-
+      await for (final chunk in file.openReadStream()) {
         if (await completerMaybe(finalize) == false) break;
         await writer.readyFuture;
         await writer.writeFuture(chunk);
@@ -204,25 +200,25 @@ class WebIO implements ArDriveIO {
           bytesSaved: bytesSaved,
           totalBytes: totalBytes,
         );
-
-        ardriveIODebugPrint('save status: $bytesSaved/$totalBytes');
       }
 
-      ardriveIODebugPrint('Finished writing to file. Closing file...');
+      await writer.readyFuture;
 
-      // FIXME: this never ends on Firefox/Safari.
-      // final finalizeResult = await finalize.future;
-      // debugPrint('Finalize result: $finalizeResult');
-      // if (!finalizeResult) {
-      //   debugPrint('Cancelling saveFileStream...');
-      //   writer.abort();
-      //   await writable.abortFuture('Finalize result is false');
-      // } else {
+      ardriveIODebugPrint('writer ready');
 
-      await writer.closeFuture();
-      writer.close();
-      writer.releaseLock();
-      // }
+      finalize.complete(true);
+
+      final finalizeResult = await finalize.future;
+
+      if (!finalizeResult) {
+        ardriveIODebugPrint('Cancelling saveFileStream...');
+        writer.abort();
+        await writable.abortFuture('Finalize result is false');
+      } else {
+        await writer.closeFuture();
+        writer.close();
+        writer.releaseLock();
+      }
 
       yield SaveStatus(
         bytesSaved: bytesSaved,