From 6c1ebd66791f9f764ac11eb7ca86787334c088c72825f912c320f033ac1c5298 Mon Sep 17 00:00:00 2001 From: Nicholas Johnson Date: Sun, 23 Oct 2022 00:00:00 +0000 Subject: Move Python generation scripts into theme --- .build.yml | 2 +- TODO | 2 -- clean.py | 32 ------------------------------ generate.py | 62 ---------------------------------------------------------- themes/journal | 2 +- 5 files changed, 2 insertions(+), 98 deletions(-) delete mode 100644 TODO delete mode 100644 clean.py delete mode 100644 generate.py diff --git a/.build.yml b/.build.yml index 88d55cf..bab213b 100644 --- a/.build.yml +++ b/.build.yml @@ -7,7 +7,7 @@ environment: site: gitnick.srht.site tasks: - generate: | - python3 $site/generate.py + python3 $site/themes/hugo-theme-nicksphere/scripts/generate.py - package_website: | cd $site/website tar -cvz . > ../../site.tar.gz diff --git a/TODO b/TODO deleted file mode 100644 index 42109d5..0000000 --- a/TODO +++ /dev/null @@ -1,2 +0,0 @@ -- replace Python scripts with Makefile -- create README.txt (mention local web server for offline viewing) diff --git a/clean.py b/clean.py deleted file mode 100644 index bd71950..0000000 --- a/clean.py +++ /dev/null @@ -1,32 +0,0 @@ -''' - nicksphere Generates a Gemini capsule from existing files - Copyright (C) 2022 Nicholas Johnson - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -''' - -import os -import shutil - - -if __name__ == '__main__': - root_dir = os.path.dirname(os.path.realpath(__file__)) - output_dir = os.path.join(root_dir, "public") - gemini_output_dir = os.path.join(root_dir, "capsule") - html_output_dir = os.path.join(root_dir, "website") - - # delete output directories - shutil.rmtree(output_dir, ignore_errors=True) - shutil.rmtree(gemini_output_dir, ignore_errors=True) - shutil.rmtree(html_output_dir, ignore_errors=True) diff --git a/generate.py b/generate.py deleted file mode 100644 index 8438ef2..0000000 --- a/generate.py +++ /dev/null @@ -1,62 +0,0 @@ -''' - nicksphere Generates a Gemini capsule from existing files - Copyright (C) 2022 Nicholas Johnson - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -''' - -import os -import subprocess -import shutil - - -if __name__ == '__main__': - root_dir = os.path.dirname(os.path.realpath(__file__)) - output_dir = os.path.join(root_dir, "public") - gemini_output_dir = os.path.join(root_dir, "capsule") - html_output_dir = os.path.join(root_dir, "website") - - # detect static Gemini files - os.chdir(os.path.join(root_dir, "static")) - static_gemini_files = [os.path.join(root, name) for root, dirs, files in os.walk(".") for name in files if name.endswith(".gmi")] - - # generate output directory - os.chdir(root_dir) - subprocess.run("hugo") - - # generate Gemini output directory - try: - shutil.copytree(output_dir, gemini_output_dir, ignore=shutil.ignore_patterns("*.html"), dirs_exist_ok=True) - except shutil.Error: - pass - - os.chdir(os.path.join(root_dir, "static")) - - os.chdir(gemini_output_dir) - os.remove("robots.txt") - os.remove("sitemap.xml") - shutil.move(os.path.join("gemini_atom", "atom.xml"), "atom.xml") - os.rmdir("gemini_atom") - for file in static_gemini_files: - shutil.copy(os.path.join(output_dir, file), file) - - # generate HTML output directory - try: - shutil.copytree(output_dir, html_output_dir, ignore=shutil.ignore_patterns("*.gmi", "gemini_atom"), dirs_exist_ok=True) - except shutil.Error: - pass - - os.chdir(html_output_dir) - for file in static_gemini_files: - shutil.copy(os.path.join(output_dir, file), file) diff --git a/themes/journal b/themes/journal index fe2d028..518ec9a 160000 --- a/themes/journal +++ b/themes/journal @@ -1 +1 @@ -Subproject commit fe2d028c74ad35151412e94697bc6db06fbeaefdc40a9d65ee707ba0e7695f89 +Subproject commit 518ec9aba88d5d6861ddbe57fa3b07f50c7cfe23e229215180288cf314a2ce2c -- cgit v1.2.3