diff options
| author | tdro <tdro@noreply.example.com> | 2025-03-11 00:00:00 +0000 |
|---|---|---|
| committer | tdro <tdro@noreply.example.com> | 2025-03-11 00:00:00 +0000 |
| commit | 07ff6967107e0f02bf9917c5bf073abf8cac3928 (patch) | |
| tree | aa115e334a2e7ac144e7de355f307a15d62384b5 | |
| parent | 7cada9c55b73297532bcd3e2e6c20ba852e1b881 (diff) | |
| download | canory-07ff6967107e0f02bf9917c5bf073abf8cac3928.tar.gz canory-07ff6967107e0f02bf9917c5bf073abf8cac3928.tar.bz2 canory-07ff6967107e0f02bf9917c5bf073abf8cac3928.zip | |
themes/default/layouts/partials: Avoid memory explosion
5 files changed, 15 insertions, 30 deletions
diff --git a/themes/default/layouts/_default/_markup/render-image.html b/themes/default/layouts/_default/_markup/render-image.html index b562641..e44a5d3 100644 --- a/themes/default/layouts/_default/_markup/render-image.html +++ b/themes/default/layouts/_default/_markup/render-image.html @@ -4,6 +4,13 @@ ) -}} +{{- $format := "embed.html" -}} +{{- $page := print "public/" (strings.TrimPrefix .Page.Site.BaseURL .Page.Permalink) $format -}} + +{{- with $embed := resources.Get $page -}} + {{- if (in $embed.Content "/data/media/404.png") -}} {{- $modified = true -}} {{- end -}} +{{- end -}} + {{- if $modified -}} {{- $href := "" -}} {{- $cache := "" -}} diff --git a/themes/default/layouts/_default/single.embed.html b/themes/default/layouts/_default/single.embed.html index f1cdc66..469b856 100644 --- a/themes/default/layouts/_default/single.embed.html +++ b/themes/default/layouts/_default/single.embed.html @@ -1,12 +1,6 @@ {{- $pageContext := . -}} {{- $format := "embed.html" -}} -{{- $page := print "public/" (strings.TrimPrefix - $pageContext.Page.Site.BaseURL - $pageContext.Page.Permalink - ) $format --}} - {{- $modified := partial "function-page-modified.html" (dict "Context" $pageContext @@ -14,10 +8,10 @@ ) -}} +{{- $page := print "public/" (strings.TrimPrefix $pageContext.Page.Site.BaseURL $pageContext.Page.Permalink) $format -}} + {{- with $embed := resources.Get $page -}} - {{- if (in $embed.Content "/data/media/404.png") -}} - {{- $modified = true -}} - {{- end -}} + {{- if (in $embed.Content "/data/media/404.png") -}} {{- $modified = true -}} {{- end -}} {{- end -}} {{- if $modified -}} diff --git a/themes/default/layouts/partials/function-page-modified.html b/themes/default/layouts/partials/function-page-modified.html index 26cf9ca..7e2d250 100644 --- a/themes/default/layouts/partials/function-page-modified.html +++ b/themes/default/layouts/partials/function-page-modified.html @@ -63,12 +63,6 @@ {{- end -}} {{- end -}} -{{- with $embed := resources.Get $page -}} - {{- if (in $embed.Content "/data/media/404.png") -}} - {{- $modified = true -}} - {{- end -}} -{{- end -}} - {{- if (and (in $segments.render.debug true) (in $segments.render.debug false)) -}} {{- warnf "%b %s %s %s %s" $modified $pageContext.Page.Kind $label $pageContext.Page.Type $page -}} {{- else -}} diff --git a/themes/default/layouts/partials/gallery-walk.html b/themes/default/layouts/partials/gallery-walk.html index 3f1ee46..41d9ef1 100644 --- a/themes/default/layouts/partials/gallery-walk.html +++ b/themes/default/layouts/partials/gallery-walk.html @@ -6,15 +6,10 @@ {{- $content := "" -}} {{- $page := print "public/" (strings.TrimPrefix .Page.Site.BaseURL .Page.Permalink) "embed.html" -}} - - {{- with $embed := resources.Get $page -}} - {{- $content = $embed.Content -}} - {{- else -}} - {{- $content = .Content -}} - {{- end -}} + {{- with $embed := resources.Get $page -}} {{- $content = $embed.Content -}} {{- end -}} + {{- if not $content -}} {{- $content = .Content -}} {{- end -}} {{- if in $content "<picture>" -}} - {{- $data = $data | append (dict "relatedHref" (.Permalink) "type" (delimit (findRE `(?sU)\s{8}type=".*"` $content 1) "") diff --git a/themes/default/layouts/partials/render-embed.html b/themes/default/layouts/partials/render-embed.html index 77b6b8f..6971584 100644 --- a/themes/default/layouts/partials/render-embed.html +++ b/themes/default/layouts/partials/render-embed.html @@ -1,11 +1,6 @@ {{- $pageContext := . -}} {{- $format := "embed.html" -}} -{{- $page := print "public/" (strings.TrimPrefix - $pageContext.Page.Site.BaseURL - $pageContext.Page.Permalink - ) $format --}} {{- $modified := partial "function-page-modified.html" (dict @@ -14,10 +9,10 @@ ) -}} +{{- $page := print "public/" (strings.TrimPrefix $pageContext.Page.Site.BaseURL $pageContext.Page.Permalink) $format -}} + {{- with $embed := resources.Get $page -}} - {{- if (in $embed.Content "/data/media/404.png") -}} - {{- $modified = true -}} - {{- end -}} + {{- if (in $embed.Content "/data/media/404.png") -}} {{- $modified = true -}} {{- end -}} {{- end -}} {{- if $modified -}} |