Skip to content

Commit 820e038

Browse files
committed
run conversion even if file is null
1 parent 5cb6605 commit 820e038

File tree

6 files changed

+22
-19
lines changed

6 files changed

+22
-19
lines changed

src/Definitions/MediaConversionAudio.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,13 @@ public function shouldExecute(Media $media, ?MediaConversion $parent): bool
5454
public function handle(
5555
Media $media,
5656
?MediaConversion $parent,
57-
string $file,
57+
?string $file,
5858
Filesystem $filesystem,
5959
SpatieTemporaryDirectory $temporaryDirectory
6060
): ?MediaConversion {
61+
if (! $file) {
62+
return null;
63+
}
6164

6265
$fileName = $this->fileName ?? "{$media->name}.mp3";
6366

src/Definitions/MediaConversionDefinition.php

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class MediaConversionDefinition
1717
/**
1818
* @param bool $immediate Determine if the conversion should be dispatched immediatly after `addMedia`
1919
* @param MediaConversionDefinition[] $conversions
20-
* @param Closure(Media $media, ?MediaConversion $parent, string $file, Filesystem $filesystem, SpatieTemporaryDirectory $temporaryDirectory): ?MediaConversion $handle
20+
* @param Closure(Media $media, ?MediaConversion $parent, ?string $file, Filesystem $filesystem, SpatieTemporaryDirectory $temporaryDirectory): ?MediaConversion $handle
2121
* @param null|bool|Closure(Media $media, ?MediaConversion $parent): bool $when
2222
*/
2323
public function __construct(
@@ -37,7 +37,7 @@ public function __construct(
3737
public function handle(
3838
Media $media,
3939
?MediaConversion $parent,
40-
string $file,
40+
?string $file,
4141
Filesystem $filesystem,
4242
SpatieTemporaryDirectory $temporaryDirectory
4343
): ?MediaConversion {
@@ -80,18 +80,10 @@ public function execute(Media $media, ?MediaConversion $parent): ?MediaConversio
8080

8181
$source = $parent ?? $media;
8282

83-
if (! $source->path) {
84-
return null;
85-
}
86-
87-
$copy = $source->copyFileTo(
83+
$copy = $source->path ? $source->copyFileTo(
8884
disk: $storage,
8985
path: $source->path
90-
);
91-
92-
if (! $copy) {
93-
return null;
94-
}
86+
) : null;
9587

9688
return $this->handle($media, $parent, $copy, $storage, $temporaryDirectory);
9789

src/Definitions/MediaConversionImage.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,13 @@ public function shouldExecute(Media $media, ?MediaConversion $parent): bool
5555
public function handle(
5656
Media $media,
5757
?MediaConversion $parent,
58-
string $file,
58+
?string $file,
5959
Filesystem $filesystem,
6060
SpatieTemporaryDirectory $temporaryDirectory
6161
): ?MediaConversion {
62+
if (! $file) {
63+
return null;
64+
}
6265

6366
$fileName = $this->fileName ?? "{$media->name}.jpg";
6467

src/Definitions/MediaConversionPoster.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,13 @@ public function shouldExecute(Media $media, ?MediaConversion $parent): bool
5757
public function handle(
5858
Media $media,
5959
?MediaConversion $parent,
60-
string $file,
60+
?string $file,
6161
Filesystem $filesystem,
6262
SpatieTemporaryDirectory $temporaryDirectory
6363
): ?MediaConversion {
64+
if (! $file) {
65+
return null;
66+
}
6467

6568
$fileName = $this->fileName ?? "{$media->name}.jpg";
6669

src/Definitions/MediaConversionVideo.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,15 @@ public function shouldExecute(Media $media, ?MediaConversion $parent): bool
5858
public function handle(
5959
Media $media,
6060
?MediaConversion $parent,
61-
string $file,
61+
?string $file,
6262
Filesystem $filesystem,
6363
SpatieTemporaryDirectory $temporaryDirectory
6464
): ?MediaConversion {
6565

66+
if (! $file) {
67+
return null;
68+
}
69+
6670
$fileName = $this->fileName ?? "{$media->name}.mp4";
6771

6872
$source = $parent ?? $media;

src/Models/MediaConversion.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
use Illuminate\Support\Str;
2424

2525
/**
26-
* @template TMedia of Media
27-
*
2826
* @property int $id
2927
* @property string $uuid
3028
* @property string $conversion_name
@@ -85,7 +83,7 @@ public static function booted()
8583
}
8684

8785
/**
88-
* @return BelongsTo<TMedia, MediaConversion>
86+
* @return BelongsTo<Media, MediaConversion>
8987
*/
9088
public function media(): BelongsTo
9189
{

0 commit comments

Comments
 (0)