From 12661e9006606d9745dd8dca8435d0e0b373ebf1 Mon Sep 17 00:00:00 2001 From: Morten Delenk Date: Sun, 12 Jun 2016 18:49:18 +0200 Subject: [PATCH] Is that better? --- comments.py | 16 +++------------- htmlgen/htmlgen.py | 10 +++++++--- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/comments.py b/comments.py index 440ef40..d25728c 100755 --- a/comments.py +++ b/comments.py @@ -11,29 +11,18 @@ import time, string print("Content-type: text/html\r\n\r\n") form=cgi.FieldStorage() aid=int(form["aid"].value) -print("1") try: seed=int(form["seed"].value) - print("2") random.seed(seed) - print("3") checkstr="".join(random.choice(string.digits+string.ascii_lowercase) for _ in range(5)) - print(checkstr) - print("4") if not checkstr == form["checkstr"].value: print("Captcha's wrong") raise Exception() - print("5") username=form["username"].value - print("6") message=form["message"].value - print("7") timestamp=int(time.time()) - print("8") - data={"name":"","markdown":message,"author":username,"date":timestamp} - print("9") + data={"name":form["title"],"markdown":message,"author":username,"date":timestamp} storage.append("comments-%i"%aid,data) - print("10") except KeyError: pass @@ -47,6 +36,7 @@ html=htmlgen.HTMLgen(pagelayout.getLayoutXML().decode('utf-8'),"Comments") html.appendHTML("
"%aid) html.appendHTML(""%seed) html.appendHTML("
") +html.appendHTML("
") html.appendHTML("
") html.appendHTML("\"Captcha" % base64.b64encode(capt.getvalue()).decode("UTF-8")) html.appendHTML("") @@ -56,4 +46,4 @@ for i in range(count): html.addArticle(**(storage.get("comments-%i"%aid,i))) print("") -print(html.renderSite()) +print(html.renderSite(True)) diff --git a/htmlgen/htmlgen.py b/htmlgen/htmlgen.py index e89acf9..7e8a540 100644 --- a/htmlgen/htmlgen.py +++ b/htmlgen/htmlgen.py @@ -21,7 +21,7 @@ class HTMLgen: self.asideHTML=text+self.asideHTML def appendHTML(self, text): self.asideHTML=self.asideHTML+text - def renderSite(self): + def renderSite(self, comments=False): nav="" x=len(self.titles)-1 for title in self.titles[::-1]: @@ -31,7 +31,11 @@ class HTMLgen: x=len(self.articles)-1 for article in self.articles[::-1]: main=main+("

%s

Written on by %s

%s
" %(x,self.titles[x],datetime.datetime.fromtimestamp(self.dates[x]).strftime("%Y-%m-%d %H:%M:%S"),datetime.datetime.fromtimestamp(self.dates[x]).strftime("%c"),self.authors[x],article)) - main=main+("Comments (%i)") % (x, storage.count("comments-%i"%x)) + if not comments: + main=main+("Comments (%i)") % (x, storage.count("comments-%i"%x)) x=x-1 - styleargs = {"title":self.title,"nav":nav,"main":main,"aside":self.asideHTML,"footer":"Copyright 2016 Morten"} + if not comments: + styleargs = {"title":self.title,"nav":nav,"main":main,"aside":self.asideHTML,"footer":"Copyright 2016 Morten"} + else: + styleargs = {"title":self.title,"nav":nav,"main":self.asideHTML+main,"aside":"","footer":"Copyright 2016 Morten"} return self.layout%styleargs