1 files changed, 10 insertions, 15 deletions
diff --git a/megapixels/app/builder/builder.py b/megapixels/app/builder/builder.py
index 620fc710..d1f882d6 100644
--- a/megapixels/app/builder/builder.py
+++ b/megapixels/app/builder/builder.py
@@ -1,18 +1,16 @@
 #!/usr/bin/python
 
-from dotenv import load_dotenv
-load_dotenv()
-
 import os
 import glob
 from jinja2 import Environment, FileSystemLoader, select_autoescape
 
-import s3
-import parser
-from paths import *
+import app.settings.app_cfg as cfg
+
+import app.builder.s3
+import app.builder.parser
 
 env = Environment(
-  loader=FileSystemLoader(template_path),
+  loader=FileSystemLoader(cfg.DIR_SITE_TEMPLATES),
   autoescape=select_autoescape([])
 )
 
@@ -26,7 +24,7 @@ def build_page(fn, research_posts):
   print(metadata['url'])
 
   dirname = os.path.dirname(fn)
-  output_path = public_path + metadata['url']
+  output_path = cfg.DIR_SITE_PUBLIC + metadata['url']
   output_fn = os.path.join(output_path, "index.html")
 
   skip_h1 = False
@@ -40,9 +38,9 @@ def build_page(fn, research_posts):
     template = env.get_template("page.html")
 
   if 'datasets/' in fn:
-    s3_dir = s3_datasets_path
+    s3_dir = cfg.S3_DATASETS_PATH
   else:
-    s3_dir = s3_site_path
+    s3_dir = cfg.S3_SITE_PATH
 
   s3_path = s3.make_s3_path(s3_dir, metadata['path'])
 
@@ -67,7 +65,7 @@ def build_page(fn, research_posts):
 def build_research_index(research_posts):
   metadata, sections = parser.read_metadata('../site/content/research/index.md')
   template = env.get_template("page.html")
-  s3_path = s3.make_s3_path(s3_site_path, metadata['path'])
+  s3_path = s3.make_s3_path(cfg.S3_SITE_PATH, metadata['path'])
   content = parser.parse_markdown(sections, s3_path, skip_h1=False)
   content += parser.parse_research_index(research_posts)
   html = template.render(
@@ -82,9 +80,6 @@ def build_research_index(research_posts):
 
 def build_site():
   research_posts = parser.read_research_post_index()
-  for fn in glob.iglob(os.path.join(content_path, "**/*.md"), recursive=True):
+  for fn in glob.iglob(os.path.join(cfg.DIR_SITE_CONTENT, "**/*.md"), recursive=True):
     build_page(fn, research_posts)
   build_research_index(research_posts)
-
-if __name__ == '__main__':
-  build_site()