[1.16]Excel multi sheet

.gitignore

@@ -18,6 +18,7 @@ test/Generated*
 test/InputFiles3*
 test/test1/*
 newdir2/
+src/__recovery
 
 /releases
 src/docto.exe

companion/app/Services/CommandInfoService.php

@@ -727,9 +727,12 @@ public static function Explanations()
               "dddeletefiles" => ['cmd' => '--deletefiles', 'desc' => "Delete the converted file after conversion."],
               "ddbookmarksource" => ['cmd' => '--bookmarksource', 'desc' => "Where to get Bookmarks from for PDF.  This parameter is only relevant for PDF files."],
               "ddexportmarkup" => ['cmd' => '--ExportMarkup', 'desc' => "Export Comments and other markup from Word Document to PDF"],
-              "ddnosubdirs" => ['cmd' => '--no-subdirs', 'desc' => "Don't rescurse subdirs.  Only convert files in requested dir. "],
+              "ddnosubdirs" => ['cmd' => '--no-subdirs', 'desc' => "Don't recurse sub-dirs.  Only convert files in requested dir. "],
               "dduseISO190051" => ['cmd' => '--use-iso19005-1', 'desc' => 'Output PDFs from Word as ISO standard 19005-1 for self contained PDFS. Sometimes also refered to as (PDF/A)[https://en.wikipedia.org/wiki/PDF/A]'],
              "ddinputfilter" => ['cmd' => '--inputfilter', 'desc' => 'Input filter to use to find documents. eg Project*.doc* will match ProjectA.doc, Project123.doc, ProjectABC.docx '],
+             "ddsheets" => ['cmd' => '--sheets', 'desc' => 'Output specific sheet from a workbook.  Sheet will be output with a specific named file. MyWorksheet_(SheetName)  This does not work with xlCSV'],
+             "ddallsheets" => ['cmd' => '--allsheets', 'desc' => 'Output all sheets in a workbook.  Each sheet will be output to a separate named file. MyWorksheet_(SheetName)'],
+
 
 
           ];

companion/app/Services/DocToCommandBuilder.php

@@ -0,0 +1,29 @@
+<?php
+
+  namespace App\Services;
+
+  class DocToCommandBuilder
+  {
+      public $params = [];
+
+        public static function docto()
+        {
+            return (new static())->add(config('services.docto.path'));
+        }
+
+        public function add($param, $value = null){
+            $this->params[] = [$param,$value];
+            return $this;
+        }
+
+        public function build(){
+            $cmd = '';
+            foreach($this->params as $paramset){
+                $cmd .= ' ' . $paramset[0] ;
+                if (isset($paramset[1])){
+                    $cmd .=  ' "' . $paramset[1] . '" ';
+                }
+            }
+            return $cmd;
+        }
+  }

companion/app/Services/FileGatherService.php

@@ -7,20 +7,30 @@
 
   class FileGatherService
   {
-        public static function GatherFiles(Collection $list, $tempDirName)
+      /**
+       * Gather files will take files from specific subdir of the resource InputFiles directory and
+       * copy them to a temporary directory wehre they can be used for a test.
+       * @param Collection $list
+       * @param $tempDirName
+       * @return Collection
+       * @throws \League\Flysystem\FilesystemException
+       */
+        public static function GatherFiles(Collection | string $list, $tempDirName)
         {
+            if (is_string($list)){
+                $list = collect([$list]);
+            }
+
             // remove exisitn files
             if (\Illuminate\Support\Facades\Storage::exists($tempDirName)){
                 \Illuminate\Support\Facades\Storage::deleteDirectory($tempDirName);
             }
 
             $tempDirPath = Storage::path($tempDirName);
-            $list->each(function ($dir) use ($tempDirName, $tempDirPath){
-                $inputfilesdir = \Illuminate\Support\Facades\Storage::path('inputfiles\\' . $dir );
+            $list->each(function ($inputdir) use ($tempDirName, $tempDirPath){
+                $inputfilesdir = \Illuminate\Support\Facades\Storage::disk('inputfiles')->path($inputdir );
                 $cmd = "xcopy \"$inputfilesdir\" \"$tempDirPath\\\"  ";
                 $result =  \Illuminate\Support\Facades\Process::run( $cmd );
-                echo "\n $cmd \n";
-                echo "\n" . $result->output() . "\n";
             });
             return collect(Storage::listContents($tempDirName));
         }

companion/app/Services/ResourceFileService.php

@@ -5,6 +5,8 @@
   class ResourceFileService
   {
     public static function LoadResourceFile($fn) {
+
+
         $fullfn = docto_path('\\src\\res\\' . $fn);
         return file_get_contents($fullfn);
 
@@ -18,6 +20,7 @@ public static  function LoadResourceFiles(){
             if (strlen($fn) > 2 ){ // ignore . ..
                     //echo $fileinfo['filename'] . ':' . strlen($fileinfo['filename']);
                 if (strpos( $fn , '__history') !== false){continue;}
+                if (strpos( $fn , '__recovery') !== false){continue;}
                 $info = pathinfo($fn);
 
                 $AllContent[$info['filename']] = ['filename'=> $fn, 'contents' => static::LoadResourceFile($fn)];

companion/config/filesystems.php

@@ -42,6 +42,12 @@
             'throw' => false,
         ],
 
+        'inputfiles' => [
+            'driver' => 'local',
+            'root' => resource_path('inputfiles'),
+            'throw' => false,
+        ],
+
 
         'public' => [
             'driver' => 'local',

companion/config/services.php

@@ -15,7 +15,8 @@
     */
 
     'docto' => [
-      'path' => env('DOCTO_PATH','..\\exe\\32\\docto.exe'),
+     // 'path' => env('DOCTO_PATH','..\\exe\\32\\docto.exe'),
+      'path' => env('DOCTO_PATH','..\\exe\\64\\docto.exe'),
     ],
 
     'mailgun' => [

companion/resources/generator_templates/AllParameters.md

@@ -213,6 +213,27 @@ If you wish for the converted PDF to be opened after creation. No value req.
 
 Only convert certain pages in the document.
 
+### Convert all or Specific Individual Sheets
+_Excel_
+
+By default when doing a conversion with XL, the first sheet is the only sheet that gets
+output.  Often this is what you want, however if you wish to have a specific sheet output 
+you can specify that or you can output all sheets and they will be given individual names.
+
+> --allsheets
+
+Output all sheets. Seperate files will be created for each sheet and named appropriatly.
+eg. If you have a workbook.xls with Sheet1 and MySheet and you convert to pdf.  You will get
+2 files named workbook_(Sheet1).pdf and workbook_(MySheet).pdf 
+
+> --sheets "1,2"
+
+You can specify to only convert certain sheets, eg 1 and 2 or "Sheet1,MySheet"
+
+````cmd
+Note: --sheets does not work with -t xlCSV .  You must use --allsheets and output all.
+````
+
 ### Document Properties
 > --no-IncludeDocProperties  --no-DocProp [no value required]
 

companion/tests/Feature/DocX/CompatibilityPestTest.php

@@ -0,0 +1,141 @@
+<?php
+
+    it ('can read docx files',function (){
+
+        $inputfiledir = 'inputfilesxls'. uniqid();
+        $outputfiledir = 'outputfilesxls' . uniqid();
+        // setup
+        $testinputfilesdir_temp = Storage::path($inputfiledir);
+        $testoutputdir_temp = Storage::path($outputfiledir);
+
+        Storage::createDirectory($outputfiledir);
+
+        $dirfiles = \App\Services\FileGatherService::GatherFiles(collect(['docx']), $inputfiledir);
+
+        $doctocmd = \App\Services\DocToCommandBuilder::docto()
+            ->add('-WD')
+            ->add('-f', $testinputfilesdir_temp  )
+            ->add('-o', $testoutputdir_temp )
+            ->add('-t', 'wdformatPDF')
+            ->build();
+
+        $output = \Illuminate\Support\Facades\Process::run($doctocmd);
+       // print_r($output->output());
+        $outputDirFiles = collect(\Illuminate\Support\Facades\Storage::allFiles($outputfiledir));
+
+    expect($outputDirFiles->count())->toBeGreaterThan(0);
+    expect($outputDirFiles->count())->tobe(1);
+    });
+
+
+
+    it ('can convert doc to docx with compatibility',function (){
+
+        $inputfiledir = 'inputfiles_docx'. uniqid();
+        $outputfiledir = 'outputfiles_docx' . uniqid();
+        // setup
+        $testinputfilesdir_temp = Storage::path($inputfiledir);
+        $testoutputdir_temp = Storage::path($outputfiledir);
+
+        Storage::createDirectory($outputfiledir);
+
+        $dirfiles = \App\Services\FileGatherService::GatherFiles('plain', $inputfiledir);
+
+        $doctocmd = \App\Services\DocToCommandBuilder::docto()
+            ->add('-WD')
+            ->add('-f', $testinputfilesdir_temp  )
+            ->add('-o', $testoutputdir_temp )
+            ->add('-ox', '.docx')
+            ->add('-t', 'wdFormatDocumentDefault')
+            ->add('--COMPATIBILITY', '65535')
+            ->add('-L',10)
+            ->build();
+
+        $output = \Illuminate\Support\Facades\Process::run($doctocmd);
+       // print_r($output->output());
+        $outputDirFiles = collect(\Illuminate\Support\Facades\Storage::allFiles($outputfiledir));
+
+    expect($outputDirFiles->count())->toBeGreaterThan(0);
+    expect($outputDirFiles->count())->tobe(5);
+
+    // ensure -ox parameter is used.
+    $file1 = $outputDirFiles->first();
+    expect(str($file1)->endsWith('.docx'))->toBeTrue();
+
+
+    });
+
+    it ('can convert doc to docx with -c compatibility',function (){
+
+        $inputfiledir = 'inputfiles_docx'. uniqid();
+        $outputfiledir = 'outputfiles_docx' . uniqid();
+        // setup
+        $testinputfilesdir_temp = Storage::path($inputfiledir);
+        $testoutputdir_temp = Storage::path($outputfiledir);
+
+        Storage::createDirectory($outputfiledir);
+
+        $dirfiles = \App\Services\FileGatherService::GatherFiles('plain', $inputfiledir);
+
+        $doctocmd = \App\Services\DocToCommandBuilder::docto()
+            ->add('-WD')
+            ->add('-f', $testinputfilesdir_temp  )
+            ->add('-o', $testoutputdir_temp )
+            ->add('-ox', '.docx')
+            ->add('-t', 'wdFormatDocumentDefault')
+            ->add('-c', '65535')
+            ->add('-L',10)
+            ->build();
+
+        $output = \Illuminate\Support\Facades\Process::run($doctocmd);
+       // print_r($output->output());
+        $outputDirFiles = collect(\Illuminate\Support\Facades\Storage::allFiles($outputfiledir));
+
+    expect($outputDirFiles->count())->toBeGreaterThan(0);
+    expect($outputDirFiles->count())->tobe(5);
+
+    // ensure -ox parameter is used.
+    $file1 = $outputDirFiles->first();
+    expect(str($file1)->endsWith('.docx'))->toBeTrue();
+
+
+    });
+
+
+    it ('can convert doc to alternative compatibility',function ($marker,$compatibility) {
+
+        $inputfiledir = 'inputfiles_docx'. uniqid();
+        $outputfiledir = 'outputfiles_docx' . uniqid();
+        // setup
+        $testinputfilesdir_temp = Storage::path($inputfiledir);
+        $testoutputdir_temp = Storage::path($outputfiledir);
+
+        Storage::createDirectory($outputfiledir);
+
+        $dirfiles = \App\Services\FileGatherService::GatherFiles('plain', $inputfiledir);
+
+        $doctocmd = \App\Services\DocToCommandBuilder::docto()
+            ->add('-WD')
+            ->add('-f', $testinputfilesdir_temp  )
+            ->add('-o', $testoutputdir_temp )
+            ->add('-t', 'wdFormatDocumentDefault')
+            ->add('--COMPATIBILITY', $compatibility)
+            ->add('-L',10)
+            ->build();
+
+        $output = \Illuminate\Support\Facades\Process::run($doctocmd);
+       // print_r($output->output());
+        $outputDirFiles = collect(\Illuminate\Support\Facades\Storage::allFiles($outputfiledir));
+
+    expect($outputDirFiles->count())->toBeGreaterThan(0);
+    expect($outputDirFiles->count())->tobe(5);
+
+
+    })->with(
+        [
+        ['wdCurrent',  65535],
+        ['wdWord2003',  11],
+        ['wdWord2007',  12],
+        ['wdWord2010',  14],
+        ['wdWord2013',  15],
+    ]);

companion/tests/Feature/Remove/RemoveInputFilePestTest.php

@@ -29,14 +29,78 @@
         $dirfilescount = $dirfiles->count();
         // do conversion
         $docto = config('services.docto.path');
-       $doctocmd = "$docto -WD -f $testinputfilesdir_temp -fx .doc -o $testoutputdir_temp -t wdFormatPDF -R true";
+      // $doctocmd = "$docto -WD -f $testinputfilesdir_temp -fx .doc -o $testoutputdir_temp -t wdFormatPDF -R true";
+       $doctocmd = \App\Services\DocToCommandBuilder::docto()
+           ->add('-WD')
+           ->add('-f',$testinputfilesdir_temp)
+           ->add('-fx','.doc')
+           ->add('-o',$testoutputdir_temp)
+           ->add('-t wdFormatPDF')
+           ->add('-R','true') // the important one fo rthis test
+           ->build();
       // echo $doctocmd;
        $output = \Illuminate\Support\Facades\Process::run($doctocmd);
-
+// print_r($output);
 
     // check files have been converted and originoals have been created.
-       expect(collect(\Illuminate\Support\Facades\Storage::listContents('inputfilestemp'))->count())->tobe($dirfilescount - $docfilecount);
-       expect(collect(\Illuminate\Support\Facades\Storage::listContents('outputtemp2'))->count())->tobe( $docfilecount);
+       expect(collect(\Illuminate\Support\Facades\Storage::AllFiles('inputfilestemp'))->count())->tobe($dirfilescount - $docfilecount);
+       expect(collect(\Illuminate\Support\Facades\Storage::AllFiles('outputtemp2'))->count())->tobe( $docfilecount);
+
+
+    });
+
+
+
+it('doesnt delete files from directory', function (){
+        // setup
+      // $testinputfilesdir = \Illuminate\Support\Facades\Storage::path('inputfiles\\plain');
+       $testinputfilesdir_temp = \Illuminate\Support\Facades\Storage::path('inputfilestemp');
+
+
+       $testinputfilesdir_temp = \Illuminate\Support\Facades\Storage::path('inputfilestemp');
+
+       $testoutputdir_temp = \Illuminate\Support\Facades\Storage::path('outputtemp2');
+
+       \Illuminate\Support\Facades\Storage::createDirectory('outputtemp2');
+
+     //  $cmd = "xcopy \"$testinputfilesdir\" \"$testinputfilesdir_temp\\\"  ";
+      // echo "\n". $cmd;
+    //   $result =  \Illuminate\Support\Facades\Process::run( $cmd );
+
+            //echo "\n" . $result->output() . "\n";
+         //  $dirfiles = collect(\Illuminate\Support\Facades\Storage::listContents('inputfilestemp'));
+    $dirfiles = \App\Services\FileGatherService::GatherFiles(collect(['plain']),'inputfilestemp');
+          $docfiles = $dirfiles->filter(function ($item){
+            return str($item->path())->endsWith('.doc');
+        });
 
+         expect($docfiles->count())->toBeGreaterThan(0);
+            $docfilecount = count($docfiles->toArray());
+
+        $dirfilescount = $dirfiles->count();
+        // do conversion
+        $docto = config('services.docto.path');
+      // $doctocmd = "$docto -WD -f $testinputfilesdir_temp -fx .doc -o $testoutputdir_temp -t wdFormatPDF -R true";
+       $doctocmd = \App\Services\DocToCommandBuilder::docto()
+           ->add('-WD')
+           ->add('-f',$testinputfilesdir_temp)
+           ->add('-fx','.doc')
+           ->add('-o',$testoutputdir_temp)
+           ->add('-t wdFormatPDF')
+         //  ->add('-R','true') // the important one fo rthis test
+           ->build();
+      // echo $doctocmd;
+       $output = \Illuminate\Support\Facades\Process::run($doctocmd);
+
+        expect(collect(\Illuminate\Support\Facades\Storage::AllFiles('inputfilestemp'))->count())->toBeGreaterThan(0);
+    // check files have been converted and originoals have been created.
+       expect(collect(\Illuminate\Support\Facades\Storage::AllFiles('inputfilestemp'))->count())->tobe( $docfilecount);
+        $outputDirFiles = collect(\Illuminate\Support\Facades\Storage::AllFiles('outputtemp2'));
+       expect($outputDirFiles->count())->toBeGreaterThan( 0);
+       expect($outputDirFiles->count())->tobe( $docfilecount);
 
+       // This will delete all files in the storage/tests directory.
+      // this happens once a test run to prevent files from building up.
+      // could be done a bit more organised if desired.
+        \Illuminate\Support\Facades\Storage::deleteDirectory('\\');
     });