building basic site. need to include cursors, etc

2 files changed, 12 insertions, 5 deletions

diff --git a/cli/app/sql/models/graph.py b/cli/app/sql/models/graph.py
index fbfb09c..8e068a0 100644
--- a/cli/app/sql/models/graph.py
+++ b/cli/app/sql/models/graph.py
@@ -42,6 +42,11 @@ class Graph(Base):
     data['pages'] = [ page.toLinkJSON() for page in self.pages ]
     return data
 
+  def toSiteJSON(self):
+    data = self.toJSON()
+    data['pages'] = [ page.toFullJSON() for page in self.pages ]
+    return data
+
 class GraphForm(ModelForm):
   class Meta:
     model = Graph
diff --git a/cli/app/utils/file_utils.py b/cli/app/utils/file_utils.py
index 7f1f417..0e672fc 100644
--- a/cli/app/utils/file_utils.py
+++ b/cli/app/utils/file_utils.py
@@ -195,12 +195,14 @@ def load_yaml(fp_in):
     cfg = yaml.load(fp, Loader=yaml.Loader)
   return cfg
 
-def load_text(fp_in):
+def load_text(fp_in, split=True):
   """Load a text file into an array
   :param fp_in: (str) filepath
   """
   with open(fp_in, 'rt') as fp:
-    lines = fp.read().rstrip('\n').split('\n')
+    lines = fp.read().rstrip('\n')
+    if split:
+      lines = lines.split('\n')
   return lines
 
 def load_line_lookup(fp_in):
@@ -264,16 +266,16 @@ def write_pickle(data, fp_out, ensure_path=True):
     pickle.dump(data, fp)
 
 
-def write_json(data, fp_out, minify=True, ensure_path=True, sort_keys=True, verbose=False):
+def write_json(data, fp_out, minify=True, ensure_path=True, sort_keys=True, verbose=False, default=None):
   """
   """
   if ensure_path:
     mkdirs(fp_out)
   with open(fp_out, 'w') as fp:
     if minify:
-      json.dump(data, fp, separators=(',',':'), sort_keys=sort_keys)
+      json.dump(data, fp, separators=(',',':'), sort_keys=sort_keys, default=default)
     else:
-      json.dump(data, fp, indent=2, sort_keys=sort_keys)
+      json.dump(data, fp, indent=2, sort_keys=sort_keys, default=default)
   if verbose:
     log.info('Wrote JSON: {}'.format(fp_out))