Fix doc generator scripts

Author: Salamandar

scripts/forms_doc_generate.py

@@ -135,22 +135,18 @@ def main() -> None:
     parser.add_argument("--output", "-o", type=Path, required=True)
     args = parser.parse_args()
 
-    config_panel = list_config_panel(args.input)
-    options = list_form_options(args.input)
-    version = get_changelog_version(args.input)
-    commit = get_current_commit(Path(__file__).parent)
+    template_data = {
+        "configpanel": list_config_panel(args.input),
+        "options": list_form_options(args.input),
+        "date": datetime.datetime.now().strftime("%d/%m/%Y"),
+        "version": get_changelog_version(args.input),
+        "doc_commit": get_current_commit(Path(__file__).parent),
+        "src_commit": get_current_commit(args.input),
+    }
 
     template = Template(TEMPLATE_FILE.read_text())
     template.globals["now"] = datetime.datetime.utcnow
-
-    result = template.render(
-        configpanel=config_panel,
-        options=options,
-        date=datetime.datetime.now().strftime("%d/%m/%Y"),
-        version=version,
-        current_commit=commit,
-    )
-
+    result = template.render(**template_data)
     args.output.write_text(result)
 
 

scripts/forms_doc_template.md.j2

@@ -7,7 +7,7 @@ routes:
   default: '/dev/forms'
 ---
 
-Doc auto-generated by [this script](https://github.com/YunoHost/doc/blob/{{ current_commit }}/scripts/forms_doc_generate.py) on {{date}} (YunoHost version {{version}})
+Doc auto-generated by [this script](https://github.com/YunoHost/doc/blob/{{doc_commit}}/scripts/forms_doc_generate.py) on {{date}} (YunoHost version {{version}})
 
 ## Glossary
 

scripts/helpers_doc_generate.py

@@ -281,20 +281,18 @@ def main() -> None:
 
             section["helpers"][subsection] = p.blocks  # type: ignore
 
-    version = get_changelog_version(args.input)
-    commit = get_current_commit(Path(__file__).parent)
+    template_data = {
+        "tree": TREE,
+        "helpers_version": args.version,
+        "date": datetime.datetime.now().strftime("%d/%m/%Y"),
+        "version": get_changelog_version(args.input),
+        "doc_commit": get_current_commit(Path(__file__).parent),
+        "src_commit": get_current_commit(args.input),
+    }
 
     template = Template(TEMPLATE_FILE.read_text())
     template.globals["now"] = datetime.datetime.utcnow
-
-    result = template.render(
-        tree=TREE,
-        date=datetime.datetime.now().strftime("%d/%m/%Y"),
-        version=version,
-        helpers_version=args.version,
-        current_commit=commit,
-    )
-
+    result = template.render(**template_data)
     output.write_text(result)
 
 

scripts/helpers_doc_template.md.j2

@@ -8,7 +8,7 @@ routes:
 custom_edit_link: 'https://github.com/YunoHost/yunohost/tree/dev/helpers/helpers.v{{ helpers_version }}.d'
 ---
 
-Doc auto-generated by [this script](https://github.com/YunoHost/doc/blob/{{ current_commit }}/scripts/helpers_doc_generate.py) on {{date}} (YunoHost version {{version}})
+Doc auto-generated by [this script](https://github.com/YunoHost/doc/blob/{{doc_commit}}/scripts/helpers_doc_generate.py) on {{date}} (YunoHost version {{version}})
 {% for section_id, section in tree.items() %}
 ## {{ section["title"].title() }}
 {%- if section['notes'] %}
@@ -61,7 +61,7 @@ Doc auto-generated by [this script](https://github.com/YunoHost/doc/blob/{{ curr
 {{ h.details.strip() }}
 {%- endif %}
 
-[Dude, show me the code!](https://github.com/YunoHost/yunohost/blob/{{ current_commit }}/helpers/helpers.v{{ helpers_version if helpers_version != "2" else "1" }}.d/{{ subsection }}#L{{ h.line + 1 }})
+[Dude, show me the code!](https://github.com/YunoHost/yunohost/blob/{{src_commit}}/helpers/helpers.v{{helpers_version if helpers_version != "2" else "1"}}.d/{{subsection}}#L{{h.line + 1}})
 [/details]
         {%- endfor %}
 

scripts/resources_doc_generate.py

@@ -82,21 +82,17 @@ def main() -> None:
     parser.add_argument("--output", "-o", type=Path, required=True)
     args = parser.parse_args()
 
-    resources = list_resources(args.input)
-
-    version = get_changelog_version(args.input)
-    commit = get_current_commit(Path(__file__).parent)
+    template_data = {
+        "resources": list_resources(args.input),
+        "date": datetime.datetime.now().strftime("%d/%m/%Y"),
+        "version": get_changelog_version(args.input),
+        "doc_commit": get_current_commit(Path(__file__).parent),
+        "src_commit": get_current_commit(args.input),
+    }
 
     template = Template(TEMPLATE_FILE.read_text())
     template.globals["now"] = datetime.datetime.utcnow
-
-    result = template.render(
-        resources=resources,
-        date=datetime.datetime.now().strftime("%d/%m/%Y"),
-        version=version,
-        current_commit=commit,
-    )
-
+    result = template.render(**template_data)
     args.output.write_text(result)
 
 

scripts/resources_doc_template.md.j2

@@ -8,7 +8,7 @@ routes:
 custom_edit_link: 'https://github.com/YunoHost/yunohost/blob/dev/src/utils/resources.py'
 ---
 
-Doc auto-generated by [this script](https://github.com/YunoHost/doc/blob/{{current_commit}}/scripts/resources_doc_generate.py) on {{date}} (YunoHost version {{version}})
+Doc auto-generated by [this script](https://github.com/YunoHost/doc/blob/{{doc_commit}}/scripts/resources_doc_generate.py) on {{date}} (YunoHost version {{version}})
 {% for section_id, docstring in resources.items() %}
 ## {{section_id}}