1 files changed, 53 insertions, 7 deletions

diff --git a/megapixels/app/site/parser.py b/megapixels/app/site/parser.py
index d78cc402..ecfae0cb 100644
--- a/megapixels/app/site/parser.py
+++ b/megapixels/app/site/parser.py
@@ -11,6 +11,10 @@ renderer = mistune.Renderer(escape=False)
 markdown = mistune.Markdown(renderer=renderer)
 
 def fix_images(lines, s3_path):
+  """
+  do our own tranformation of the markdown around images to handle wide images etc
+  lines: markdown lines
+  """
   real_lines = []
   block = "\n\n".join(lines)
   for line in block.split("\n"):
@@ -29,6 +33,9 @@ def fix_images(lines, s3_path):
   return "\n".join(real_lines)
 
 def format_section(lines, s3_path, type=''):
+  """
+  format a normal markdown section
+  """
   if len(lines):
     lines = fix_images(lines, s3_path)
     if type:
@@ -38,36 +45,57 @@ def format_section(lines, s3_path, type=''):
   return ""
 
 def format_metadata(section):
+  """
+  format a metadata section (+ key: value pairs)
+  """
   meta = []
   for line in section.split('\n'):
     key, value = line[2:].split(': ', 1)
     meta.append("<div><div class='gray'>{}</div><div>{}</div></div>".format(key, value))
   return "<section><div class='meta'>{}</div></section>".format(''.join(meta)) 
 
-def format_applet(section):
-  payload = section.replace('```', '').strip().split('\n')
+def format_applet(section, s3_path):
+  # print(section)
+  payload = section.strip('```').strip().strip('```').strip().split('\n')
   applet = {}
+  print(payload)
   if ': ' in payload[0]:
     command, opt = payload[0].split(': ')
   else:
     command = payload[0]
     opt = None
+  if command == 'python':
+    return format_section([ section ], s3_path)
+
   applet['command'] = command
   if opt:
     applet['opt'] = opt
-  if command == 'load file':
-    applet['fields'] = payload[1]
-  return "<section><div class='applet' data-payload='{}'></div></section>".format(json.dumps(applet))
+  if command == 'load_file':
+    if opt[0:4] != 'http':
+      applet['opt'] = s3_path + opt
+  if len(payload) > 1:
+    applet['fields'] = payload[1:]
+  return "<section class='applet_container'><div class='applet' data-payload='{}'></div></section>".format(json.dumps(applet))
 
 def parse_markdown(sections, s3_path, skip_h1=False):
+  """
+  parse page into sections, preprocess the markdown to handle our modifications
+  """
   groups = []
   current_group = []
   for section in sections:
     if skip_h1 and section.startswith('# '):
       continue
-    elif section.startswith('```'):
+    elif section.strip().startswith('```'):
       groups.append(format_section(current_group, s3_path))
-      groups.append(format_applet(section))
+      current_group = []
+      current_group.append(section)
+      if section.strip().endswith('```'):
+        groups.append(format_applet("\n\n".join(current_group), s3_path))
+        current_group = []
+    elif section.strip().endswith('```'):
+      current_group.append(section)
+      groups.append(format_applet("\n\n".join(current_group), s3_path))
       current_group = []
     elif section.startswith('+ '):
       groups.append(format_section(current_group, s3_path))
@@ -88,6 +116,9 @@ def parse_markdown(sections, s3_path, skip_h1=False):
   return content
 
 def parse_research_index(research_posts):
+  """
+  Generate an index file for the research pages
+  """
   content = "<div class='research_index'>"
   for post in research_posts:
     s3_path = s3.make_s3_path(cfg.S3_SITE_PATH, post['path'])
@@ -105,6 +136,9 @@ def parse_research_index(research_posts):
   return content
 
 def read_metadata(fn):
+  """
+  Read in read a markdown file and extract the metadata
+  """
   with open(fn, "r") as file:
     data = file.read()
     data = data.replace("\n ", "\n")
@@ -128,6 +162,9 @@ default_metadata = {
 }
 
 def parse_metadata_section(metadata, section):
+  """
+  parse a metadata key: value pair
+  """
   for line in section.split("\n"):
     if ': ' not in line:
       continue
@@ -135,6 +172,11 @@ def parse_metadata_section(metadata, section):
     metadata[key.lower()] = value
 
 def parse_metadata(fn, sections):
+  """
+  parse the metadata headers in a markdown file
+  (everything before the second ---------)
+  also generates appropriate urls for this page :)
+  """
   found_meta = False
   metadata = {}
   valid_sections = []
@@ -172,9 +214,13 @@ def parse_metadata(fn, sections):
   metadata['sync'] = metadata['sync'] != 'false'
 
   metadata['author_html'] = '<br>'.join(metadata['authors'].split(','))
+
   return metadata, valid_sections
 
 def read_research_post_index():
+  """
+  Generate an index of the research (blog) posts
+  """
   posts = []
   for fn in sorted(glob.glob('../site/content/research/*/index.md')):
     metadata, valid_sections = read_metadata(fn)