STEMMechanics/Website
1
0
Fork 0
Code Issues 4 Pull Requests 1 Actions Packages Projects Releases 3 Wiki Activity

cleanup

Browse Source
This commit is contained in:
James Collins
2023-08-13 19:37:47 +10:00
parent 31578f5ed3
commit ac06b3700c
1 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
app/Models/Media.php
View File

@@ -699,6 +699,25 @@ class Media extends Model
return $fileName; return $fileName;
} }
/**
* Download temporary copy of the storage file.
*
* @return string File path
*/
private function downloadTempFile(): string
{
$readStream = Storage::disk($this->storageDisk)->readStream($this->name);
$filePath = tempnam(sys_get_temp_dir(), 'download-');
$writeStream = fopen($filePath, 'w');
while (feof($readStream) !== true) {
fwrite($writeStream, fread($readStream, 8192));
}
fclose($readStream);
fclose($writeStream);
return $filePath;
}
/** /**
* Generate a Thumbnail for this media. * Generate a Thumbnail for this media.
* @param string $uploadedFilePath The local file, if present (else download from storage). * @param string $uploadedFilePath The local file, if present (else download from storage).
@@ -721,14 +740,7 @@ class Media extends Model
// download original from CDN if no local file // download original from CDN if no local file
$filePath = $uploadedFilePath; $filePath = $uploadedFilePath;
if ($uploadedFilePath === "") { if ($uploadedFilePath === "") {
$readStream = Storage::disk($this->storageDisk)->readStream($this->name); $filePath = $this->downloadTempFile();
$filePath = tempnam(sys_get_temp_dir(), 'download-');
$writeStream = fopen($filePath, 'w');
while (feof($readStream) !== true) {
fwrite($writeStream, fread($readStream, 8192));
}
fclose($readStream);
fclose($writeStream);
} }
$fileExtension = File::extension($this->name); $fileExtension = File::extension($this->name);
@@ -790,7 +802,9 @@ class Media extends Model
$success = true; $success = true;
} elseif (file_exists($ffmpegPath) === true && strpos($this->mime_type, 'video/') === 0) { } elseif (file_exists($ffmpegPath) === true && strpos($this->mime_type, 'video/') === 0) {
$tempImagePath .= '.webp'; $tempImagePath .= '.webp';
exec("$ffmpegPath -i $filePath -ss 00:00:05 -vframes 1 -s {$thumbnailWidth}x{$thumbnailHeight} -c:v webp {$tempImagePath}"); $command = "$ffmpegPath -i $filePath -ss 00:00:05 -vframes 1 " . // phpcs:ignore
"-s {$thumbnailWidth}x{$thumbnailHeight} -c:v webp {$tempImagePath}";
exec($command);
$success = true; $success = true;
}//end if }//end if
@@ -803,8 +817,15 @@ class Media extends Model
$this->thumbnail = $this->getUrlPath() . $newFilename; $this->thumbnail = $this->getUrlPath() . $newFilename;
} else { } else {
$fileIconPath = '/assets/fileicons/' . ($fileExtension !== '' && file_exists(public_path('assets/fileicons/' . $fileExtension . '.webp')) ? $fileExtension : 'unknown') . '.webp'; $iconExtension = 'unknown';
$this->thumbnail = asset($fileIconPath); if ($fileExtension !== '') {
$iconPath = public_path('assets/fileicons/' . $fileExtension . '.webp');
if (file_exists($iconPath) === true) {
$iconExtension = $fileExtension;
}
}
$this->thumbnail = asset('/assets/fileicons/' . $iconExtension . '.webp');
} }
return $success; return $success;
@@ -825,14 +846,7 @@ class Media extends Model
// download original from CDN if no local file // download original from CDN if no local file
$filePath = $uploadedFilePath; $filePath = $uploadedFilePath;
if ($uploadedFilePath === "") { if ($uploadedFilePath === "") {
$readStream = Storage::disk($this->storageDisk)->readStream($this->name); $filePath = $this->downloadTempFile();
$filePath = tempnam(sys_get_temp_dir(), 'download-');
$writeStream = fopen($filePath, 'w');
while (feof($readStream) !== true) {
fwrite($writeStream, fread($readStream, 8192));
}
fclose($readStream);
fclose($writeStream);
} }
// delete existing variants // delete existing variants
@@ -845,7 +859,7 @@ class Media extends Model
} }
$this->variants = []; $this->variants = [];
$originalImage = Image::make($sizes); $originalImage = Image::make($filePath);
$imageSize = $originalImage->getSize(); $imageSize = $originalImage->getSize();
$isPortrait = $imageSize->getHeight() > $imageSize->getWidth(); $isPortrait = $imageSize->getHeight() > $imageSize->getWidth();