@@ -2,25 +2,25 @@ |
||
2 | 2 | |
3 | 3 | namespace Spatie\MediaLibrary\FileAdder; |
4 | 4 | |
5 | -use Spatie\MediaLibrary\Helpers\File; |
|
6 | -use Spatie\MediaLibrary\Models\Media; |
|
7 | 5 | use Illuminate\Database\Eloquent\Model; |
8 | 6 | use Illuminate\Support\Facades\Storage; |
9 | 7 | use Illuminate\Support\Traits\Macroable; |
10 | -use Spatie\MediaLibrary\HasMedia\HasMedia; |
|
11 | -use Spatie\MediaLibrary\Helpers\RemoteFile; |
|
8 | +use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\DiskDoesNotExist; |
|
9 | +use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\FileDoesNotExist; |
|
10 | +use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\FileIsTooBig; |
|
11 | +use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\FileUnacceptableForCollection; |
|
12 | +use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\UnknownType; |
|
12 | 13 | use Spatie\MediaLibrary\File as PendingFile; |
13 | 14 | use Spatie\MediaLibrary\Filesystem\Filesystem; |
15 | +use Spatie\MediaLibrary\HasMedia\HasMedia; |
|
16 | +use Spatie\MediaLibrary\Helpers\File; |
|
17 | +use Spatie\MediaLibrary\Helpers\RemoteFile; |
|
18 | +use Spatie\MediaLibrary\ImageGenerators\FileTypes\Image as ImageGenerator; |
|
14 | 19 | use Spatie\MediaLibrary\Jobs\GenerateResponsiveImages; |
15 | -use Symfony\Component\HttpFoundation\File\UploadedFile; |
|
16 | 20 | use Spatie\MediaLibrary\MediaCollection\MediaCollection; |
21 | +use Spatie\MediaLibrary\Models\Media; |
|
17 | 22 | use Symfony\Component\HttpFoundation\File\File as SymfonyFile; |
18 | -use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\UnknownType; |
|
19 | -use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\FileIsTooBig; |
|
20 | -use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\DiskDoesNotExist; |
|
21 | -use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\FileDoesNotExist; |
|
22 | -use Spatie\MediaLibrary\ImageGenerators\FileTypes\Image as ImageGenerator; |
|
23 | -use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\FileUnacceptableForCollection; |
|
23 | +use Symfony\Component\HttpFoundation\File\UploadedFile; |
|
24 | 24 | |
25 | 25 | class FileAdder |
26 | 26 | { |
@@ -21,6 +21,8 @@ |
||
21 | 21 | /** |
22 | 22 | * Constructor method. |
23 | 23 | * |
24 | + * @param string $key |
|
25 | + * @param string $disk |
|
24 | 26 | * @return void |
25 | 27 | */ |
26 | 28 | public function __construct($key, $disk) |
@@ -2,15 +2,15 @@ |
||
2 | 2 | |
3 | 3 | namespace Spatie\MediaLibrary\Filesystem; |
4 | 4 | |
5 | -use Illuminate\Support\Str; |
|
6 | -use Spatie\MediaLibrary\Helpers\File; |
|
7 | -use Spatie\MediaLibrary\Models\Media; |
|
5 | +use Illuminate\Contracts\Filesystem\Factory; |
|
8 | 6 | use Illuminate\Support\Facades\Storage; |
7 | +use Illuminate\Support\Str; |
|
8 | +use Spatie\MediaLibrary\Conversion\ConversionCollection; |
|
9 | +use Spatie\MediaLibrary\Events\MediaHasBeenAdded; |
|
9 | 10 | use Spatie\MediaLibrary\FileManipulator; |
11 | +use Spatie\MediaLibrary\Helpers\File; |
|
10 | 12 | use Spatie\MediaLibrary\Helpers\RemoteFile; |
11 | -use Illuminate\Contracts\Filesystem\Factory; |
|
12 | -use Spatie\MediaLibrary\Events\MediaHasBeenAdded; |
|
13 | -use Spatie\MediaLibrary\Conversion\ConversionCollection; |
|
13 | +use Spatie\MediaLibrary\Models\Media; |
|
14 | 14 | use Spatie\MediaLibrary\PathGenerator\PathGeneratorFactory; |
15 | 15 | |
16 | 16 | class Filesystem |
@@ -71,6 +71,9 @@ |
||
71 | 71 | } |
72 | 72 | } |
73 | 73 | |
74 | + /** |
|
75 | + * @param string $type |
|
76 | + */ |
|
74 | 77 | public function copyToMediaLibrary(string $pathToFile, Media $media, ?string $type = null, ?string $targetFileName = null) |
75 | 78 | { |
76 | 79 | $destinationFileName = $targetFileName ?: pathinfo($pathToFile, PATHINFO_BASENAME); |