commit b42396f92a9ccccee80cbde95328efd439de359a parent 9dd52ed93996d8a32966bea4bed2908d5b7d2269 Author: Paul Longtine <paullongtine@gmail.com> Date: Thu Jun 12 14:37:15 2014 AAAAAAAAAAAAAAAAAAAAA Diffstat: build.py | 25 +++++++++++++------------ mod/blog.py | 4 ++-- 2 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/build.py b/build.py @@ -13,7 +13,7 @@ def main(): #Loops through defined "sites" for name,v in pagedata.items(): try: - template = open(v['template']).read() + template = file(v['template']).read() except: print("{}: Can't open file '{}'".format(name,v['template'])) @@ -44,13 +44,9 @@ def generateTemplate(t,var,page): except: exists = False if exists: - inc = open(replace).read() - inc = inc.replace("%page%", page) - inc = runInlineScript(inc, page) - for subsearch,subreplace in var.items(): - inc = inc.replace("%"+subsearch+"%",subreplace) - - t = t.replace("%"+search+"%",inc) + inc = file(replace).read() + inc = generateTemplate(inc,var,page) + t = t.replace("%"+search+"%",inc) else: t = t.replace("%"+search+"%",replace) @@ -78,7 +74,7 @@ def runMod(t,var,page): elif mdata['mod'] == "page": try: - template = open(mdata['settings']['template']).read() + template = file(mdata['settings']['template']).read() except: print("Error occured at {} using module page".format(page)) @@ -91,7 +87,12 @@ def runMod(t,var,page): if mdata['settings']['location'] == "": t = {'default':template} else: - pass + t = {} + temp = {} + for i in mdata['settings']['location'].split("/"): + temp[i] = {} + + subpage.update(t) return subpage @@ -141,10 +142,10 @@ def buildSite(site): for page, content in data.items(): if page != "default": os.mkdir(currentDir+"/"+subdir+"/"+page) - open(currentDir+"/"+subdir+"/"+page+"/index.html","w").write(content) + file(currentDir+"/"+subdir+"/"+page+"/index.html","w").write(content) else: - open(currentDir+"/"+subdir+"/index.html", "w").write(data['default']) + file(currentDir+"/"+subdir+"/index.html", "w").write(data['default']) for i in os.listdir("data/static/"): shutil.copytree("data/static/"+i,"site/"+i) diff --git a/mod/blog.py b/mod/blog.py @@ -5,8 +5,8 @@ def getPages(template,settings,name,page): settings['postTemplate'] = settings.get("postTemplate","./templates/post.html") settings['defaultPostCount'] = settings.get("defaultPostCount","0") settings['description'] = settings.get("description","0") - data = json.load(open(settings['data'])) - temp = open(settings['postTemplate']).read() + data = json.load(file(settings['data'])) + temp = file(settings['postTemplate']).read() # Generates all posts on page (/all a = ""
