commit 922d0d7c9738be6eafabf32bdb1a32390ea32e6c parent 0ce4dd52eb5c6a87e9da754c4be7973a1ddf2856 Author: Paul Longtine <paullongtine@gmail.com> Date: Thu May 22 21:26:28 2014 added 'description' option Diffstat: data/test.json | 2 +- mod/blog.py | 35 +++++++++++++++++++++-------------- pages.json | 2 +- 3 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/data/test.json b/data/test.json @@ -1 +1 @@ -[{"post":"0","date":"1997-10-3","title":"This is a test for tesing purposes","content":"<p>Blaugh.<\/p>"},{"post":"1","date":"2010-11-20","title":"No clue. Not one.","content":"<p>Uh. hi...<\/p>\n<p>Still...<\/p>\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras blandit, orci eu consectetur eleifend, ante purus luctus leo, id gravida nulla ante ut odio. Nunc non turpis sapien. Pellentesque nec condimentum metus. Mauris vel lorem tincidunt mi tincidunt malesuada. Mauris eu luctus odio. Morbi vel ligula a eros condimentum facilisis sit amet ut ligula. Vivamus quis ultricies elit, sit amet sollicitudin justo. Etiam ac urna condimentum, tempus ipsum vitae, dapibus massa. Maecenas augue nunc, vehicula ultricies tincidunt nec, lacinia vel velit. Donec et leo venenatis, elementum felis elementum, facilisis justo. Ut egestas commodo diam eu adipiscing. Proin vestibulum velit sit amet congue semper. Cras convallis urna nec nibh consectetur bibendum. Vivamus scelerisque velit sit amet congue consequat. In posuere consectetur nisl. <\/p>"}]- \ No newline at end of file +[{"post":"0","description":"BLAHLBAH","date":"1997-10-3","title":"This is a test for tesing purposes","content":"<p>Blaugh.<\/p>"},{"post":"1","description":"BLAHBLAH","date":"2010-11-20","title":"No clue. Not one.","content":"<p>Uh. hi...<\/p>\n<p>Still...<\/p>\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras blandit, orci eu consectetur eleifend, ante purus luctus leo, id gravida nulla ante ut odio. Nunc non turpis sapien. Pellentesque nec condimentum metus. Mauris vel lorem tincidunt mi tincidunt malesuada. Mauris eu luctus odio. Morbi vel ligula a eros condimentum facilisis sit amet ut ligula. Vivamus quis ultricies elit, sit amet sollicitudin justo. Etiam ac urna condimentum, tempus ipsum vitae, dapibus massa. Maecenas augue nunc, vehicula ultricies tincidunt nec, lacinia vel velit. Donec et leo venenatis, elementum felis elementum, facilisis justo. Ut egestas commodo diam eu adipiscing. Proin vestibulum velit sit amet congue semper. Cras convallis urna nec nibh consectetur bibendum. Vivamus scelerisque velit sit amet congue consequat. In posuere consectetur nisl. <\/p>"}]+ \ No newline at end of file diff --git a/mod/blog.py b/mod/blog.py @@ -4,6 +4,7 @@ def getPages(template,settings,name,page): pages = {} 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() @@ -20,8 +21,12 @@ def getPages(template,settings,name,page): # Generates index a = "" for i in data: - if int(settings['defaultPostCount']) == 0 or int(i['post']) >= posts-int(settings['defaultPostCount']) : + if int(settings['defaultPostCount']) == 0 or int(i['post']) >= posts-int(settings['defaultPostCount']): + back = i['content'] + if settings['description'] != "0": + i['content'] = i['description'] a = generatePost(i,temp,page) + a + i['content'] = back pages['default'] = template.replace("%"+name+"%",a) @@ -35,20 +40,21 @@ def getPages(template,settings,name,page): a = "" dates = {} for i in data: - datedata = i['date'].split("-") - if datedata[0] in dates: - if datedata[1] in dates[datedata[0]]: - dates[datedata[0]][datedata[1]][datedata[2]] = i['title'] + if 'date' in i: + datedata = i['date'].split("-") + if datedata[0] in dates: + if datedata[1] in dates[datedata[0]]: + dates[datedata[0]][datedata[1]][datedata[2]] = i['title'] + + else: + dates[datedata[0]][datedata[1]] = {} + dates[datedata[0]][datedata[1]][datedata[2]] = i['title'] else: + dates[datedata[0]] = {} dates[datedata[0]][datedata[1]] = {} dates[datedata[0]][datedata[1]][datedata[2]] = i['title'] - else: - dates[datedata[0]] = {} - dates[datedata[0]][datedata[1]] = {} - dates[datedata[0]][datedata[1]][datedata[2]] = i['title'] - a = "<ul>" for year,months in sorted(dates.items(),reverse=True): a = a + "<li>{}</li><li><ul>".format(year) @@ -70,12 +76,12 @@ def generatePost(data, post, page): for name,x in data.items(): if name == 'title': if page == "index": - page = "" + linkpage = "" else: - page = page + "/" + linkpage = page + "/" - post = post.replace("%titlelink%","/"+page+"post/"+slug(x)) + post = post.replace("%titlelink%","/"+linkpage+"post/"+slug(x)) post = post.replace("%"+name+"%", x) elif name == 'date': @@ -88,7 +94,8 @@ def generatePost(data, post, page): post = post.replace( "%date:"+config+"%", time.strftime(config.replace("&","%"),time.strptime(x,"%Y-%m-%d"))) - + elif name == 'description': + pass else: post = post.replace("%"+name+"%", x) diff --git a/pages.json b/pages.json @@ -4,5 +4,5 @@ "pagemod":{"content":{"mod":"blog","settings":{"defaultPostCount":"0","data":"./data/index.json"}}}}, "test":{"template":"templates/std.html", "pagevar":{":header":"./includes/header.html","title":"This is THE test page"}, - "pagemod":{"content":{"mod":"blog","settings":{"defaultPostCount":"1","data":"./data/test.json"}}}} + "pagemod":{"content":{"mod":"blog","settings":{"description":1,"defaultPostCount":"1","data":"./data/test.json"}}}} } \ No newline at end of file
