From e43a73fabbf1251659e0e84f78762e364c0e7c64 Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Jan 11 2022 15:38:20 +0000 Subject: If no search backend, make index the main page --- diff --git a/bin/generate-html.py b/bin/generate-html.py index d50ac6d..ca6eb6c 100755 --- a/bin/generate-html.py +++ b/bin/generate-html.py @@ -121,7 +121,7 @@ def main(): args = parser.parse_args() # Make sure output directory exists. - output_dir = args.target_dir + output_dir = Path(args.target_dir) os.makedirs(output_dir, exist_ok=True) # Initialize templating system. @@ -283,6 +283,7 @@ def main(): # Generate main user entrypoint. print("Generating index pages...") + main_is_static = True if SEARCH_BACKEND is False else False pkgs_list = [] # {"aa": ["aaargh", ...]} @@ -309,8 +310,8 @@ def main(): date=date.today().isoformat(), package_count=max_page_count, prefix_index=prefix_index, + main_is_static=main_is_static ) - save_to(os.path.join(output_dir, "index-static.html"), static_index_html) search = env.get_template("index.html.j2") search_html = search.render( @@ -318,14 +319,19 @@ def main(): package_count=max_page_count, search_backend=SEARCH_BACKEND, ) - save_to(os.path.join(output_dir, "index.html"), search_html) + + if main_is_static: + save_to(output_dir / "index.html", static_index_html) + else: + save_to(output_dir / "index-static.html", static_index_html) + save_to(output_dir / "index.html", search_html) index_tpl = env.get_template("index-prefix.html.j2") index_dir = os.path.join(output_dir, "index") os.makedirs(index_dir, exist_ok=True) for prefix, names in prefix_index.items(): html = index_tpl.render( - prefix=prefix, packages=names, search_backend=SEARCH_BACKEND + prefix=prefix, packages=names, main_is_static=main_is_static ) save_to(os.path.join(index_dir, f"{prefix}.html"), html) diff --git a/templates/index-prefix.html.j2 b/templates/index-prefix.html.j2 index 9b5e012..295d727 100644 --- a/templates/index-prefix.html.j2 +++ b/templates/index-prefix.html.j2 @@ -2,13 +2,19 @@ {% set link_prefix = "../" %} {% set no_index = True %} +{% if main_is_static %} + {% set back_page = "index.html" %} +{% else %} + {% set back_page = "index-static.html" %} +{% endif %} + {% block title %}"{{ prefix }}" Index - Fedora Packages{% endblock %} {% block content %}

Packages that start with "{{ prefix }}".

- Back to the packages index ↵ + Back to the packages index ↵