s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

FileMagic requires a stream that supports mark

Browse Source
This commit is contained in:
Owen Stephens 2019-04-09 13:47:08 +01:00
parent 6e26162619
commit 0217595275
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
main/src/com/google/refine/importers/ExcelImporter.java
View File

@ -35,6 +35,7 @@ package com.google.refine.importers;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.BufferedInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.PushbackInputStream; import java.io.PushbackInputStream;
@ -44,7 +45,6 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.apache.poi.ooxml.POIXMLDocument;
import org.apache.poi.ooxml.POIXMLException; import org.apache.poi.ooxml.POIXMLException;
import org.apache.poi.common.usermodel.Hyperlink; import org.apache.poi.common.usermodel.Hyperlink;
import org.apache.poi.hssf.usermodel.HSSFDateUtil; import org.apache.poi.hssf.usermodel.HSSFDateUtil;
@ -54,6 +54,8 @@ import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.apache.poi.poifs.filesystem.FileMagic;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -91,7 +93,7 @@ public class ExcelImporter extends TabularImportingParserBase {
InputStream is = new FileInputStream(file); InputStream is = new FileInputStream(file);
if (!is.markSupported()) { if (!is.markSupported()) {
is = new PushbackInputStream(is, 8); is = new BufferedInputStream(is);
} }
try { try {
@ -143,11 +145,12 @@ public class ExcelImporter extends TabularImportingParserBase {
) { ) {
Workbook wb = null; Workbook wb = null;
if (!inputStream.markSupported()) { if (!inputStream.markSupported()) {
inputStream = new PushbackInputStream(inputStream, 8); inputStream = new BufferedInputStream(inputStream);
;
} }
try { try {
wb = FileMagic.valueOf(InputStream) == FileMagic.OOXML ? wb = FileMagic.valueOf(inputStream) == FileMagic.OOXML ?
new XSSFWorkbook(inputStream) : new XSSFWorkbook(inputStream) :
new HSSFWorkbook(new POIFSFileSystem(inputStream)); new HSSFWorkbook(new POIFSFileSystem(inputStream));
} catch (IOException e) { } catch (IOException e) {