Add support of infilter

mnvx · Jul 27, 2022 · 0d97312 · 0d97312
1 parent 0891d4d
commit 0d97312
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 3 deletions.
diff --git a/src/Converter.php b/src/Converter.php
@@ -113,10 +113,11 @@ public function convert(LowrapperParameters $parameters)
 
         $options = array_merge($this->defaultOptions, [
             $documentType ? '--' . $documentType : '',
+            $parameters->getInputFilter() ? sprintf('--infilter=%s', $parameters->getInputFilter()) : null,
             '--convert-to "' . $parameters->getOutputFormat() . $outputFilters . '"',
             '"' . $inputFile . '"',
         ]);
-        $command = $this->binaryPath . ' ' . implode(' ', $options);
+        $command = $this->binaryPath . ' ' . implode(' ', array_filter($options));
 
         $process = $this->createProcess($command);
 

diff --git a/src/LowrapperParameters.php b/src/LowrapperParameters.php
@@ -55,6 +55,14 @@ class LowrapperParameters
      */
     protected $outputFilters = [];
 
+    /**
+     * Input filters, eg.
+     * - Text (encoded)
+     * - UTF8
+     * @var ?string
+     */
+    protected $inputFilter = null;
+
     public function __construct(
         /*string*/ $outputFormat = null,
         /*string*/ $outputFile = null,
@@ -163,6 +171,24 @@ public function getOutputFilters()//: array
         return $this->outputFilters;
     }
 
+    /**
+     * @param string $outputFilter
+     * @return LowrapperParameters
+     */
+    public function setInputFilter(/*string*/ $inputFilter)
+    {
+        $this->inputFilter = $inputFilter;
+        return $this;
+    }
+
+    /**
+     * @return ?string
+     */
+    public function getInputFilter()//: ?string
+    {
+        return $this->inputFilter;
+    }
+
     /**
      * @return mixed
      */
@@ -183,4 +209,4 @@ public function setInputData($inputData)
 
 
 
-}
+}
diff --git a/tests/ConverterTest.php b/tests/ConverterTest.php
@@ -96,6 +96,15 @@ public function converterProvider()
                 $command .'--web --convert-to "text:some filter" "some_temp_file"',
                 null,
             ],
+            'Input filter' => [
+                (new LowrapperParameters())
+                    ->setInputFile('test.html')
+                    ->setOutputFormat(Format::TEXT_TEXT)
+                    ->setOutputFile('test.text')
+                    ->setInputFilter('some'),
+                $command .'--web --infilter=some --convert-to "text:Text (encoded):UTF8" "some_temp_file"',
+                null,
+            ],
             'Default text filter' => [
                 (new LowrapperParameters())
                     ->setInputFile('test.html')
@@ -124,4 +133,4 @@ public function converterProvider()
         ];
     }
 
-}
+}