Merge branch 'master' of github.com:adamhrv/megapixels_dev

1 files changed, 11 insertions, 9 deletions

diff --git a/megapixels/app/site/builder.py b/megapixels/app/site/builder.py
index fac49c24..603d4788 100644
--- a/megapixels/app/site/builder.py
+++ b/megapixels/app/site/builder.py
@@ -7,6 +7,7 @@ from jinja2 import Environment, FileSystemLoader, select_autoescape
 import app.settings.app_cfg as cfg
 
 import app.site.s3 as s3
+import app.site.loader as loader
 import app.site.parser as parser
 
 env = Environment(
@@ -21,7 +22,7 @@ def build_page(fn, research_posts, datasets):
   - syncs any assets with s3
   - handles certain index pages...
   """
-  metadata, sections = parser.read_metadata(fn)
+  metadata, sections = loader.read_metadata(fn)
 
   if metadata is None:
     print("{} has no metadata".format(fn))
@@ -55,7 +56,7 @@ def build_page(fn, research_posts, datasets):
   if 'index.md' in fn:
     s3.sync_directory(dirname, s3_dir, metadata)
 
-  content = parser.parse_markdown(sections, s3_path, skip_h1=skip_h1)
+  content = parser.parse_markdown(metadata, sections, s3_path, skip_h1=skip_h1)
 
   html = template.render(
     metadata=metadata,
@@ -73,10 +74,10 @@ def build_index(key, research_posts, datasets):
   """
   build the index of research (blog) posts
   """
-  metadata, sections = parser.read_metadata('../site/content/{}/index.md'.format(key))
+  metadata, sections = loader.read_metadata(os.path.join(cfg.DIR_SITE_CONTENT, key, 'index.md'))
   template = env.get_template("page.html")
   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_markdown(metadata, sections, s3_path, skip_h1=False)
   content += parser.parse_research_index(research_posts)
   html = template.render(
     metadata=metadata,
@@ -93,8 +94,8 @@ def build_site():
   """
   build the site! =^)
   """
-  research_posts = parser.read_research_post_index()
-  datasets = parser.read_datasets_index()
+  research_posts = loader.read_research_post_index()
+  datasets = loader.read_datasets_index()
   for fn in glob.iglob(os.path.join(cfg.DIR_SITE_CONTENT, "**/*.md"), recursive=True):
     build_page(fn, research_posts, datasets)
   build_index('research', research_posts, datasets)
@@ -103,7 +104,8 @@ def build_file(fn):
   """
   build just one page from a filename! =^)
   """
-  research_posts = parser.read_research_post_index()
-  datasets = parser.read_datasets_index()
-  fn = os.path.join(cfg.DIR_SITE_CONTENT, fn)
+  research_posts = loader.read_research_post_index()
+  datasets = loader.read_datasets_index()
+  if cfg.DIR_SITE_CONTENT not in fn:
+    fn = os.path.join(cfg.DIR_SITE_CONTENT, fn)
   build_page(fn, research_posts, datasets)