Merge pull request #1114 from gethinode/download-link

Support links to static files and page resources
gethinode · Aug 17, 2024 · c7e70bf · c7e70bf
2 parents 0caa00a + 1700abc
commit c7e70bf
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/layouts/partials/assets/link.html b/layouts/partials/assets/link.html
@@ -59,9 +59,22 @@
     {{ if not $isLocal }}
         {{ $ref := partial "utilities/GetPage.html" (dict "url" $destination "page" $page) }}
         {{- if not $ref -}}
-            {{- errorf "partial [assets/link.html] - Cannot find page: %s" $destination -}}
-            {{- $error = true -}}
-        {{- else -}}
+            {{ $pageContext := "" }}
+            {{ with $page.File }}{{ $pageContext = path.Join "/content" .Dir }}{{ end }}
+            {{ $isPageRes := fileExists (path.Join $pageContext $destination) }}
+            {{ $isStatic := fileExists (path.Join "static" $destination) }}
+            {{ if and (not $isPageRes) (not $isStatic) }}
+                {{- errorf "partial [assets/link.html] - Cannot find page or asset: '%s' at '%s'" $destination $page.File.Path -}}
+                {{- $error = true -}}
+            {{ else if $isPageRes }}
+                {{ $destination = urls.JoinPath "/" (strings.TrimPrefix "/content" $pageContext) $destination }}
+            {{ else if $isStatic }}
+                {{ $destination = urls.JoinPath "/" $destination }}
+            {{ end }}
+            {{- with $anchor }}{{ $destination = printf "%s#%s" (strings.TrimSuffix "/" $destination) . -}}{{ end -}}
+        {{ end }}
+
+        {{- if and $ref (not $error) -}}
             {{- $destination = $ref.RelPermalink -}}
             {{- with $anchor }}{{ $destination = printf "%s#%s" (strings.TrimSuffix "/" $destination) . -}}{{ end -}}
         {{- end -}}

diff --git a/layouts/shortcodes/link.html b/layouts/shortcodes/link.html
@@ -80,8 +80,14 @@
 {{- if not $isExternal -}}
     {{ $ref := partial "utilities/GetPage.html" (dict "url" $url "page" .Page) }}
     {{- if not $ref -}}
-        {{- errorf "Cannot find page: '%s' at %s" $url .Position -}}
-        {{- $error = true -}}
+        {{ $pageContext := "" }}
+        {{ with .Page.File }}{{ $pageContext = path.Join "/content" .Dir }}{{ end }}
+        {{ $isPageRes := fileExists (path.Join $pageContext $url) }}
+        {{ $isStatic := fileExists (path.Join "/static" $url) }}
+        {{ if and (not $isPageRes) (not $isStatic) }}
+            {{- errorf "Cannot find page or asset: '%s' at %s" $url .Position -}}
+            {{- $error = true -}}
+        {{ end }}
     {{- end -}}
 {{- end -}}