Skip to content

Commit

Permalink
bufferSize has to be a number, removed *all ability. Removed encodeLi…
Browse files Browse the repository at this point in the history
…ne from encodes
  • Loading branch information
FourierTransformer committed Mar 30, 2020
1 parent 4732944 commit 1b77e0e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 24 deletions.
8 changes: 0 additions & 8 deletions encoder.lua
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,4 @@ local function encode(inputTable, delimiter, options)
return table.concat(output)
end

local function encodeLine(inputTable, delimiter, options)
local output, headers = initializeGenerator(inputTable, delimiter, options)
-- something something create a function, first time return output[1]
-- then return csvLineGenerator
-- csvLineGenerator(inputTable, delimiter, headers)

end

return encode
23 changes: 7 additions & 16 deletions ftcsv.lua
Original file line number Diff line number Diff line change
Expand Up @@ -565,13 +565,8 @@ function ftcsv.parseLine(inputFile, delimiter, userOptions)


local fileSize, atEndOfFile = 0, false
if options.bufferSize == "*all" then
file = nil
atEndOfFile = true
else
fileSize = getFileSize(file)
atEndOfFile = determineAtEndOfFile(file, fileSize)
end
fileSize = getFileSize(file)
atEndOfFile = determineAtEndOfFile(file, fileSize)

local endOfHeaders, parserArgs, _ = parseHeadersAndSetupArgs(inputString, delimiter, options, fieldsToKeep, atEndOfFile)
parserArgs.buffered = true
Expand All @@ -594,16 +589,12 @@ function ftcsv.parseLine(inputFile, delimiter, userOptions)
end

-- read more of the input
if file then
buffer = file:read(options.bufferSize)
if not buffer then
file:close()
return nil
else
parserArgs.endOfFile = determineAtEndOfFile(file, fileSize)
end
else
buffer = file:read(options.bufferSize)
if not buffer then
file:close()
return nil
else
parserArgs.endOfFile = determineAtEndOfFile(file, fileSize)
end

-- appends the new input to what was left over
Expand Down

0 comments on commit 1b77e0e

Please sign in to comment.