diff options
| -rw-r--r-- | src/SvgCollection.php | 18 | ||||
| -rw-r--r-- | src/SvgCollectionState.php | 34 |
2 files changed, 43 insertions, 9 deletions
diff --git a/src/SvgCollection.php b/src/SvgCollection.php index 63d7508..fdf0664 100644 --- a/src/SvgCollection.php +++ b/src/SvgCollection.php @@ -27,8 +27,13 @@ class SvgCollection public function getSvgUrl(string $svg): string { - $this->getState()->addSvg($svg); - return route('laralight-svg.serve-svg', $this->getName()) . "#{$svg}"; + $state = $this->getState(); + $state->addSvg($svg); + $hash = $state->getHash(); + return route( + 'laralight-svg.serve-svg', + ['collection' => $this->getName(), 'v' => $hash] + ) . "#{$svg}"; } protected function getState(): SvgCollectionState @@ -70,11 +75,15 @@ class SvgCollection if ($file !== null && $compiler->addSvg($pendingSvg, $file)) { $added[] = $pendingSvg; } + else { + \Log::error("Failed to add {$pendingSvg} to svg sprite"); + } } $state->clearPending(false); $state->concatExisting($added, false); $state->setFullSvg($compiler->getSvg(), false); + $state->updateHash(); $state->push(); } @@ -87,4 +96,9 @@ class SvgCollection return null; } + public function clearState(): void + { + $this->getState()->clear(); + } + } diff --git a/src/SvgCollectionState.php b/src/SvgCollectionState.php index 1bf8013..3de9c5b 100644 --- a/src/SvgCollectionState.php +++ b/src/SvgCollectionState.php @@ -7,6 +7,8 @@ use Illuminate\Cache\Repository; class SvgCollectionState { + protected int $createdAt; + protected ?string $hash; protected array $existing; protected array $pending; protected string $svg; @@ -28,17 +30,17 @@ class SvgCollectionState { $data = $this->cache()->get($this->cacheKey()); $this->svg = $data['svg'] ?? ''; - - $existing = $data['existing'] ?? []; - $pending = $data['pending'] ?? []; - - $this->existing = static::arrayToMap($existing); - $this->pending = static::arrayToMap($pending); + $this->createdAt = $data['createdAt'] ?? time(); + $this->existing = static::arrayToMap($data['existing'] ?? []); + $this->pending = static::arrayToMap($data['pending'] ?? []); + $this->hash = $data['hash'] ?? null; } public function push(): void { $data = [ + 'createdAt' => $this->createdAt, + 'hash' => $this->hash, 'existing' => array_values($this->existing), 'pending' => array_values($this->pending), 'svg' => $this->svg, @@ -79,7 +81,7 @@ class SvgCollectionState { $this->existing = [ ...$this->existing, - ...$svgs, + ...static::arrayToMap($svgs), ]; if ($push) $this->push(); } @@ -119,6 +121,11 @@ class SvgCollectionState } } + public function clear(): void + { + $this->cache()->forget($this->cacheKey()); + } + protected function cache(): Repository { return Cache::store(config('svg.cache_store')); @@ -129,4 +136,17 @@ class SvgCollectionState return SvgServiceProvider::NAMESPACE . '::' . $this->name; } + public function getHash(): ?string + { + return $this->hasPending() ? null : $this->hash; + } + + public function updateHash(): void + { + $data = $this->existing; + sort($data); + $data[] = $this->createdAt; + $this->hash = substr(md5(json_encode($data)), 0, 10); + } + } |