Pass on encoding:auto to WPC for api=2. Closes #168

rosell-dk · Jun 15, 2019 · 50f59ca · 50f59ca
1 parent 8298cf1
commit 50f59ca
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 33 deletions.
diff --git a/src-build/webp-convert.inc b/src-build/webp-convert.inc
@@ -458,9 +458,11 @@ abstract class AbstractConverter
             $this->logLn('Trace:');
             foreach ($e->getTrace() as $trace) {
                 //$this->logLn(print_r($trace, true));
-                $this->logLn(
-                    $trace['file'] . ':' . $trace['line']
-                );
+                if (isset($trace['file']) && isset($trace['line'])) {
+                    $this->logLn(
+                        $trace['file'] . ':' . $trace['line']
+                    );                    
+                }
             }
             throw $e;
         } /*catch (\Error $e) {
@@ -4832,6 +4834,18 @@ class Wpc extends AbstractConverter
         return [];
     }
 
+    public function supportsLossless()
+    {
+        return ($this->options['api-version'] >= 2);
+    }
+
+    public function passOnEncodingAuto()
+    {
+        // We could make this configurable. But I guess passing it on is always to be preferred
+        // for api >= 2.
+        return ($this->options['api-version'] >= 2);
+    }
+
     protected function createOptions()
     {
         parent::createOptions();
@@ -4841,18 +4855,11 @@ class Wpc extends AbstractConverter
             new SensitiveStringOption('secret', ''),    /* for communicating with wpc api v.0 */
             new SensitiveStringOption('api-url', ''),
             new SensitiveStringOption('url', ''),       /* DO NOT USE. Only here to keep the protection */
-            new IntegerOption('api-version', 1, 0, 2),
+            new IntegerOption('api-version', 2, 0, 2),
             new BooleanOption('crypt-api-key-in-transfer', false)  /* new in api v.1 */
         );
     }
 
-    public function passOnEncodingAuto()
-    {
-        // We could make this configurable. But I guess passing it on is always to be preferred (except for
-        // api = 1, but people ought to update their wpc anyway)
-        return true;
-    }
-
     private static function createRandomSaltForBlowfish()
     {
         $salt = '';

diff --git a/src-build/webp-on-demand-2.inc b/src-build/webp-on-demand-2.inc
@@ -458,9 +458,11 @@ abstract class AbstractConverter
             $this->logLn('Trace:');
             foreach ($e->getTrace() as $trace) {
                 //$this->logLn(print_r($trace, true));
-                $this->logLn(
-                    $trace['file'] . ':' . $trace['line']
-                );
+                if (isset($trace['file']) && isset($trace['line'])) {
+                    $this->logLn(
+                        $trace['file'] . ':' . $trace['line']
+                    );                    
+                }
             }
             throw $e;
         } /*catch (\Error $e) {
@@ -4754,6 +4756,18 @@ class Wpc extends AbstractConverter
         return [];
     }
 
+    public function supportsLossless()
+    {
+        return ($this->options['api-version'] >= 2);
+    }
+
+    public function passOnEncodingAuto()
+    {
+        // We could make this configurable. But I guess passing it on is always to be preferred
+        // for api >= 2.
+        return ($this->options['api-version'] >= 2);
+    }
+
     protected function createOptions()
     {
         parent::createOptions();
@@ -4763,18 +4777,11 @@ class Wpc extends AbstractConverter
             new SensitiveStringOption('secret', ''),    /* for communicating with wpc api v.0 */
             new SensitiveStringOption('api-url', ''),
             new SensitiveStringOption('url', ''),       /* DO NOT USE. Only here to keep the protection */
-            new IntegerOption('api-version', 1, 0, 2),
+            new IntegerOption('api-version', 2, 0, 2),
             new BooleanOption('crypt-api-key-in-transfer', false)  /* new in api v.1 */
         );
     }
 
-    public function passOnEncodingAuto()
-    {
-        // We could make this configurable. But I guess passing it on is always to be preferred (except for
-        // api = 1, but people ought to update their wpc anyway)
-        return true;
-    }
-
     private static function createRandomSaltForBlowfish()
     {
         $salt = '';

diff --git a/src/Convert/Converters/AbstractConverter.php b/src/Convert/Converters/AbstractConverter.php
@@ -321,9 +321,11 @@ public function doConvert()
             $this->logLn('Trace:');
             foreach ($e->getTrace() as $trace) {
                 //$this->logLn(print_r($trace, true));
-                $this->logLn(
-                    $trace['file'] . ':' . $trace['line']
-                );
+                if (isset($trace['file']) && isset($trace['line'])) {
+                    $this->logLn(
+                        $trace['file'] . ':' . $trace['line']
+                    );                    
+                }
             }
             throw $e;
         } /*catch (\Error $e) {

diff --git a/src/Convert/Converters/Wpc.php b/src/Convert/Converters/Wpc.php
@@ -32,6 +32,18 @@ protected function getUnsupportedDefaultOptions()
         return [];
     }
 
+    public function supportsLossless()
+    {
+        return ($this->options['api-version'] >= 2);
+    }
+
+    public function passOnEncodingAuto()
+    {
+        // We could make this configurable. But I guess passing it on is always to be preferred
+        // for api >= 2.
+        return ($this->options['api-version'] >= 2);
+    }
+
     protected function createOptions()
     {
         parent::createOptions();
@@ -41,18 +53,11 @@ protected function createOptions()
             new SensitiveStringOption('secret', ''),    /* for communicating with wpc api v.0 */
             new SensitiveStringOption('api-url', ''),
             new SensitiveStringOption('url', ''),       /* DO NOT USE. Only here to keep the protection */
-            new IntegerOption('api-version', 1, 0, 2),
+            new IntegerOption('api-version', 2, 0, 2),
             new BooleanOption('crypt-api-key-in-transfer', false)  /* new in api v.1 */
         );
     }
 
-    public function passOnEncodingAuto()
-    {
-        // We could make this configurable. But I guess passing it on is always to be preferred (except for
-        // api = 1, but people ought to update their wpc anyway)
-        return true;
-    }
-
     private static function createRandomSaltForBlowfish()
     {
         $salt = '';