Merge pull request #54 from onigoetz/main

Various bugfixes due to humans being humans

Author: ewilan-riviere

src/Archive.php

@@ -43,7 +43,31 @@ public static function read(string $path, ?string $password = null): BaseArchive
             ArchiveEnum::pdf => ArchivePdf::class,
         };
 
-        return $archive::read($self->path, $self->password);
+        try {
+            return $archive::read($self->path, $self->password);
+        } catch (\Throwable $originalException) {
+            if ($self->type === ArchiveEnum::zip && $extension === 'cbz') {
+                try {
+                    // Sometimes files with cbz extension are actually misnamed rar files
+                    return ArchiveRar::read($self->path, $self->password);
+                } catch (\Throwable) {
+                    // If it's not a rar file, throw the original exception
+                    throw $originalException;
+                }
+            }
+
+            if ($self->type === ArchiveEnum::rar && $extension === 'cbr') {
+                try {
+                    // Sometimes files with cbr extension are actually misnamed zip files
+                    return ArchiveZip::read($self->path, $self->password);
+                } catch (\Throwable) {
+                    // If it's not a zip file, throw the original exception
+                    throw $originalException;
+                }
+            }
+
+            throw $originalException;
+        }
     }
 
     /**

src/Processes/SevenZipProcess.php

@@ -66,6 +66,28 @@ public static function test(bool $exception = true): bool
         return true;
     }
 
+    /**
+     * Escapes a string to be used as a shell argument.
+     */
+    private function escapeArgument(?string $argument): string
+    {
+        if ('' === $argument || null === $argument) {
+            return '""';
+        }
+        if ('\\' !== \DIRECTORY_SEPARATOR) {
+            return "'".str_replace("'", "'\\''", $argument)."'";
+        }
+        if (str_contains($argument, "\0")) {
+            $argument = str_replace("\0", '?', $argument);
+        }
+        if (!preg_match('/[()%!^"<>&|\s]/', $argument)) {
+            return $argument;
+        }
+        $argument = preg_replace('/(\\\\+)$/', '$1$1', $argument);
+
+        return '"'.str_replace(['"', '^', '%', '!', "\n"], ['""', '"^^"', '"^%"', '"^!"', '!LF!'], $argument).'"';
+    }
+
     /**
      * @param  string[]  $args
      * @return string[]
@@ -82,7 +104,7 @@ public function execute(string $command, array $args): array
             $command = $this->binaryPath;
         }
 
-        $command = "{$command} ".implode(' ', $args);
+        $command = "{$command} ".implode(' ', array_map($this->escapeArgument(...), $args));
 
         try {
             exec($command, $output, $res);

src/Readers/ArchivePdf.php

@@ -84,8 +84,7 @@ public function getContents(?ArchiveItem $file, bool $toBase64 = false): ?string
             $imagick->clear();
             $imagick->destroy();
         } catch (\Throwable $th) {
-            // throw new \Exception("Error, {$file->getFilename()} is not an image");
-            error_log("Error, {$file->getFilename()} is not an image");
+            error_log("Error, {$file->getFilename()} Failed to extract page: {$th->getMessage()}");
         }
 
         if (! $content) {