more embed file handling

Author: aguingand

resources/views/components/embeds/ozu-content-file.blade.php

@@ -6,6 +6,6 @@
 
 <p>
     <a href="{{ $media->downloadUrl() }}" download="{{ $name }}" target="_blank">
-        {{ $legend ?? $name }}
+        {{ $legend ?: $name }}
     </a>
 </p>

src/Support/Database/OzuSeeder.php

@@ -20,19 +20,35 @@ protected function clearMediaDirectory(): void
 
     protected function makeImageEmbed(?Media $media = null, ?string $legend = null): string
     {
-        $media ??= Media::factory()->image('embed')->withFile()->make();
+        $media ??= Media::factory()->image()->withFile()->make();
 
         return sprintf(
             '<x-ozu-content-image file="%s" legend="%s"></x-ozu-content-image>',
             e(json_encode([
                 'file_name' => $media->file_name,
                 'disk' => $media->disk,
+                'mime_type' => $media->mime_type,
                 'filters' => $media->filters,
             ])),
             $legend ?: ''
         );
     }
 
+    protected function makeFileEmbed(?Media $media = null, ?string $legend = null): string
+    {
+        $media ??= Media::factory()->image()->withFile()->make();
+
+        return sprintf(
+            '<x-ozu-content-file file="%s" legend="%s"></x-ozu-content-file>',
+            e(json_encode([
+                'file_name' => $media->file_name,
+                'disk' => $media->disk,
+                'mime_type' => $media->mime_type,
+            ])),
+            $legend ?: ''
+        );
+    }
+
     public function makeVideoEmbed(?string $videoUrl = null, ?string $legend = null): string
     {
         $videoUrl = $videoUrl ?: collect(

src/View/Components/Embeds/File.php

@@ -26,10 +26,7 @@ public function __construct(
         public ?string $legend = null
     ) {
         if ($this->file = json_decode(htmlspecialchars_decode($file), true)) {
-            $this->media = Media::make([
-                'file_name' => $this->file['file_name'],
-                'disk' => $this->file['disk'] ?? null,
-            ]);
+            $this->media = Media::make($this->file);
             $this->disk = Storage::disk($this->media->disk);
             $this->exists = $this->disk->exists($this->media->file_name);
             $this->name ??= basename($this->media->file_name);

src/View/Components/Embeds/Image.php

@@ -28,11 +28,7 @@ public function __construct(
         public ?int $thumbnailHeight = null,
     ) {
         if ($this->file = json_decode(htmlspecialchars_decode($file), true)) {
-            $this->media = Media::make([
-                'file_name' => $this->file['file_name'],
-                'disk' => $this->file['disk'] ?? null,
-                'filters' => $this->file['filters'] ?? null,
-            ]);
+            $this->media = Media::make($this->file);
             $this->disk = Storage::disk($this->media->disk);
             $this->exists = $this->disk->exists($this->media->file_name);
             $this->name = $this->file['name'] ?? basename($this->media->file_name);