fix bug on absolute path in _rels/workbook.xml.rels

Author: mbrocchieri

fastexcel-reader/src/main/java/org/dhatim/fastexcel/reader/OPCPackage.java

@@ -61,11 +61,16 @@ private static String relsNameFor(String entryName) {
     }
 
     private Map<String, String> readWorkbookPartsIds(String workbookRelsEntryName) throws IOException, XMLStreamException {
+        String xlFolder = workbookRelsEntryName.substring(0, workbookRelsEntryName.indexOf("_rel"));
         Map<String, String> partsIdById = new HashMap<>();
         SimpleXmlReader rels = new SimpleXmlReader(factory, getRequiredEntryContent(workbookRelsEntryName));
         while (rels.goTo("Relationship")) {
             String id = rels.getAttribute("Id");
             String target = rels.getAttribute("Target");
+            // if name does not start with /, it is a relative path
+            if (!target.startsWith("/")) {
+                target = xlFolder + target;
+            } // else it is an absolute path
             partsIdById.put(id, target);
         }
         return partsIdById;
@@ -92,7 +97,7 @@ private PartEntryNames extractPartEntriesFromContentTypes() throws XMLStreamExce
             if (entries.workbook == null) {
                 // in case of a default workbook path, we got this
                 // <Default Extension="xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml" />
-                entries.workbook = "xl/workbook.xml";
+                entries.workbook = "/xl/workbook.xml";
             }
         }
         return entries;
@@ -178,10 +183,6 @@ public InputStream getSheetContent(Sheet sheet) throws IOException {
                 sheet.getIndex(), sheet.getName(), sheet.getId());
             throw new ExcelReaderException(msg);
         }
-        // if name does not start with /, it is a relative path
-        if (!name.startsWith("/")) {
-            name = "xl/" + name;
-        } // else it is an absolute path
         return getRequiredEntryContent(name);
     }
 

fastexcel-reader/src/test/java/org/dhatim/fastexcel/reader/InvalidOPCPackageTest.java

@@ -14,7 +14,7 @@ void expectErrors() throws IOException {
         expectError("/invalid/only-content-types.xlsx", "/xl/_rels/custom1-workbook.xml.rels not found");
         expectError("/invalid/no-workbook-rels.xlsx", "/xl/_rels/custom1-workbook.xml.rels not found");
         expectError("/invalid/no-workbook-xml.xlsx", "/xl/custom1-workbook.xml not found");
-        expectError("/invalid/no-sheet.xlsx", "xl/worksheets/custom3-sheet1.xml not found");
+        expectError("/invalid/no-sheet.xlsx", "/xl/worksheets/custom3-sheet1.xml not found");
         expectError("/invalid/missing-sheet-entry.xlsx", "Sheet#0 'Feuil1' is missing an entry in workbook rels (for id: 'rId42')");
     }
 

fastexcel-reader/src/test/java/org/dhatim/fastexcel/reader/SimpleReaderTest.java

@@ -17,6 +17,7 @@
 
 import org.junit.jupiter.api.Test;
 
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
@@ -116,4 +117,21 @@ public void testDefaultWorkbookPath() throws IOException {
             }
         }
     }
+
+    @Test
+    public void testDefaultWorkbookPath2() throws IOException {
+        try (InputStream is = Resources.open("/xlsx/absolutePath.xlsx");
+             ReadableWorkbook wb = new ReadableWorkbook(is, new ReadingOptions(false, true))) {
+            Sheet sheet = wb.getFirstSheet();
+            try (Stream<Row> rows = sheet.openStream()) {
+                Iterator<Row> it = rows.iterator();
+                assertTrue(it.hasNext());
+                Iterator<Cell> cellIt = it.next().iterator();
+                assertTrue(cellIt.hasNext());
+                Cell cell = cellIt.next();
+                assertEquals(CellType.NUMBER, cell.getType());
+                assertEquals(BigDecimal.ONE, cell.getValue());
+            }
+        }
+    }
 }