added common.combine()

fgs/__main__.py

@@ -5,6 +5,7 @@ import os
 import sys
 
 
+import common
 import datatypes
 import reader
 import generator
@@ -19,11 +20,13 @@ def main():
     print("Hello World")
     config = {}
     with open('../config.json') as f:
-        config.update(json.loads(f.read()))
+        config = common.combine(config, json.loads(f.read()))
     with open('../lang.json') as f:
-        config['lang'] = json.loads(f.read())
+        if 'lang' not in config:
+            config['lang'] = {}
+        config['lang'] = common.combine(config['lang'], json.loads(f.read()))
     with open(CONTENT_DIR + '/config.json') as f:
-        config.update(json.loads(f.read()))
+        config = common.combine(config, json.loads(f.read()))
     print(config)
 
     factories = {}
@@ -62,6 +65,7 @@ def main():
 
 
 
+
 def read_static_dir(directory, static_files, subpath = []):
     print("static_dir: " + directory);
     for filename in os.listdir(directory):

fgs/common.py

+
+def combine(old, new):
+    if type(old) != type(new):
+        raise Exception("Cannot combine different types: ", type(old), type(new), old, new)
+    if isinstance(old, dict):
+        res = old.copy()
+        for key, value in new.items():
+            if key in res:
+                res[key] = combine(res[key], value)
+            else:
+                res[key] = value
+        return res
+    else:
+        return new

fgs/datatypes.py

 import datetime
 from dateutil import parser as dtparser
 
+import common
+
 class DictConverter:
 
     def __init__(self, factories):
@@ -106,8 +108,7 @@ class Page:
         if self.lang == deflang:
             return self._metadata
         defpage = self._factories['page'].get(self.slug, deflang)
-        res = defpage.metadata.copy()
-        res.update(self._metadata)
+        res = common.combine(defpage.metadata, self._metadata)
         return res
     metadata = property(get_metadata, None, None)
 

fgs/writer.py

@@ -2,6 +2,8 @@ from jinja2 import Environment, FileSystemLoader, StrictUndefined
 
 import os
 
+import common
+
 class Writer:
 
     def __init__(self, config, context, output_dir, theme_dir):
@@ -35,7 +37,7 @@ class Writer:
 
         # render template
         context = {}
-        context.update(self.context)
+        context = common.combine(context, self.context)
         context["config"] = localized_config
         context["theme"] = localized_config['theme']
         context["template"] = template
@@ -43,7 +45,7 @@ class Writer:
         context["l"] = lang # current language
         context["path"] = path
         context["siteurl"] = siteurl
-        context.update(extra_context)
+        context = common.combine(context, extra_context)
         #print("template: ", template)
         #print("path: ", path)
         #print("lang: ", lang)