提交 1f84ceae 编写于 作者: M Mathieu Bastian

Fix issue #2499

上级 55938298
...@@ -57,6 +57,7 @@ import org.gephi.io.importer.plugin.file.spreadsheet.sheet.ErrorSheet; ...@@ -57,6 +57,7 @@ import org.gephi.io.importer.plugin.file.spreadsheet.sheet.ErrorSheet;
import org.gephi.io.importer.plugin.file.spreadsheet.sheet.SheetParser; import org.gephi.io.importer.plugin.file.spreadsheet.sheet.SheetParser;
import org.gephi.io.importer.plugin.file.spreadsheet.sheets.csv.CSVSheetParser; import org.gephi.io.importer.plugin.file.spreadsheet.sheets.csv.CSVSheetParser;
import org.gephi.utils.CharsetToolkit; import org.gephi.utils.CharsetToolkit;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil; import org.openide.filesystems.FileUtil;
/** /**
...@@ -115,8 +116,14 @@ public class ImporterSpreadsheetCSV extends AbstractImporterSpreadsheet { ...@@ -115,8 +116,14 @@ public class ImporterSpreadsheetCSV extends AbstractImporterSpreadsheet {
} }
private void autoDetectFieldDelimiter() { private void autoDetectFieldDelimiter() {
FileObject fileObject = FileUtil.toFileObject(file);
//Return if file is empty
if (fileObject.getSize() == 0) {
return;
}
//Very simple naive detector but should work in most cases: //Very simple naive detector but should work in most cases:
try (LineNumberReader reader = ImportUtils.getTextReader(FileUtil.toFileObject(file))) { try (LineNumberReader reader = ImportUtils.getTextReader(fileObject)) {
String line = reader.readLine().trim() String line = reader.readLine().trim()
.replaceAll(" , ", ",").replaceAll(" ; ", ";"); .replaceAll(" , ", ",").replaceAll(" ; ", ";");
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册