Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,10 @@ class CsvFileWriter internal constructor(
private val writer: PrintWriter
) : ICsvFileWriter, Closeable, Flushable {

/**
* state handling to write terminator for next line
*/
private val stateHandler = CsvWriterStateHandler()

private val quoteNeededChars = setOf('\r', '\n', ctx.quote.char, ctx.delimiter)

private var hasWroteInitialChar: Boolean = false

/**
* write one row
*/
Expand Down Expand Up @@ -96,24 +93,14 @@ class CsvFileWriter internal constructor(
}
}
writer.print(rowStr)
}

private fun willWriteEndTerminator() {
if (ctx.outputLastLineTerminator) {
writeTerminator()
stateHandler.setStateOfWroteLineEndTerminator()
} else {
stateHandler.setStateOfNotWroteLineEndTerminator()
}
hasWroteInitialChar = true
}

/**
* Will write terminator if and only if
* 1. has wrote first line
* 2. state is set to has not wrote last line terminator
* Will write terminator if writer has not wrote last line terminator on previous line.
*/
private fun willWritePreTerminator() {
if (stateHandler.hasWroteFirstLine() && !stateHandler.hasWroteLineEndTerminator()) {
if (!ctx.outputLastLineTerminator && hasWroteInitialChar) {
writeTerminator()
}
}
Expand All @@ -123,7 +110,12 @@ class CsvFileWriter internal constructor(
*/
private fun writeTerminator() {
writer.print(ctx.lineTerminator)
stateHandler.setStateOfWroteLineEndTerminator()
}

private fun willWriteEndTerminator() {
if (ctx.outputLastLineTerminator) {
writeTerminator()
}
}

private fun attachQuote(field: String): String {
Expand Down