zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix csv bug

Browse Source
This commit is contained in:
Looly
2021-01-31 21:34:17 +08:00
parent 2d3d41c9f2
commit d69b95f066
5 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
hutool-core/src/main/java/cn/hutool/core/text/csv/CsvParser.java
View File

@@ -173,7 +173,6 @@ public final class CsvParser implements Closeable, Serializable {
final Buffer buf = this.buf;
int preChar = this.preChar;//前一个特殊分界字符
int copyLen = 0; //拷贝长度
boolean lineStart = true;
boolean inComment = false;
while (true) {
@@ -201,15 +200,16 @@ public final class CsvParser implements Closeable, Serializable {
final char c = buf.get();
// 注释行标记
if(lineStart){
if(preChar < 0 || preChar == CharUtil.CR || preChar == CharUtil.LF){
// 判断行首字符为指定注释字符的注释开始，直到遇到换行符
// 行首分两种，1是preChar < 0表示文本开始，2是换行符后紧跟就是下一行的开始
if(c == this.config.commentCharacter){
inComment = true;
}
lineStart = false;
}
// 注释行处理
if(inComment){
if ((c == CharUtil.CR || c == CharUtil.LF) && preChar != CharUtil.CR) {
if (c == CharUtil.CR || c == CharUtil.LF) {
// 注释行以换行符为结尾
inComment = false;
}
@@ -220,7 +220,7 @@ public final class CsvParser implements Closeable, Serializable {
}
if (inQuotes) {
//引号内，做为内容，直到引号结束
//引号内，作为内容，直到引号结束
if (c == config.textDelimiter) {
// End of quoted text
inQuotes = false;
@@ -295,10 +295,10 @@ public final class CsvParser implements Closeable, Serializable {
* @param field 字段
*/
private void addField(List<String> currentFields, String field) {
field = StrUtil.unWrap(field, config.textDelimiter);
char textDelimiter = this.config.textDelimiter;
final char textDelimiter = this.config.textDelimiter;
field = StrUtil.unWrap(field, textDelimiter);
field = StrUtil.replace(field, "" + textDelimiter + textDelimiter, textDelimiter + "");
currentFields.add(StrUtil.unWrap(field, textDelimiter));
currentFields.add(field);
}
/**

3
hutool-core/src/test/java/cn/hutool/core/text/csv/CsvUtilTest.java
View File

@@ -44,9 +44,10 @@ public class CsvUtilTest {
}
@Test
@Ignore
public void readTest3() {
CsvReader reader = CsvUtil.getReader();
reader.read(FileUtil.getUtf8Reader("test.csv"), Console::log);
reader.read(FileUtil.getUtf8Reader("d:/test/test.csv"), Console::log);
}
@Test