main.py: cards: get right version from abs_url

adriendupuis · adriendupuis · commit 4158a4c3a145 · 2024-02-19T08:21:07.000+01:00
diff --git a/main.py b/main.py
@@ -48,6 +48,8 @@ def cards(pages, columns=1, style="cards", force_version=False):
         canonical = current_page.canonical_url
         url_parts = re.search("//([^/]+)/([^/]+)/([^/]+)/([^/]+)/([^/]+)/", canonical)
         (site, project, edition, language, version) = url_parts.groups()
+        url_parts = re.search("^/([^/]+)/([^/]+)/([^/]+)/([^/]+)/", absolute_url)
+        (project, edition, language, version) = url_parts.groups()
         version = force_version or version
 
         if isinstance(pages, str):
@@ -87,4 +89,4 @@ def cards(pages, columns=1, style="cards", force_version=False):
                     )
                 )
 
-        return """<div class="%s col-%s">%s</div>""" % (style, columns, "\n".join(cards))
+        return """<div class="%s col-%s">%s %s %s</div>""" % (style, columns, "\n".join(cards), current_page.abs_url, current_page.canonical_url)

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,8 @@ def cards(pages, columns=1, style="cards", force_version=False):`
`48`	`48`	`canonical = current_page.canonical_url`
`49`	`49`	`url_parts = re.search("//([^/]+)/([^/]+)/([^/]+)/([^/]+)/([^/]+)/", canonical)`
`50`	`50`	`(site, project, edition, language, version) = url_parts.groups()`
	`51`	`+ url_parts = re.search("^/([^/]+)/([^/]+)/([^/]+)/([^/]+)/", absolute_url)`
	`52`	`+ (project, edition, language, version) = url_parts.groups()`
`51`	`53`	`version = force_version or version`
`52`	`54`
`53`	`55`	`if isinstance(pages, str):`
`@@ -87,4 +89,4 @@ def cards(pages, columns=1, style="cards", force_version=False):`
`87`	`89`	`)`
`88`	`90`	`)`
`89`	`91`
`90`		`- return """<div class="%s col-%s">%s</div>""" % (style, columns, "\n".join(cards))`
	`92`	`+ return """<div class="%s col-%s">%s %s %s</div>""" % (style, columns, "\n".join(cards), current_page.abs_url, current_page.canonical_url)`