Support more excel types

rubenvanerk · Mar 7, 2022 · cb6814e · cb6814e
1 parent 6ff8b67
commit cb6814e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 877 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
 vendor
+.composer.lock
+.idea
diff --git a/behaviors/ExcelImportExportController.php b/behaviors/ExcelImportExportController.php
@@ -2,9 +2,12 @@
 
 use Backend\Behaviors\ImportExportController;
 use October\Rain\Database\Models\DeferredBinding;
+use PhpOffice\PhpSpreadsheet\IOFactory;
+use PhpOffice\PhpSpreadsheet\Reader\Exception;
 use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 use PhpOffice\PhpSpreadsheet\Writer\Csv;
 use System\Models\File;
+use ApplicationException;
 
 class ExcelImportExportController extends ImportExportController
 {
@@ -23,6 +26,9 @@ protected function createCsvReader($path)
     }
 
 
+    /**
+     * @throws ApplicationException
+     */
     private function convertToCsv(string $path)
     {
         $ext = pathinfo($path, PATHINFO_EXTENSION);
@@ -33,7 +39,14 @@ private function convertToCsv(string $path)
 
         $tempCsvPath = $path . '.csv';
 
-        $reader = new Xlsx();
+        $inputFileType = IOFactory::identify($path);
+
+        try {
+            $reader = IOFactory::createReader($inputFileType);
+        } catch (Exception $e) {
+            throw new ApplicationException('Unsupported file type: ' . $inputFileType);
+        }
+
         $spreadsheet = $reader->load($path);
         $writer = new Csv($spreadsheet);
         $writer->setSheetIndex(0);