diff options
author | Florian Dold <florian@dold.me> | 2021-05-06 16:01:32 +0200 |
---|---|---|
committer | Florian Dold <florian@dold.me> | 2021-05-06 16:01:44 +0200 |
commit | 9a6e7c57484e16bdd3f4aa917e6489048fb242d0 (patch) | |
tree | e87fd94803e83e5269add3de88b1b06fa97b9ef1 | |
parent | c32cf6705b2519b670c22bb0d6378b3dbca9f508 (diff) | |
download | www-9a6e7c57484e16bdd3f4aa917e6489048fb242d0.tar.gz www-9a6e7c57484e16bdd3f4aa917e6489048fb242d0.tar.bz2 www-9a6e7c57484e16bdd3f4aa917e6489048fb242d0.zip |
simplify structure
m--------- | inc | 0 | ||||
-rwxr-xr-x | make_site.py | 25 | ||||
-rw-r--r-- | template/news/2014-11.html.j2 (renamed from news/2014-11.html.j2) | 0 | ||||
-rw-r--r-- | template/news/2014-12.html.j2 (renamed from news/2014-12.html.j2) | 0 | ||||
-rw-r--r-- | template/news/2015-02.html.j2 (renamed from news/2015-02.html.j2) | 0 | ||||
-rw-r--r-- | template/news/2015-11.html.j2 (renamed from news/2015-11.html.j2) | 0 | ||||
-rw-r--r-- | template/news/2015-12.html.j2 (renamed from news/2015-12.html.j2) | 0 | ||||
-rw-r--r-- | template/news/2016-06.html.j2 (renamed from news/2016-06.html.j2) | 0 | ||||
-rw-r--r-- | template/news/2016-08.html.j2 (renamed from news/2016-08.html.j2) | 0 | ||||
-rw-r--r-- | template/news/2016-09.html.j2 (renamed from news/2016-09.html.j2) | 0 | ||||
-rw-r--r-- | template/news/2016-10.html.j2 (renamed from news/2016-10.html.j2) | 0 | ||||
-rw-r--r-- | template/news/2016-12.html.j2 (renamed from news/2016-12.html.j2) | 0 | ||||
-rw-r--r-- | template/news/2017-01.html.j2 (renamed from news/2017-01.html.j2) | 0 | ||||
-rw-r--r-- | template/news/2017-02.html.j2 (renamed from news/2017-02.html.j2) | 0 | ||||
-rw-r--r-- | template/news/2017-03.html.j2 (renamed from news/2017-03.html.j2) | 0 | ||||
-rw-r--r-- | template/news/2017-04.html.j2 (renamed from news/2017-04.html.j2) | 0 | ||||
-rw-r--r-- | template/news/2017-08.html.j2 (renamed from news/2017-08.html.j2) | 0 | ||||
-rw-r--r-- | template/news/2017-10.html.j2 (renamed from news/2017-10.html.j2) | 0 | ||||
-rw-r--r-- | template/news/2018-04.html.j2 (renamed from news/2018-04.html.j2) | 0 | ||||
-rw-r--r-- | template/news/2019-12.html.j2 (renamed from news/2019-12.html.j2) | 0 | ||||
-rw-r--r-- | template/news/2020-03.html.j2 (renamed from news/2020-03.html.j2) | 0 | ||||
-rw-r--r-- | template/news/2020-04.html.j2 (renamed from news/2020-04.html.j2) | 0 | ||||
-rw-r--r-- | template/news/2020-07.html.j2 (renamed from news/2020-07.html.j2) | 0 | ||||
-rw-r--r-- | template/news/2020-09.html.j2 (renamed from news/2020-09.html.j2) | 0 | ||||
-rw-r--r-- | template/news/2020-10.html.j2 (renamed from news/2020-10.html.j2) | 0 | ||||
-rw-r--r-- | template/news/2020-11.html.j2 (renamed from news/2020-11.html.j2) | 0 | ||||
-rw-r--r-- | template/news/2020-12.html.j2 (renamed from news/2020-12.html.j2) | 0 | ||||
-rw-r--r-- | template/news/2021-01.html.j2 (renamed from news/2021-01.html.j2) | 0 | ||||
-rw-r--r-- | template/news/2021-02.html.j2 (renamed from news/2021-02.html.j2) | 0 | ||||
-rw-r--r-- | template/news/2021-03.html.j2 (renamed from news/2021-03.html.j2) | 0 | ||||
-rw-r--r-- | template/news/index.html.j2 (renamed from news/index.html.j2) | 0 |
31 files changed, 1 insertions, 24 deletions
diff --git a/inc b/inc -Subproject 1e9e7661a47f73d0cd2d8889d4d6e5f8f7eca09 +Subproject d92f6d37ed9fc605b517aafe614618369209a66 diff --git a/make_site.py b/make_site.py index 33978447..95a114de 100755 --- a/make_site.py +++ b/make_site.py @@ -29,36 +29,13 @@ env = jinja2.Environment(loader=jinja2.FileSystemLoader(str(PurePath(__file__).p autoescape=False) env.newstyle_gettext = True -if len(sys.argv) >= 2 and sys.argv[1] == "-vv": - DEBUG=1 -elif len(sys.argv) >= 2 and sys.argv[1] == "-vvv": - DEBUG=2 -elif len(sys.argv) >= 2 and sys.argv[1] == "-vvvv": - DEBUG=3 -else: - DEBUG=0 - def main(): - x = gen_site(DEBUG) + x = gen_site(0) conf = x.load_config("www.yml") x.gen_abstract(conf, "newsposts", "abstract", "page", 1000) x.gen_newspost_content(conf, "newsposts", "content", "page", "en") x.gen_rss("inc", conf, env) - if DEBUG: - print("generating html from jinja2 templates...") x.run("template", conf, env) - if DEBUG >= 2: - print(Path.cwd()) - _ = Path("rendered") - for child in _.iterdir(): - print(child) - if DEBUG >= 2: - print(Path.cwd()) - if DEBUG: - print("generating html from jinja2 news templates...") - x.run("news", conf, env) - if DEBUG: - print("copying directories...") x.copy_trees("static") x.copy_trees("dist") diff --git a/news/2014-11.html.j2 b/template/news/2014-11.html.j2 index 0280963e..0280963e 100644 --- a/news/2014-11.html.j2 +++ b/template/news/2014-11.html.j2 diff --git a/news/2014-12.html.j2 b/template/news/2014-12.html.j2 index f3638c7a..f3638c7a 100644 --- a/news/2014-12.html.j2 +++ b/template/news/2014-12.html.j2 diff --git a/news/2015-02.html.j2 b/template/news/2015-02.html.j2 index efdcf375..efdcf375 100644 --- a/news/2015-02.html.j2 +++ b/template/news/2015-02.html.j2 diff --git a/news/2015-11.html.j2 b/template/news/2015-11.html.j2 index 92cb94a8..92cb94a8 100644 --- a/news/2015-11.html.j2 +++ b/template/news/2015-11.html.j2 diff --git a/news/2015-12.html.j2 b/template/news/2015-12.html.j2 index f443e614..f443e614 100644 --- a/news/2015-12.html.j2 +++ b/template/news/2015-12.html.j2 diff --git a/news/2016-06.html.j2 b/template/news/2016-06.html.j2 index 0a19549f..0a19549f 100644 --- a/news/2016-06.html.j2 +++ b/template/news/2016-06.html.j2 diff --git a/news/2016-08.html.j2 b/template/news/2016-08.html.j2 index e0e303d9..e0e303d9 100644 --- a/news/2016-08.html.j2 +++ b/template/news/2016-08.html.j2 diff --git a/news/2016-09.html.j2 b/template/news/2016-09.html.j2 index c1a91513..c1a91513 100644 --- a/news/2016-09.html.j2 +++ b/template/news/2016-09.html.j2 diff --git a/news/2016-10.html.j2 b/template/news/2016-10.html.j2 index 5c7ce4ff..5c7ce4ff 100644 --- a/news/2016-10.html.j2 +++ b/template/news/2016-10.html.j2 diff --git a/news/2016-12.html.j2 b/template/news/2016-12.html.j2 index 43533aea..43533aea 100644 --- a/news/2016-12.html.j2 +++ b/template/news/2016-12.html.j2 diff --git a/news/2017-01.html.j2 b/template/news/2017-01.html.j2 index 6708b3c6..6708b3c6 100644 --- a/news/2017-01.html.j2 +++ b/template/news/2017-01.html.j2 diff --git a/news/2017-02.html.j2 b/template/news/2017-02.html.j2 index 41d53554..41d53554 100644 --- a/news/2017-02.html.j2 +++ b/template/news/2017-02.html.j2 diff --git a/news/2017-03.html.j2 b/template/news/2017-03.html.j2 index 198eba3a..198eba3a 100644 --- a/news/2017-03.html.j2 +++ b/template/news/2017-03.html.j2 diff --git a/news/2017-04.html.j2 b/template/news/2017-04.html.j2 index 9162807a..9162807a 100644 --- a/news/2017-04.html.j2 +++ b/template/news/2017-04.html.j2 diff --git a/news/2017-08.html.j2 b/template/news/2017-08.html.j2 index d505daa2..d505daa2 100644 --- a/news/2017-08.html.j2 +++ b/template/news/2017-08.html.j2 diff --git a/news/2017-10.html.j2 b/template/news/2017-10.html.j2 index e9d847ea..e9d847ea 100644 --- a/news/2017-10.html.j2 +++ b/template/news/2017-10.html.j2 diff --git a/news/2018-04.html.j2 b/template/news/2018-04.html.j2 index 4fdba8dc..4fdba8dc 100644 --- a/news/2018-04.html.j2 +++ b/template/news/2018-04.html.j2 diff --git a/news/2019-12.html.j2 b/template/news/2019-12.html.j2 index 1bab9a4b..1bab9a4b 100644 --- a/news/2019-12.html.j2 +++ b/template/news/2019-12.html.j2 diff --git a/news/2020-03.html.j2 b/template/news/2020-03.html.j2 index 2410b67d..2410b67d 100644 --- a/news/2020-03.html.j2 +++ b/template/news/2020-03.html.j2 diff --git a/news/2020-04.html.j2 b/template/news/2020-04.html.j2 index 3468f0bb..3468f0bb 100644 --- a/news/2020-04.html.j2 +++ b/template/news/2020-04.html.j2 diff --git a/news/2020-07.html.j2 b/template/news/2020-07.html.j2 index a16afaa9..a16afaa9 100644 --- a/news/2020-07.html.j2 +++ b/template/news/2020-07.html.j2 diff --git a/news/2020-09.html.j2 b/template/news/2020-09.html.j2 index 438ee5da..438ee5da 100644 --- a/news/2020-09.html.j2 +++ b/template/news/2020-09.html.j2 diff --git a/news/2020-10.html.j2 b/template/news/2020-10.html.j2 index 35ab8397..35ab8397 100644 --- a/news/2020-10.html.j2 +++ b/template/news/2020-10.html.j2 diff --git a/news/2020-11.html.j2 b/template/news/2020-11.html.j2 index d29c308f..d29c308f 100644 --- a/news/2020-11.html.j2 +++ b/template/news/2020-11.html.j2 diff --git a/news/2020-12.html.j2 b/template/news/2020-12.html.j2 index b9762838..b9762838 100644 --- a/news/2020-12.html.j2 +++ b/template/news/2020-12.html.j2 diff --git a/news/2021-01.html.j2 b/template/news/2021-01.html.j2 index 517af76a..517af76a 100644 --- a/news/2021-01.html.j2 +++ b/template/news/2021-01.html.j2 diff --git a/news/2021-02.html.j2 b/template/news/2021-02.html.j2 index 189adf35..189adf35 100644 --- a/news/2021-02.html.j2 +++ b/template/news/2021-02.html.j2 diff --git a/news/2021-03.html.j2 b/template/news/2021-03.html.j2 index 6f4ddfa2..6f4ddfa2 100644 --- a/news/2021-03.html.j2 +++ b/template/news/2021-03.html.j2 diff --git a/news/index.html.j2 b/template/news/index.html.j2 index 207fa801..207fa801 100644 --- a/news/index.html.j2 +++ b/template/news/index.html.j2 |