Clean up read stream a little

nko · Oct 12, 2011 · 1c2a7fd · 1c2a7fd
1 parent 31763dc
commit 1c2a7fd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/examples/fs-streams.lua b/examples/fs-streams.lua
@@ -13,7 +13,7 @@ stream:on('end', function ()
   p("on_end")
 end)
 
-print("Adding closed listener")
-stream:on('closed', function ()
-  p("on_closed")
+print("Adding close listener")
+stream:on('close', function ()
+  p("on_close")
 end)
diff --git a/lib/fs.lua b/lib/fs.lua
@@ -37,6 +37,7 @@ local CHUNK_SIZE = 65536
 local read_options = {
   flags = "r",
   mode = "0644",
+  chunk_size = CHUNK_SIZE,
   offset = 0,
   length = nil -- nil means read to EOF
 }
@@ -55,19 +56,18 @@ function FS.create_read_stream(path, options)
     if err then return stream:emit("error", err) end
     local offset = options.offset
     local last = options.length and offset + options.length
-    p({offset=offset,last=last,length=options.length})
+    local chunk_size = options.chunk_size
 
     local function read_chunk()
-      local to_read = (last and CHUNK_SIZE + offset > last and last - offset) or CHUNK_SIZE
+      local to_read = (last and chunk_size + offset > last and last - offset) or chunk_size
       FS.read(fd, offset, to_read, function (err, chunk, len)
         if err or len == 0 then
           FS.close(fd, function (err)
             if err then return stream:emit("error", err) end
             stream:emit("close")
           end)
           if err then return stream:emit("error", err) end
-        end
-        if len == 0 then
+
           stream:emit("end")
         else
           stream:emit("data", chunk, len)
@@ -84,6 +84,7 @@ end
 local write_options = {
   flags = "w",
   mode = "0644",
+  chunk_size = CHUNK_SIZE,
   offset = 0,
 }
 local write_meta = {__index=write_options}