From 77b8d5e65b0162bb448265bd5039054f9a87631a Mon Sep 17 00:00:00 2001
From: Danila Fedorin <danila.fedorin@gmail.com>
Date: Thu, 16 May 2024 15:33:44 -0700
Subject: [PATCH] Draw from 'data/' for submodule links

I didn't know about https://gohugo.io/templates/data-templates/

Signed-off-by: Danila Fedorin <danila.fedorin@gmail.com>
---
 layouts/partials/geturl.html      | 5 ++---
 layouts/shortcodes/codeblock.html | 2 +-
 layouts/shortcodes/codelines.html | 2 +-
 layouts/shortcodes/codeurl.html   | 2 +-
 layouts/shortcodes/rawblock.html  | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/layouts/partials/geturl.html b/layouts/partials/geturl.html
index 7231db9..fa5e9ff 100644
--- a/layouts/partials/geturl.html
+++ b/layouts/partials/geturl.html
@@ -2,11 +2,10 @@
 {{ $scratch.Set "bestLength" -1 }}
 {{ $scratch.Set "bestUrl" (printf "%s/code/%s" .siteSourceUrl .path) }}
 {{ $filePath := .path }}
-{{ range $module, $props := .submoduleLinks }}
-{{ $path := index $props "path" }}
+{{ range $path, $url := .submoduleLinks }}
 {{ $bestLength := $scratch.Get "bestLength" }}
 {{ if and (le $bestLength (len $path)) (hasPrefix $filePath $path) }}
 {{ $scratch.Set "bestLength" (len $path) }}
-{{ $scratch.Set "bestUrl" (printf "%s%s" (index $props "url") (strings.TrimPrefix $path $filePath)) }}
+{{ $scratch.Set "bestUrl" (printf "%s%s" $url (strings.TrimPrefix $path $filePath)) }}
 {{ end }}
 {{ end }}
diff --git a/layouts/shortcodes/codeblock.html b/layouts/shortcodes/codeblock.html
index 8d801e7..a8a432c 100644
--- a/layouts/shortcodes/codeblock.html
+++ b/layouts/shortcodes/codeblock.html
@@ -1,2 +1,2 @@
-{{ partial "geturl.html" (dict "scratch" .Scratch "path" (.Get 1) "siteSourceUrl" .Site.Params.siteSourceUrl "submoduleLinks" .Site.Params.submoduleLinks) }}
+{{ partial "geturl.html" (dict "scratch" .Scratch "path" (.Get 1) "siteSourceUrl" .Site.Params.siteSourceUrl "submoduleLinks" .Site.Data.submodules) }}
 {{ partial "highlightgroup.html" (dict "url" (.Scratch.Get "bestUrl") "path" (.Get 1) "comment" ", entire file" "code" (readFile (printf "code/%s" (.Get 1))) "language" (.Get 0) "opts" "linenos=table") }}
diff --git a/layouts/shortcodes/codelines.html b/layouts/shortcodes/codelines.html
index db1ca47..bdab526 100644
--- a/layouts/shortcodes/codelines.html
+++ b/layouts/shortcodes/codelines.html
@@ -17,7 +17,7 @@
 {{ .Scratch.Set "hidden" (.Get 5) }}
 {{ end }}
 
-{{ partial "geturl.html" (dict "scratch" .Scratch "path" (.Get 1) "siteSourceUrl" .Site.Params.siteSourceUrl "submoduleLinks" .Site.Params.submoduleLinks) }}
+{{ partial "geturl.html" (dict "scratch" .Scratch "path" (.Get 1) "siteSourceUrl" .Site.Params.siteSourceUrl "submoduleLinks" .Site.Data.submodules) }}
 {{ partial "linerangestr.html" (dict "scratch" .Scratch "from" (.Get 2) "to" (.Get 3)) }}
 
 {{ with (.Scratch.Get "hidden") }}
diff --git a/layouts/shortcodes/codeurl.html b/layouts/shortcodes/codeurl.html
index dafa9c7..db93960 100644
--- a/layouts/shortcodes/codeurl.html
+++ b/layouts/shortcodes/codeurl.html
@@ -1,2 +1,2 @@
-{{ partial "geturl.html" (dict "scratch" .Scratch "path" (.Get 0) "siteSourceUrl" .Site.Params.siteSourceUrl "submoduleLinks" .Site.Params.submoduleLinks) }}
+{{ partial "geturl.html" (dict "scratch" .Scratch "path" (.Get 0) "siteSourceUrl" .Site.Params.siteSourceUrl "submoduleLinks" .Site.Data.submodules) }}
 {{ .Scratch.Get "bestUrl" }}
diff --git a/layouts/shortcodes/rawblock.html b/layouts/shortcodes/rawblock.html
index edfbbf3..b05d97e 100644
--- a/layouts/shortcodes/rawblock.html
+++ b/layouts/shortcodes/rawblock.html
@@ -1,2 +1,2 @@
-{{ partial "geturl.html" (dict "scratch" .Scratch "path" (.Get 0) "siteSourceUrl" .Site.Params.siteSourceUrl "submoduleLinks" .Site.Params.submoduleLinks) }}
+{{ partial "geturl.html" (dict "scratch" .Scratch "path" (.Get 0) "siteSourceUrl" .Site.Params.siteSourceUrl "submoduleLinks" .Site.Data.submodules) }}
 {{ partial "group.html" (dict "url" (.Scratch.Get "bestUrl") "path" (.Get 0) "comment" ", entire file" "content" (safeHTML (printf "<pre><code>%s</code></pre>" (htmlEscape (readFile (printf "code/%s" (.Get 0))))))) }}