Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Vapor upload issues #328

Merged
merged 3 commits into from
Jul 27, 2022
Merged

fix: Vapor upload issues #328

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
84e6d94
fix Vapor upload issues
sleimanx2 May 19, 2022
9c39208
select Vapor storage disk instead of creating driver
sleimanx2 Jul 26, 2022
0a13167
fix variable name typo
sleimanx2 Jul 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions src/Fields/Media.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ private function setOrder($ids)

private function addNewMedia(NovaRequest $request, $data, HasMedia $model, string $collection): Collection
{

return collect($data)
->filter(function ($value) {
// New files will come in as UploadedFile objects,
Expand All @@ -222,8 +223,15 @@ private function addNewMedia(NovaRequest $request, $data, HasMedia $model, strin
})->map(function ($file, int $index) use ($request, $model, $collection) {
if ($file instanceof UploadedFile) {
$media = $model->addMedia($file)->withCustomProperties($this->customProperties);

$fileName = $file->getClientOriginalName();
$fileExtension = $file->getClientOriginalExtension();

} else {
$media = $this->makeMediaFromVaporUpload($file, $model);

$fileName = $file['file_name'];
$fileExtension = pathinfo($file['file_name'], PATHINFO_EXTENSION);
}

if ($this->responsive) {
Expand All @@ -236,13 +244,13 @@ private function addNewMedia(NovaRequest $request, $data, HasMedia $model, strin

if (is_callable($this->setFileNameCallback)) {
$media->setFileName(
call_user_func($this->setFileNameCallback, $file->getClientOriginalName(), $file->getClientOriginalExtension(), $model)
call_user_func($this->setFileNameCallback, $fileName, $fileExtension, $model)
);
}

if (is_callable($this->setNameCallback)) {
$media->setName(
call_user_func($this->setNameCallback, $file->getClientOriginalName(), $model)
call_user_func($this->setNameCallback, $fileName, $model)
);
}

Expand All @@ -260,8 +268,8 @@ private function removeDeletedMedia($data, Collection $medias): Collection
$remainingIds = collect($data)->filter(function ($value) {
// New files will come in as UploadedFile objects,
// whereas Vapor-uploaded files will come in as arrays.
return ! $value instanceof UploadedFile
&& ! is_array($value);
return !$value instanceof UploadedFile
&& !is_array($value);
});

$medias->pluck('id')->diff($remainingIds)->each(function ($id) use ($medias) {
Expand Down Expand Up @@ -376,8 +384,12 @@ public function conversionOnView(string $conversionOnDetailView): self
*/
private function makeMediaFromVaporUpload(array $file, HasMedia $model): FileAdder
{
$diskName = config('media-library.disk_name');
$url = Storage::disk($diskName)->url($file['key']);
$disk = config('filesystems.default');

$disk = config('filesystems.disks.' . $disk . 'driver') === 's3' ? $disk : 's3';

$url = Storage::disk($disk)->temporaryUrl($file['key'], Carbon::now()->addHour());

return $model->addMediaFromUrl($url)
->usingFilename($file['file_name']);
}
Expand Down