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

fix new getURLPath

Browse Source
This commit is contained in:
James Collins
2023-09-29 16:57:55 +10:00
parent bf5cf3bce4
commit e0650da5e9
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/Models/Media.php
View File

@@ -254,7 +254,7 @@ class Media extends Model
{ {
$variants = $this->variants; $variants = $this->variants;
if (isset($variants[$variant]) === true) { if (isset($variants[$variant]) === true) {
return self::getUrlPath() . $variants[$variant]; return self::getUrlPath(['name' => $variants[$variant]]);
} }
if ($returnNearest === true) { if ($returnNearest === true) {
@@ -263,7 +263,7 @@ class Media extends Model
while (empty($previousVariant) === false) { while (empty($previousVariant) === false) {
$previousVariant = $this->getPreviousVariant($variantType, $previousVariant); $previousVariant = $this->getPreviousVariant($variantType, $previousVariant);
if (empty($previousVariant) === false && isset($variants[$previousVariant]) === true) { if (empty($previousVariant) === false && isset($variants[$previousVariant]) === true) {
return self::getUrlPath() . $variants[$previousVariant]; return self::getUrlPath(['name' => $variants[$previousVariant]]);
} }
} }
} }
@@ -324,9 +324,20 @@ class Media extends Model
* *
* @return string * @return string
*/ */
public function getUrlPath(): string public function getUrlPath(array $replacements = []): string
{ {
$url = config("filesystems.disks.$this->storage.url"); $url = config("filesystems.disks.$this->storage.url");
if (!empty($replacements)) {
foreach ($replacements as $key => $value) {
$placeholder = '{' . $key . '}';
$url = str_replace($placeholder, $value, $url);
}
}
// Remove any remaining {x} placeholders
$url = preg_replace('/\{[^}]+\}/', '', $url);
return "$url"; return "$url";
} }
@@ -337,10 +348,10 @@ class Media extends Model
*/ */
public function getUrlAttribute(): string public function getUrlAttribute(): string
{ {
$url = self::getUrlPath(); $url = self::getUrlPath([
'id' => rawurlencode($this->id),
$url = str_replace('{id}', rawurlencode($this->id), $url); 'name' => rawurlencode($this->name)
$url = str_replace('{name}', rawurlencode($this->name), $url); ]);
return $url; return $url;
} }
@@ -720,7 +731,7 @@ class Media extends Model
// delete existing thumbnail // delete existing thumbnail
if (strlen($this->thumbnail) !== 0) { if (strlen($this->thumbnail) !== 0) {
$path = substr($this->thumbnail, strlen($this->getUrlPath())); $path = pathinfo($this->thumbnail, PATHINFO_BASENAME);
if (strlen($path) > 0 && Storage::disk($this->storage)->exists($path) === true) { if (strlen($path) > 0 && Storage::disk($this->storage)->exists($path) === true) {
Storage::disk($this->storage)->delete($path); Storage::disk($this->storage)->delete($path);
} }
@@ -807,7 +818,7 @@ class Media extends Model
$fileSystem->putFileAs('/', new SplFileInfo($tempImagePath), $newFilename); $fileSystem->putFileAs('/', new SplFileInfo($tempImagePath), $newFilename);
unlink($tempImagePath); unlink($tempImagePath);
$this->thumbnail = $this->getUrlPath() . $newFilename; $this->thumbnail = $this->getUrlPath(['name', $newFilename]);
} else { } else {
$iconExtension = 'unknown'; $iconExtension = 'unknown';
if ($fileExtension !== '') { if ($fileExtension !== '') {
@@ -831,7 +842,7 @@ class Media extends Model
public function deleteThumbnail(): void public function deleteThumbnail(): void
{ {
if (strlen($this->thumbnail) > 0) { if (strlen($this->thumbnail) > 0) {
$path = substr($this->thumbnail, strlen($this->getUrlPath())); $path = pathinfo($this->thumbnail, PATHINFO_BASENAME);
if (strlen($path) > 0 && Storage::disk($this->storage)->exists($path) === true) { if (strlen($path) > 0 && Storage::disk($this->storage)->exists($path) === true) {
Storage::disk($this->storage)->delete($path); Storage::disk($this->storage)->delete($path);