Merge branch 'devs' into 0.13.x

Author: dimtrovich

src/Facades/Storage.php

@@ -11,6 +11,7 @@
 
 namespace BlitzPHP\Facades;
 
+use BlitzPHP\Contracts\Filesystem\FilesystemInterface;
 use BlitzPHP\Filesystem\FilesystemManager;
 use Closure;
 use DateTimeInterface;
@@ -22,25 +23,25 @@
  * @method static array                                              allDirectories(string|null $directory = null)
  * @method static array                                              allFiles(string|null $directory = null)
  * @method static bool                                               append(string $path, string $data)
- * @method static \BlitzPHP\Filesystem\FilesystemInterface           build(array|string $config)
+ * @method static FilesystemInterface                                build(array|string $config)
  * @method static void                                               buildTemporaryUrlsUsing(Closure $callback)
  * @method static string|false                                       checksum(string $path, array $options = [])
- * @method static \BlitzPHP\Filesystem\FilesystemInterface           cloud()
+ * @method static FilesystemInterface                                cloud()
  * @method static bool                                               copy(string $from, string $to)
  * @method static void                                               createDirectory(string $location, array $config = [])
- * @method static \BlitzPHP\Filesystem\FilesystemInterface           createFtpDriver(array $config)
- * @method static \BlitzPHP\Filesystem\FilesystemInterface           createLocalDriver(array $config)
- * @method static \BlitzPHP\Filesystem\FilesystemInterface           createS3Driver(array $config)
- * @method static \BlitzPHP\Filesystem\FilesystemInterface           createScopedDriver(array $config)
- * @method static \BlitzPHP\Filesystem\FilesystemInterface           createSftpDriver(array $config)
+ * @method static FilesystemInterface                                createFtpDriver(array $config)
+ * @method static FilesystemInterface                                createLocalDriver(array $config)
+ * @method static FilesystemInterface                                createS3Driver(array $config)
+ * @method static FilesystemInterface                                createScopedDriver(array $config)
+ * @method static FilesystemInterface                                createSftpDriver(array $config)
  * @method static bool                                               delete(array|string $paths)
  * @method static bool                                               deleteDirectory(string $directory)
  * @method static array                                              directories(string|null $directory = null, bool $recursive = false)
  * @method static bool                                               directoryExists(string $path)
  * @method static bool                                               directoryMissing(string $path)
- * @method static \BlitzPHP\Filesystem\FilesystemInterface           disk(string|null $name = null)
+ * @method static FilesystemInterface                                disk(string|null $name = null)
  * @method static \Symfony\Component\HttpFoundation\StreamedResponse download(string $path, string|null $name = null, array $headers = [])
- * @method static \BlitzPHP\Filesystem\FilesystemInterface           drive(string|null $name = null)
+ * @method static FilesystemInterface                                drive(string|null $name = null)
  * @method static bool                                               exists(string $path)
  * @method static FilesystemManager                                  extend(string $driver, Closure $callback)
  * @method static bool                                               fileExists(string $path)
@@ -67,7 +68,7 @@
  * @method static bool                                               missing(string $path)
  * @method static void                                               mixin(object $mixin, bool $replace = true)
  * @method static bool                                               move(string $from, string $to)
- * @method static \BlitzPHP\Filesystem\FilesystemAdapter|mixed       when((Closure | mixed | null) $value = null, (callable | null) $callback = null, (callable | null) $default = null)
+ * @method static FilesystemAdapter|mixed                            when((Closure | mixed | null) $value = null, (callable | null) $callback = null, (callable | null) $default = null)
  * @method static string                                             path(string $path)
  * @method static bool                                               prepend(string $path, string $data)
  * @method static bool                                               providesTemporaryUrls()
@@ -88,7 +89,7 @@
  * @method static void                                               write(string $location, string $contents, array $config = [])
  * @method static bool                                               writeStream(string $path, resource $resource, array $options = [])
  *
- * @see FilesystemManager
+ * @see \BlitzPHP\Filesystem\FilesystemManager
  */
 final class Storage extends Facade
 {

src/Middlewares/FileViewer.php

@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * This file is part of Blitz PHP framework.
+ *
+ * (c) 2022 Dimitri Sitchet Tomkeu <devcode.dst@gmail.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace BlitzPHP\Middlewares;
+
+use BlitzPHP\Filesystem\Adapters\FilesystemAdapter;
+use BlitzPHP\Filesystem\Exceptions\FileNotFoundException;
+use BlitzPHP\Filesystem\FilesystemManager;
+use BlitzPHP\Http\Request;
+use BlitzPHP\Http\Response;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+
+class FileViewer implements MiddlewareInterface
+{
+    /**
+     * Chemin d'accès du fichier qu'on souhaite affiché
+     */
+    private string $path = '';
+
+    private ?FilesystemAdapter $disk = null;
+
+    public function __construct(private FilesystemManager $filesystem, private Response $response)
+    {
+    }
+
+    /**
+     * @param Request $request
+     */
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+        $config = config('filesystems');
+
+        if ([] === $config['viewable'] ?? []) {
+            return $handler->handle($request);
+        }
+
+        $path                  = trim(urldecode($request->getPath()), '/');
+        [$prefix, $this->path] = explode('/', $path, 2);
+
+        foreach ($config['disks'] as $name => $disk) {
+            if (str_ends_with(trim($disk['url'], '/'), trim($prefix, '/'))) {
+                $this->disk = $this->filesystem->disk($name);
+                break;
+            }
+        }
+
+        if (null === $this->disk) {
+            return $handler->handle($request);
+        }
+
+        if (! $this->disk->exists($this->path)) {
+            throw FileNotFoundException::fileNotFound($this->path);
+        }
+
+        $path = $this->disk->path($this->path);
+
+        if ($request->boolean('download')) {
+            return $this->response->download($path);
+        }
+
+        return $this->response->file($path);
+    }
+}