From d98c1577cf473bd6242f70ed6cbe284011fec105 Mon Sep 17 00:00:00 2001
From: Dmitriy Ryajov <dryajov@gmail.com>
Date: Tue, 29 Mar 2022 17:25:39 -0600
Subject: [PATCH] remove read pattern

---
 dagger/streams/storestream.nim | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/dagger/streams/storestream.nim b/dagger/streams/storestream.nim
index 28b6d944..58990a63 100644
--- a/dagger/streams/storestream.nim
+++ b/dagger/streams/storestream.nim
@@ -7,6 +7,8 @@
 ## This file may not be copied, modified, or distributed except according to
 ## those terms.
 
+import std/strformat
+
 import pkg/upraises
 
 push: {.upraises: [].}
@@ -28,24 +30,17 @@ logScope:
   topics = "dagger storestream"
 
 type
-  ReadPattern* {.pure.} = enum
-    Sequential,
-    Grid
-
   StoreStream* = ref object of SeekableStream
     store*: BlockStore
     manifest*: Manifest
-    pattern*: ReadPattern
 
-proc init*(
+proc new*(
   T: type StoreStream,
   store: BlockStore,
-  manifest: Manifest,
-  pattern = ReadPattern.Sequential): T =
+  manifest: Manifest): T =
   result = T(
     store: store,
     manifest: manifest,
-    pattern: pattern,
     offset: 0)
 
   result.initStream()
@@ -64,16 +59,20 @@ method readOnce*(
   var
     read = 0
 
-  while read < nbytes and self.atEof.not:
+  while read < nbytes and not self.atEof:
     let
       pos = self.offset div self.manifest.blockSize
       blk = (await self.store.getBlock(self.manifest[pos])).tryGet()
-      blockOffset = if self.offset >= self.manifest.blockSize:
+
+    let
+      blockOffset =
+        if self.offset >= self.manifest.blockSize:
           self.offset mod self.manifest.blockSize
         else:
           self.offset
 
-      readBytes = if (nbytes - read) >= (self.manifest.blockSize - blockOffset):
+      readBytes =
+        if (nbytes - read) >= (self.manifest.blockSize - blockOffset):
           self.manifest.blockSize - blockOffset
         else:
           min(nbytes - read, self.manifest.blockSize)
@@ -89,11 +88,11 @@ method atEof*(self: StoreStream): bool =
 
 method closeImpl*(self: StoreStream) {.async.} =
   try:
-    trace "Closing StoreStream", self
+    trace "Closing StoreStream"
     self.offset = self.manifest.len * self.manifest.blockSize # set Eof
   except CancelledError as exc:
     raise exc
   except CatchableError as exc:
-    trace "Error closing StoreStream", s, msg = exc.msg
+    trace "Error closing StoreStream", msg = exc.msg
 
   await procCall LPStream(self).closeImpl()