moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

fix content-type handling in *SSF-EmbeddedExtractor

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1776823 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andreas Beeker 2017-01-01 00:56:51 +00:00
parent 254b42ff26
commit a4a0c1e91a
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ooxml/java/org/apache/poi/ss/extractor/EmbeddedExtractor.java
View File

@ -45,6 +45,7 @@ import org.apache.poi.util.IOUtils;
import org.apache.poi.util.LocaleUtil; import org.apache.poi.util.LocaleUtil;
import org.apache.poi.util.POILogFactory; import org.apache.poi.util.POILogFactory;
import org.apache.poi.util.POILogger; import org.apache.poi.util.POILogger;
import org.apache.poi.xssf.usermodel.XSSFObjectData;
public class EmbeddedExtractor implements Iterable<EmbeddedExtractor> { public class EmbeddedExtractor implements Iterable<EmbeddedExtractor> {
private static final POILogger LOG = POILogFactory.getLogger(EmbeddedExtractor.class); private static final POILogger LOG = POILogFactory.getLogger(EmbeddedExtractor.class);
@ -97,7 +98,11 @@ public class EmbeddedExtractor implements Iterable<EmbeddedExtractor> {
if (od.hasDirectoryEntry()) { if (od.hasDirectoryEntry()) {
data = extractOne((DirectoryNode)od.getDirectory()); data = extractOne((DirectoryNode)od.getDirectory());
} else { } else {
data = new EmbeddedData(od.getFileName(), od.getObjectData(), "binary/octet-stream"); String contentType = "binary/octet-stream";
if (od instanceof XSSFObjectData) {
contentType = ((XSSFObjectData)od).getObjectPart().getContentType();
}
data = new EmbeddedData(od.getFileName(), od.getObjectData(), contentType);
} }
} catch (Exception e) { } catch (Exception e) {
LOG.log(POILogger.WARN, "Entry not found / readable - ignoring OLE embedding", e); LOG.log(POILogger.WARN, "Entry not found / readable - ignoring OLE embedding", e);
@ -169,6 +174,7 @@ public class EmbeddedExtractor implements Iterable<EmbeddedExtractor> {
@Override @Override
public EmbeddedData extract(DirectoryNode dn) throws IOException { public EmbeddedData extract(DirectoryNode dn) throws IOException {
try { try {
// TODO: inspect the CompObj record for more details, i.e. the content type
Ole10Native ole10 = Ole10Native.createFromEmbeddedOleObject(dn); Ole10Native ole10 = Ole10Native.createFromEmbeddedOleObject(dn);
return new EmbeddedData(ole10.getFileName(), ole10.getDataBuffer(), "binary/octet-stream"); return new EmbeddedData(ole10.getFileName(), ole10.getDataBuffer(), "binary/octet-stream");
} catch (Ole10NativeException e) { } catch (Ole10NativeException e) {
@ -254,6 +260,7 @@ public class EmbeddedExtractor implements Iterable<EmbeddedExtractor> {
public EmbeddedData extract(DirectoryNode dn) throws IOException { public EmbeddedData extract(DirectoryNode dn) throws IOException {
EmbeddedData ed = super.extract(dn); EmbeddedData ed = super.extract(dn);
ed.setFilename(dn.getName()+".doc"); ed.setFilename(dn.getName()+".doc");
ed.setContentType("application/msword");
return ed; return ed;
} }
} }
@ -271,6 +278,7 @@ public class EmbeddedExtractor implements Iterable<EmbeddedExtractor> {
public EmbeddedData extract(DirectoryNode dn) throws IOException { public EmbeddedData extract(DirectoryNode dn) throws IOException {
EmbeddedData ed = super.extract(dn); EmbeddedData ed = super.extract(dn);
ed.setFilename(dn.getName()+".xls"); ed.setFilename(dn.getName()+".xls");
ed.setContentType("application/vnd.ms-excel");
return ed; return ed;
} }
} }