Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit b5a59cd

Browse files
committed
ImageResizer With Custom Urls Original Key
1 parent 1d2ec19 commit b5a59cd

File tree

1 file changed

+15
-8
lines changed

1 file changed

+15
-8
lines changed

src/ImageType.php

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -191,13 +191,15 @@ public function url(string $filename = null, $sizes = [], $expirationTime = null
191191
$this->expirationTime = empty($expirationTime) ? $this->expirationTime : $expirationTime;
192192

193193
if (empty($sizes) || in_array('original', $sizes)) {
194-
$output = $this->typeConfig->get('original')['path'] . '/' . $filename['basename'];
194+
$configOriginal = $this->typeConfig->get('original');
195+
$output = $configOriginal['path'] . '/' . $filename['basename'];
196+
$key = empty($configOriginal['as']) ? 'original' : $configOriginal['as'];
195197

196198
$storage = Storage::disk($this->originalFileDisk);
197-
if ($this->originalDiskConfig['driver'] === 'local' || empty($this->typeConfig->get('original')['private'])) {
198-
$urls['original'] = $storage->url($output);
199+
if ($this->originalDiskConfig['driver'] === 'local' || empty($configOriginal['private'])) {
200+
$urls[$key] = $storage->url($output);
199201
} else {
200-
$urls['original'] = $storage->temporaryUrl($output, Carbon::now()->addMinutes($this->expirationTime));
202+
$urls[$key] = $storage->temporaryUrl($output, Carbon::now()->addMinutes($this->expirationTime));
201203
}
202204
}
203205

@@ -226,8 +228,11 @@ public function temporaryUrl(string $filename = null, $sizes = [], $expirationTi
226228
$this->expirationTime = empty($expirationTime) ? $this->expirationTime : $expirationTime;
227229

228230
if (empty($sizes) || in_array('original', $sizes)) {
229-
$output = $this->typeConfig->get('original')['path'] . '/' . $filename['basename'];
230-
$urls['original'] = Storage::disk($this->originalFileDisk)->temporaryUrl($output, Carbon::now()->addMinutes($this->expirationTime));
231+
$configOriginal = $this->typeConfig->get('original');
232+
$output = $configOriginal['path'] . '/' . $filename['basename'];
233+
$key = empty($configOriginal['as']) ? 'original' : $configOriginal['as'];
234+
235+
$urls[$key] = Storage::disk($this->originalFileDisk)->temporaryUrl($output, Carbon::now()->addMinutes($this->expirationTime));
231236
}
232237

233238
$configSizes = $this->typeConfig->get('sizes');
@@ -269,7 +274,9 @@ public function defaultUrl($sizes = [])
269274
$defaultUrl = Storage::disk('local')->url($output);
270275

271276
if (empty($sizes) || in_array('original', $sizes)) {
272-
$urls['original'] = $defaultUrl;
277+
$configOriginal = $this->typeConfig->get('original');
278+
$key = empty($configOriginal['as']) ? 'original' : $configOriginal['as'];
279+
$urls[$key] = $defaultUrl;
273280
}
274281

275282
$configSizes = $this->typeConfig->get('sizes');
@@ -310,7 +317,7 @@ protected function output($filename, $size, $dimensions)
310317
{
311318
if ($dimensions['extension'] === null) $dimensions['extension'] = $filename['extension'];
312319

313-
$fileSuffix = NULL;
320+
$fileSuffix = null;
314321

315322
if ($this->baseFileSuffix) {
316323
$fileSuffix = "-{$dimensions['width']}x{$dimensions['height']}";

0 commit comments

Comments
 (0)