4 files changed, 23 insertions, 35 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()
diff --git a/megapixels/app/builder/parser.py b/megapixels/app/builder/parser.py
index dd3643bf..ea84f658 100644
--- a/megapixels/app/builder/parser.py
+++ b/megapixels/app/builder/parser.py
@@ -3,8 +3,8 @@ import re
 import glob
 import mistune
 
-import s3
-from paths import *
+import app.settings.app_cfg
+import app.builder.s3
 
 renderer = mistune.Renderer(escape=False)
 markdown = mistune.Markdown(renderer=renderer)
@@ -70,7 +70,7 @@ def parse_markdown(sections, s3_path, skip_h1=False):
 def parse_research_index(research_posts):
   content = "<div class='research_index'>"
   for post in research_posts:
-    s3_path = s3.make_s3_path(s3_site_path, post['path'])
+    s3_path = s3.make_s3_path(app_cfg.S3_SITE_PATH, post['path'])
     if 'image' in post:
       post_image = s3_path + post['image']
     else:
diff --git a/megapixels/app/builder/paths.py b/megapixels/app/builder/paths.py
deleted file mode 100644
index 356f2f3d..00000000
--- a/megapixels/app/builder/paths.py
+++ /dev/null
@@ -1,6 +0,0 @@
-
-s3_site_path = "v1/site"
-s3_datasets_path = "v1" # datasets is already in the filename
-public_path = "../site/public"
-content_path = "../site/content"
-template_path = "../site/templates"
diff --git a/megapixels/app/builder/s3.py b/megapixels/app/builder/s3.py
index 41ecdf61..99726a4d 100644
--- a/megapixels/app/builder/s3.py
+++ b/megapixels/app/builder/s3.py
@@ -1,17 +1,6 @@
 import os
 import glob
 import boto3
-from paths import *
-
-session = boto3.session.Session()
-
-s3_client = session.client(
-  service_name='s3',
-  aws_access_key_id=os.getenv('S3_KEY'),
-  aws_secret_access_key=os.getenv('S3_SECRET'),
-  endpoint_url=os.getenv('S3_ENDPOINT'),
-  region_name=os.getenv('S3_REGION'),
-)
 
 def sync_directory(base_fn, s3_path, metadata):
   fns = {}
@@ -23,6 +12,16 @@ def sync_directory(base_fn, s3_path, metadata):
 
   remote_path = s3_path + metadata['url']
 
+  session = boto3.session.Session()
+
+  s3_client = session.client(
+    service_name='s3',
+    aws_access_key_id=os.getenv('S3_KEY'),
+    aws_secret_access_key=os.getenv('S3_SECRET'),
+    endpoint_url=os.getenv('S3_ENDPOINT'),
+    region_name=os.getenv('S3_REGION'),
+  )
+
   directory = s3_client.list_objects(Bucket=os.getenv('S3_BUCKET'), Prefix=remote_path)
   prefixes = []