restructure

1 files changed, 5 insertions, 17 deletions

diff --git a/make_site.py b/make_site.py
index 95a114de..624be179 100755
--- a/make_site.py
+++ b/make_site.py
@@ -18,26 +18,14 @@ from pathlib import Path, PurePath
 sys.path.insert(0, ".")
 sys.path.insert(0, "inc/")
 
-from inc.site import gen_site
-from inc.fileproc import copy_files
+from inc.site import SiteGenerator
 
-env = jinja2.Environment(loader=jinja2.FileSystemLoader(str(PurePath(__file__).parent)),
-                         extensions=["jinja2.ext.i18n"],
-                         lstrip_blocks=True,
-                         trim_blocks=True,
-                         undefined=jinja2.StrictUndefined,
-                         autoescape=False)
-env.newstyle_gettext = True
 
 def main():
-    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)
-    x.run("template", conf, env)
-    x.copy_trees("static")
-    x.copy_trees("dist")
+    x = SiteGenerator()
+    x.gen_abstract("newsposts", "abstract", "page", 1000)
+    x.gen_newspost_content("newsposts", "content", "page", "en")
+    x.run()
 
 if __name__ == "__main__":
     main()