From 2e7ffb635601d35d331ef92d72bf589bd054b6e6 Mon Sep 17 00:00:00 2001 From: Kévin Le Gouguec Date: Mon, 28 Sep 2020 22:19:23 +0200 Subject: Move branches around The no-readme case is more straightforward, thus more digestible as an extra-indented special-case. --- repo/www/generate-index.py | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'repo') diff --git a/repo/www/generate-index.py b/repo/www/generate-index.py index 3fe1212..ab5b2a4 100755 --- a/repo/www/generate-index.py +++ b/repo/www/generate-index.py @@ -108,35 +108,35 @@ def main(arguments): stylesheets, variables ) - if readme is not None: - repo_top = Repo(search_parent_directories=True).working_dir - readme_path = Path(repo_top, target, readme) - - # If the README doesn't have a title, give a default to pandoc - # out-of-band. - if not has_title(readme_path): - metadata['pagetitle'] = target or 'README' - - with NamedTemporaryFile(mode='w+') as toc: - toc.write(f'

{toc_title}

\n') + if readme is None: + with NamedTemporaryFile(suffix='.md') as dummy_readme, \ + NamedTemporaryFile(mode='w+') as toc: toc.write(html_toc) toc.flush() + metadata['pagetitle'] = toc_title + metadata['title'] = 'Index' + pandoc.run( - readme_path, include_after=(toc.name,), metadata=metadata + dummy_readme.name, include_after=(toc.name,), metadata=metadata ) - return + return - with NamedTemporaryFile(suffix='.md') as dummy_readme, \ - NamedTemporaryFile(mode='w+') as toc: + repo_top = Repo(search_parent_directories=True).working_dir + readme_path = Path(repo_top, target, readme) + + # If the README doesn't have a title, give a default to pandoc + # out-of-band. + if not has_title(readme_path): + metadata['pagetitle'] = target or 'README' + + with NamedTemporaryFile(mode='w+') as toc: + toc.write(f'

{toc_title}

\n') toc.write(html_toc) toc.flush() - metadata['pagetitle'] = toc_title - metadata['title'] = 'Index' - pandoc.run( - dummy_readme.name, include_after=(toc.name,), metadata=metadata + readme_path, include_after=(toc.name,), metadata=metadata ) -- cgit v1.2.3