From 6947f2a5c79d623f787b055b185c40ffc4e0de70 Mon Sep 17 00:00:00 2001
From: Morten Delenk <mtg.morten@googlemail.com>
Date: Sun, 12 Jun 2016 18:04:01 +0200
Subject: [PATCH] Comments, anyone?

---
 articles-0.pickle       | Bin 287 -> 0 bytes
 comments.py             |  43 ++++++++++++++++
 data/articles-0.pickle  | Bin 5130 -> 382 bytes
 data/articles-1.pickle  | Bin 4966 -> 0 bytes
 data/articles-10.pickle | Bin 5016 -> 0 bytes
 data/articles-11.pickle | Bin 5016 -> 0 bytes
 data/articles-12.pickle | Bin 5016 -> 0 bytes
 data/articles-13.pickle | Bin 5016 -> 0 bytes
 data/articles-14.pickle | Bin 5016 -> 0 bytes
 data/articles-15.pickle | Bin 5016 -> 0 bytes
 data/articles-16.pickle | Bin 5016 -> 0 bytes
 data/articles-17.pickle | Bin 5016 -> 0 bytes
 data/articles-18.pickle | Bin 5016 -> 0 bytes
 data/articles-19.pickle | Bin 5016 -> 0 bytes
 data/articles-2.pickle  | Bin 5016 -> 0 bytes
 data/articles-20.pickle | Bin 116 -> 0 bytes
 data/articles-3.pickle  | Bin 5016 -> 0 bytes
 data/articles-4.pickle  | Bin 5016 -> 0 bytes
 data/articles-5.pickle  | Bin 5016 -> 0 bytes
 data/articles-6.pickle  | Bin 5016 -> 0 bytes
 data/articles-7.pickle  | Bin 5016 -> 0 bytes
 data/articles-8.pickle  | Bin 5016 -> 0 bytes
 data/articles-9.pickle  | Bin 5016 -> 0 bytes
 htmlgen/htmlgen.py      |  21 +++++---
 index.py                | 108 +---------------------------------------
 25 files changed, 58 insertions(+), 114 deletions(-)
 delete mode 100644 articles-0.pickle
 create mode 100755 comments.py
 delete mode 100644 data/articles-1.pickle
 delete mode 100644 data/articles-10.pickle
 delete mode 100644 data/articles-11.pickle
 delete mode 100644 data/articles-12.pickle
 delete mode 100644 data/articles-13.pickle
 delete mode 100644 data/articles-14.pickle
 delete mode 100644 data/articles-15.pickle
 delete mode 100644 data/articles-16.pickle
 delete mode 100644 data/articles-17.pickle
 delete mode 100644 data/articles-18.pickle
 delete mode 100644 data/articles-19.pickle
 delete mode 100644 data/articles-2.pickle
 delete mode 100644 data/articles-20.pickle
 delete mode 100644 data/articles-3.pickle
 delete mode 100644 data/articles-4.pickle
 delete mode 100644 data/articles-5.pickle
 delete mode 100644 data/articles-6.pickle
 delete mode 100644 data/articles-7.pickle
 delete mode 100644 data/articles-8.pickle
 delete mode 100644 data/articles-9.pickle

diff --git a/articles-0.pickle b/articles-0.pickle
deleted file mode 100644
index 5a80d206319e11869b387a8689a9006de06e88f1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 287
zcmXv}OG*SW5LFmt=!Gi}P&-{n-$U1exR^zCQqo0tk|wFxWFdHfEaR2DiTAK3GLNDb
zkN4qy9lr0buR2ccvpv)s%rb}A>d|6cR`yG)2a7`O`Ik?x_2`tgVfU^6yv&?HPi6w4
zB(Md2CX&i6Oa(9so0Z0`42rjqVGsUZ;GMk%76`t39kPeSmL6daJAF`uqFRF<FfHIT
zJwVEnQ_GqAPaTFQIk&64sM~F8*X5)!Q<h7F)|n6^na)IToCFt2K$v(f<DmOII%@Uy
LvIqN`mT~+828d=I

diff --git a/comments.py b/comments.py
new file mode 100755
index 0000000..318030b
--- /dev/null
+++ b/comments.py
@@ -0,0 +1,43 @@
+#!/usr/bin/env python3
+from htmlgen import *
+import storage
+import cgi
+import random
+import base64
+from io import BytesIO
+from captcha.image import ImageCaptcha
+import time
+print("Content-type: text/html\r\n\r\n")
+aid=form["aid"]
+form=cgi.FieldStorage()
+try:
+    seed=form["seed"]
+    random.seed(seed)
+    checkstr=list("".join(random.choice(string.digits+string.ascii_lowercase) for _ in range(5)))
+    if not checkstr == form["checkstr"]:
+        print("Captcha's wrong")
+        raise Exception()
+    username=form["username"]
+    message=form["message"]
+    timestamp=int(time.time())
+    data={"name":"","markdown":message,"author":username,"date":timestamp}
+    storage.append("comments-%i"%aid,data)
+except:
+    pass
+
+seed=random.SystemRandom().randint(0,2**24)
+random.seed(seed)
+checkstr=list("".join(random.choice(string.digits+string.ascii_lowercase) for _ in range(5)))
+image = ImageCaptcha()
+capt = image.generate(checkstr)
+html=htmlgen.HTMLgen(pagelayout.getLayoutXML().decode('utf-8'),"Comments")
+html.appendHTML("<form action=\"comments.py?aid=%i\" method=\"POST\""%aid)
+html.appendHTML("<input type=\"hidden\" name=\"seed\" value=\"%i\" />"%seed)
+html.appendHTML("<input placeholder=\"Username\" name=\"username\" /><br />")
+html.appendHTML("<textarea name=\"message\" placeholder=\"Compose your message. Markdown is enabled.\" /><br />")
+html.appendHTML("<img src=\"data:image/png;base64,%s alt=\"Captcha image\" />" % base64.b64encode(capt.getvalue()))
+html.appendHTML("<input placeholder=\"Captcha. lowercase only. case sensitive\" name=\"checkstr\" />")
+html.appendHTML("<input type=\"submit\" /></form>")
+count=storage.count("comments-%i"%aid)
+for i in range(count):
+    html.addArticle(**(storage.get("comments-%i"%aid,i)))
diff --git a/data/articles-0.pickle b/data/articles-0.pickle
index 22728b91ee6c936a5dfb1a151f70626cde8b79d4..80de7e7cc99e037e4c3155428c96b4d032118daf 100644
GIT binary patch
delta 112
zcmeCu_{SvJz%sR%kpT>1r)bnp(U?4uNo1nn50+9W+p~uyC9x!RidRrgY<LexZeme(
zN`86Xlpankg+wkcErlemDLpKCiMgp$dL$k5@=G#Oixl$nQWZ+_6-rWzOB9MrO4HJ&
Il&0zd0PI#J#{d8T

literal 5130
zcmcK3y-ve06oz4j3ZY7{Fu`;-I-n}G&EL!fGZJE8a1*1NG<Fp`R2h)CfQ;dmxD&1e
z+yVmO0SWnwIwkgbYfI15;Q4KLWBuIrqsM;K4GQU1fBC9!ue*VfmFl~ltC@Bbev-U$
zzVEgwS(k-fn!bDa`sQb9{goEhdCF@Q#uPMdN!DKHb2VPH!|>eLhL+YGc)HW3AnnN-
zTJ5c*Hso}n4rykW>Os}ihPAmgBwa~Wm~P26(<*FPz5AFt9A5a<KMTv-u)A8!*XtS=
z#!MUkH6rA4Th}UIzp1Ix&dX9cQqt*pJ0AAkrfmGo*5PnPINV&DvTuIehc3VGWBXh#
zWUhT1U&o&RyeiXF({O|d**ltKS@w6~{(l7qFK~E4zzaw4!ZEyX0xz7x3unm-`@h9y
z_(Xcu(J9iijuPozM~U>XqeObyQ6fF<D3RWFlt_;|O5k-fyl#fq&G5PzUN^(*W_aBU
zubbg@GrVqw*Uj;|IbJu%>*jdf9Iu<>b#uIKj@Qlcx;b9A!0Q%x-2$&$;B^bUZh_Y=
Q@VW(Fx4`Qbf9Y1^caFn)Pyhe`

diff --git a/data/articles-1.pickle b/data/articles-1.pickle
deleted file mode 100644
index fd00363a50b248bd41515305ae20a55569eb5616..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4966
zcmcK8u}Z{16h>i-Ad6sSXO(g*$*Ozro!ZV9u#hcA6WNeWBH0OIA@~4Oj_+#_ixjdT
zdWPE$r}~=zJ^Q#nJNkN?w0uj;n03CbQaru!&;GFvuX(8UA;qlpp-Q(+v$>0l)(=hD
zzjP^{hi$#jr|ZV{p&Igak@rveswj$+6p#HFw*8ReqMSbL>aI!SKO|Os;*w8X@ri3b
zvE~!PCzMYZpKy3Wc-_M57GAgTx`o#*yl&xj3$I&v-NNfuUbphPmDjDjZsm0=uUmQD
z%Ij8MxAMA;*KNFR<8>Ra+j!l^>o#7u@w$!IZM<&B>vp_u$Ln^yZpZ6(yl%(qc7M?Q
d!?tv2mvVFE-&@vh+OiJqQNK;hmCqB^#V6@tJ{$l5

diff --git a/data/articles-10.pickle b/data/articles-10.pickle
deleted file mode 100644
index e9b496b8b99065af3a8bbb48a6c6ccc980773e4d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5016
zcmciEu}T9$5XNzfLqxE$OtWPw+1Z^WTBq{`tWvDrN{-9jh07k2Lhu3BZhc=5E87{!
zH%vM3uYNFJ)zA0+)!*#O^0O@Sb(qqA7)!pX!`L30zAd?`LyF}&wY!&G^`VO;-)+M&
zyfx`;Qaq*kx|^@-;iE5kk@n5W%-c`hYaGqWS~I*Gvew>~=~4{>G#sGe0SyK;R)EGD
z(AWSPkATM0<r@TWP5|cwa83Z{1aM9O=LB$00Otg7P5|c);M@V6JAiWsaP9!k9l*I0
zIG>cis1rC>Hw4br4S{oQ!wa0N8v^I*hQPVHA#kp42%M`M0_W-mz_|xF_W<V};G6-@
d8Q`1&&KcmG0nQoVoB_@m;G6-@`M>k{@Cy#)Nw)w1

diff --git a/data/articles-11.pickle b/data/articles-11.pickle
deleted file mode 100644
index 048e94b1c7b0addc694bba9aedad25da925539a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5016
zcmciGu}TCn5XNzfMGnEr(q_x6WKZ2mrnd71tgeV|<d$`JWiL6g5PX2x#rJg;3lT;T
z=Dv_(x_|W}VP1>(x08dfv(C$xyi7&og3s5nTi>K&aJ|pz_{u%HyEZ(R!EZxOhc1TA
zIOVix+|)g^LpP88JT~Lgkke_{wA*sNL+o$;RMvG>j`!uNs;Z+L_tjVd8s~t<1)y;W
zXw-lP0U8F-uz&{dzd-=!1aM9O=LB$00Otg7P5|cwa83Z{1aNKu&JDo10XR1R=SFb8
zQ~bjj!MSQfaIV@AoU1kj=c*0Cxn{!(&Q%+NbJd36T(u!MS8V{CTYz&5aBcz4Ex@@2
uIA?%!1~_Mca|SqPfO7^oXMl4CIOpHa|5|qO53v7PpndP%KHrPz&prS!<x1rM

diff --git a/data/articles-12.pickle b/data/articles-12.pickle
deleted file mode 100644
index 14bb170849481c86f121c38779a55348c4c8a374..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5016
zcmciEu};G<5XNza2%$<$j4U2IRX+PDFn8kxm^v6@)F@4YQirMo5)WWD^S(qp0e6V+
zbi-}`=_lPs_4Rpm_A}eEd@svf)gi_5@YZf0^Ld!kZWv3xsKeOqo4%dTZa(Yb*q3~r
zcFn=e+fUt79L?HVGrSnG)-Fn}`q0IaFE`;eJU8iNQaq$G{kcJah66M_puvE~4WO|G
zG;RTnJ3!<9{~H8wP5|cwa83Z{1aM9O=LB$00Otg7P5|c);M@V6JDKyN=J#<j=emZ>
zxvn8|u4~Ag>l!lWx`xcTt|4=-YIvD*T|?$v*8n*80Ouay+yk6@fO8LU?g7p{z&Qh)
dGr&0moHM{V1DrF!IRl(Cz&Qh)^Dmso)i;F0N>Km+

diff --git a/data/articles-13.pickle b/data/articles-13.pickle
deleted file mode 100644
index b6fe97bec2fc33de1a646bb869804ddc65034be2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5016
zcmciGu};H4490PW2vtZ-j4U^HLMc$kp4oT-rVa-=)F>oD=|wFA5)W`}$NLg7yPeE;
z^5E@1{dAJQil6VRv%j~=%g?+_Men<i)8&JI_b*NSa53y+PUn7#+hNRUQTwrdYx;Ix
zyLqjLeV@~H+%`KmPd|0fVRW=E-SFyGWm#V2RMb9({J3v7Pm^V11!&v?8h3!kJ)p4$
zGzieB01XB-<o_E4a83Z{1aM9O=LB$00Otg7P5|cwa83Z{mE!zh{GV5fbMuDc+`OSU
zH*YA;%^Qky^M>NwyrDQZZz#^q8;W!51_PWkz&Qh)Gr&0moHM{V1DrF!IRl(Cz_|dN
m3&6PmoD0CY0GtcJxd5EYDd*au>c~y&)cr~T&gGc%aPtc`>q~$D

diff --git a/data/articles-14.pickle b/data/articles-14.pickle
deleted file mode 100644
index d90aba08de1c87b9408ea783f942641195a0c69a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5016
zcmciDF;2ul425Be2q7dYN}4IRLgU!5P}6Y%sx1aGXrpWrl${8+K;i&HH{6$q6JR5r
z<-*-xeey^3^?82uGn=w{FRNTNA;oh4)@>g0ahTI~oJu}v!qn~Bp<B*=Ih*lyDET67
z+r3+MnES^#xwZFhe0Jo$KP|Z$LLW;$y9+PjsZ9r$;y#u6&kX`JYCwYl4FNQ+0F7%v
zV-0BB02;Ud-ync<0yrmta{@RgfO7&kCxCO(IX_tbAnBaj8an5uMy+#hYv`QY8an5;
zhR(UIp>u9)=$zXcI_I_qz<CXDUIUynz&Qh)Gr&0moHM{V1DrF!IRl(Cz&Qh)3&6Pm
coD0CY0GtcJxd5CCz_|dN3&6Sj!g;*>28KRL>;M1&

diff --git a/data/articles-15.pickle b/data/articles-15.pickle
deleted file mode 100644
index dc2d261d85587d66ba8c59d7e6ecf5f3b199935f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5016
zcmciGu}cFn6vuIgL!{v3=#sIMT(wQ!o89~eoH|4=(&M~4x#o}-3jG7(7XM$5g5dCQ
zkmoOC$o8E+NqEQN^W*C5wAOik$n$jW$GGW-oGvOqG_Q5nOviRQR{eXI({<d`TQlu$
zY@fnl+^RJFi&>OqIm@Z2d<^+v*Q_5?(fKyybb0UJ{Bs?5CWdXy<DVJ}K;stBxC1nn
zfW`{Yuz-dGGzie(|8H1;a|>{80nRPJxdk}40OwY4zE^%ftl(U|AvjlW2+p+|PH?W?
z5S*(w1n24v!MS=vaIW4EoU1ng&K<zH12}g8=LB$00Otg7P5|cwa83Z{1aM9O=LB$0
u0Ot&F&H(2OaLxed3~<f>=L~Sp0OzdaTpo9QPsC2Yso%zE{NpMZ!_60jI!qb>

diff --git a/data/articles-16.pickle b/data/articles-16.pickle
deleted file mode 100644
index 3ab22223818a53b1f3cac47d2fe97379f42f56e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5016
zcmciCu};G<5XNza3ROr<j4U2IA=`J*GI!$zm^v6@)F>pWQb(w*kaz&InfE2)1vu&8
zvu-@yfBN}j_Vsyn_VYGn@m>~r-iD#6`nRs+>$I)+W}0qnpW<Lv)|&psIBV@i$+IrB
zvE<8j*oEgh9ZZV*RPuQk)3zT<o>$YM*Sc$_)heV|9*)iCas0L601Xdl5TL<;#x0<6
z2WTt-jTNAA|NjjKaP9!k9l*KMIX_AMM5l8uYv`QI8an5)hR(UHp>r;4=$wlhUguoa
z&^ebibk1cBfO8LU?g7p{z_|xF_W<V};G6)?3E-Rn&I#b00L}^EoB+-V;G6)?3E-Ro
e&KcmG0nQoVoB_@m;G6-@8Q`1&&iN0V$D40i3QLCo

diff --git a/data/articles-17.pickle b/data/articles-17.pickle
deleted file mode 100644
index 3b0c2498536dcf102ce10db3c42b9ea56a45ba11..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5016
zcmciGu};G<5XNza3ZY6&j4U2Ip%iHDZf4^Jm^v6@)F>oDsUw8iN<4ts%=;2CAC-`f
z&+>TIfBJd2kJ;Df#mUcE=fxo}(y1TgrXO-TtNhTs)LoO)tn+Qi>HN;W`lmX+yBM}{
znrNqqs(<Tpx{RB8>!#a{?PC}muL{>cyJb-n^XYx%W61ZrX8kZ)HkN?KHK1_=XxsuC
zD?p<JGzidOKtuk&Q39Noiu1kkUs5X0%^Qky^M>NwyrDQZZz#^q8;W!DhT`13p*Xj0
zkmB6D0dP(L=LB$00Otg7P5|cwa83Z{1aQs(=L~Sp0Ot&F&H(2OaLxed3~<f>=L~Qz
m0Ota5E&%5Oa4rDn0&p$>=K^pp$DAKqe913(|FBpa!__w(15C95

diff --git a/data/articles-18.pickle b/data/articles-18.pickle
deleted file mode 100644
index 584587b1d1f4bf76bc4a7bfff539f734adc656e7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5016
zcmciBu};G<5XNza2vtZ-j4U2IA^Yxtc4p%Rm^v6@)F>oDsiUeAm3RQNnfE1P#S7^8
zPB+~4*A2h->ht5`<a;)GdCbdn>ZiCJ#+(+lAKRCvZ|Ad{&wAMRIbFtWvorJdQ}-A~
zv$oa@&&FA6&vL42A49%>Yc~(6>U|e-I=}O;{;7!v6T>d%=}!#@Xb_;mfQA4X*MP<i
zpm7UmtbR6*+CJ9*-*5%z+JCr$bM;2Sxq74ET)k0nuHGm(S8o)Yt2YYH)f)ik4&a;s
z&I#b00L}^EoB+-V;G6)?3E-Rn&I#b00nQoVoB_@m;G6-@8Q`1&&KcmG0nQoVTma4m
c;9LOC1>jr&&IRCH0L}&ATma7Hm(Ii07okv0A^-pY

diff --git a/data/articles-19.pickle b/data/articles-19.pickle
deleted file mode 100644
index b26562dc1870ea31e64942e4b3629f5d62bcabe9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5016
zcmciBu};G<5P)HZ2q7dUMwX17PztTjH?#2qOdSjfY7~;7)KS%;hzBs6d0!${vVhEg
zy5Y8eIDPNg=f~yA_iW<g7#HExjegq?F`SidXkO~Bna*}P%YNU*aOJo4E}ym=+sA6i
zbzS8BbG|H!;yi||biRuB$7b^ovd*<t3>SCq)jiezko#)q<M^k>5@_52ja#6x0vhX|
zjknZ4H$X#xh6Nh>{|z(aJoV4bjPvA;8Ry9xGtQGYW}GK)0L~5I+yKrE;M@St1#m8a
za{-(S;9LOb0yr1Ixd6@ua4vvz3plrca|<}PfO88tw}5jCIJbav3plrca|N6$;9LRc
X3OHB5xdP4=aIS!J1)S?IombaiLW)gM

diff --git a/data/articles-2.pickle b/data/articles-2.pickle
deleted file mode 100644
index e109ab26e01c6fdb117e25d7ad297fb45db960d6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5016
zcmciGu}Z{15P)HeAR<^<+N8WnGBfL`wVf|ub;W8T7jj9C+y=1_e1NrE-`8kmo520c
zz%&DY^)>sMeSck^{Jl+DeWX=9^<&ufLyBjmADUg=H7RDL4^?{HHJhiHb-t}qym;_?
z|5AtdJXD7;UANP9*}ruuUWILa$fxPX_PH8zDT=&*{awX*8jsZwprJs+fQADaH$Y<z
zG;V>$9niQxenSA~0yr1Ixd6@ua4vvz0h|lqTma_+I9I^A0?rk1u7Gm|oGaj50p|)h
zSHQUf&JA#GfO7+!8{pgk=LR@8z_|g=4RCINa|bwgfO7{pcYt#TICnFgw+sJ$+zjW7
S8#A0QZp?7Lxbfe4b^Qar8%In4

diff --git a/data/articles-20.pickle b/data/articles-20.pickle
deleted file mode 100644
index 920b8012cc83f2fa0f04b4589cbfcb1253635bf2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 116
zcmZo*nVQJ}0kKnRr)czW<R%tnr{tICP3e&-$;d2L0HVCo+@#bZ1w#V^1BLuFFwHfk
zhb1pDH+4!6uXAESVsd6lr9w$+aS2d3C9x!RidS8BY<Le_VrfZ6e$kX3jufD&IhlFc
IQ%V!{0GFgFZ~y=R

diff --git a/data/articles-3.pickle b/data/articles-3.pickle
deleted file mode 100644
index 56d9bd4679ee3cc95ffa997df2d0a9bcc7534f89..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5016
zcmciGu};G<6op}i2vwDs7+E}asuF1Ly`I_n0!$qYF=`azRH>t?15zKrZ03E5Ix%1-
z_gEh8_D|n(&c*lF{mtcV<Ki<eLQxxU<ECr3FQIUzvoYK~o4t8!{7HFx@G;z)(eL^p
zhFNWf_M>s_bavBO_eU4QgWoj=HGMaBuXa$?x>WtUs>-sQ$MIT?3eb22G@byB6`-*O
zGzidOKtlixef<UjoD;w~0h|-SIRTs#z&Qb&6TmqEoD;w~1DrF!IRl(Cz&Qh)Gr&0m
zoHM{V1DrF!xd5CCz_|dN3&6PmoD0CY0GtcJxd5CCz_|uE*8t}_;oN21GIYXu)<(j4
j)<(j4)<(j4)<(klrSaELmDsfY+pl!OdDg~n=XUu6MH5JS

diff --git a/data/articles-4.pickle b/data/articles-4.pickle
deleted file mode 100644
index 6c6ad5329c521a69eb431c7cccef38c62290d74e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5016
zcmciGKTE_g7{_skLk_{o(WT=}(&tJ2H@o=;oNkD=a;4W)dMV-{_yXb<->>Cd925h=
zZ^#q~-|4gb-WDJ4CkOkpj;q(W3d`P(T|GRz7*74B-4*k7Q-9x#g_dP8JQh-x<xvcW
zcJiBHjA2>NKenywVpuraH!&RF*eCnY`j^5tJ3l|y);ICib?dw7&xQaE1sVouR6ye#
zXj}k|OQ3NDG_L=@A%JrMoD1Mw0OtZY7r?my&INETfO7$yE8tuK=L$Giz_|j>6>zSA
za|N6$;9LRc25@cw=LT?Y0Otm9ZUE;7aBcwS25@cw=M~_*%5y%XYyefB^Rz~u^Rz~u
m^Rz~u^Rz~u^Rz~u^Rz~u^R&iy=fCV>KTc;~8`-|moP7fG14rio

diff --git a/data/articles-5.pickle b/data/articles-5.pickle
deleted file mode 100644
index f7d3971b9484ac75ad9f5b7e9fe23adf26ecf088..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5016
zcmciGu};G<5XNza2q7dUMi!5qP+Ho%%iN6@VCrB<P@|BfN*$pNNIZbq%=;1$0|P?b
zN&PGjxBb2R2H$J;{&sotbv9}Cl4ddMd|Rb>vGzOvP=|vH)jp({l|EGIwr@6f@zjrD
z+Yc$8m40ZR>aLl_b{fn6xl8dXZ0o(7Za22~)!-JZ-1U!cp6B^_8jsbO0~!lJ;|9=J
z0vanog8&T%Gz8Enj^7}Fa{@RgfO7&kCxCMTI46K}0yrmta{@SLfO7^oXMl4CIA?%!
z1~_Mca|SqPfO7^o7l3mCI2V9(0XP?ca{)LPfO7#j7oGE+<?k#y=cY!Xb8c(soZA{Y
t=eCB<xvimdZfoeA+ZsCOwua8Rt?^Iif9=4EAC7-rpnWgcJ|8$%*B>J$NfiJ9

diff --git a/data/articles-6.pickle b/data/articles-6.pickle
deleted file mode 100644
index 358fddaabd8317b01c56d0bb9307cc1157536fac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5016
zcmciGu}TCn5XNzfLk_{p(kA6ql9@zLYdc@S>Wb(_ZdrHtZZC^i2tGjU;`_Rsm2f!1
z;1^N_!XE;^BJ)1`{5U(>uT@#Rl|?=dV_Nq^$@3}<&2!x~CC{pmV!7KitNT1}r{k)B
z=}JCN>w0IV-Hq)-9E`Kp^iPJYwI|c1F0`@a)7!8Kk9B%ADeh7k)eQnP7|?Klh6gk*
z0gWp_V+m+n0~$B~-ync<0yrmta{@RgfO7&kCxCMTI46K}0yt-Ya|SqPfO7^oXMl4C
zIA?%!1~_Mca|Sqf0Ot<i+yR_BfO7|M?f}l6-uYJgb2`0qxuJJ1H}uZMhSxin8+zw*
vL+@N}=$*?Ay>q#tcP=*o&ON}n|D*H6qpe>@WBv#4?|It(T@TFL#(41s$KObS

diff --git a/data/articles-7.pickle b/data/articles-7.pickle
deleted file mode 100644
index 0e30b4bc071573dfaae62c2dbb10e30bcd7536f7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5016
zcmciFu};H4490PW2vtZ-j4U^1LMd(SyP1s_VCry?Lyba`Ho2%`K;i+8?RZ}zX0w^k
z^5E@1{RV#)-(NQuzq8NfM=n#*`!3{k{os%OrHSt*hAHNB>F0PD#++8QAKSO4Z<n)M
z&U!faIo-xXGnr-kxqA+y+3YGayqa}YRaZF`wT~e`p4$D>tl3xt8ux(42GH078aqIP
z01XB-ETG~3zd-=!1aM9O=LB$00Otg7P5|cwa83Z{1aQs(=L~Sp0Ot&F&H(2OaLxed
z3~<f>=L~Re0nRPJxdk}40OwY4J}UoFR&cJ~5S*(w1n24v!MS=vaIW2Of^+qT;9R{S
dI9G27&ea<L=MLc90h~L4a|dwl{&F7fegMYENw5F_

diff --git a/data/articles-8.pickle b/data/articles-8.pickle
deleted file mode 100644
index 57f145d619127396791dbff6acb3ff54593d0708..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5016
zcmciGFHgoW5XW)ELI?>8iK%=P>D`Wh8pj(zJ)*FZXBpeb)`cKQcmc(g_sbv%#07Qy
znu>E@(~s!ARUhxid*5eUHm_xqt0DBU<fH5G6z<#f;!>Pb$@^hRyKyS{pb1m=*bdz~
z_UqV;&qK*4Y1htfy~EPq#mR~HZhUa$y+16uYC?+TX6m-Li)DiV4F)u7KtlkHGeF}U
z(6|6JE&+|J|8Ee$IRTs#z&Qb&6TmqEoD;w~0h|-SIRTtAz&Qh)Gr&0moHM{V1DrF!
zIRl(Cz&Qh)*8t}=z<I4WpN;<?wc^~op*S~hD9+6rigWXZ;@rHUI5%%7&aE4wI5%%7
m&dnPD=K^pp0Ota5E&%5Oa4ts9e^y^#&;HMSnfx-p#M4hac}W}q

diff --git a/data/articles-9.pickle b/data/articles-9.pickle
deleted file mode 100644
index f495a77f52ec5d86bae2ea1e1aa0b85b0d765690..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5016
zcmciGu}Z{15XNzfAR<^<+H851<n(SPQ``9hR#&WM<w8s%$p*0ye1NrE-`6M>7K4S1
z-!jE?|LO<JycX|orw3nemsc-&m5SbXA*Yio|LE_U`0QesVoryCj{9NE>8SQ&`_T05
zvUbZ_4^MqgXK~+5Zkc}WZo}v{+tLm9Ze5n;aZW|;W60N2ySte!8*4!00?@bwG&X?7
z7SJF-g8_{S(2)Oc5WqPBoD;w~0h|-SIRTs#z&Qb&6TmqEoHM{V1DrF!IRl(Cz&Qh)
zGr&0moHM{V1Dsci^Jx5UuN3Fz4aK>6Lve22P@J1L6zAp*#kqMyac<sFoSQck=hh7Y
qI2V9(0XP?ca{)LPfO7#j7l3p5gY)k**C*9qZ)5V)w{lpU!}$kXTuMp+

diff --git a/htmlgen/htmlgen.py b/htmlgen/htmlgen.py
index d7ee4b5..6092419 100644
--- a/htmlgen/htmlgen.py
+++ b/htmlgen/htmlgen.py
@@ -1,6 +1,7 @@
 import cgitb
 import markdown2
 import datetime
+import storage
 cgitb.enable()
 class HTMLgen:
     def __init__(self, layout, title):
@@ -10,21 +11,27 @@ class HTMLgen:
         self.authors=[]
         self.dates=[]
         self.title=title
+        self.asideHTML=""
     def addArticle(self, name, markdown, author="darklink", date=0):
         self.articles.append(markdown2.markdown(markdown, extras=["tables","spoiler"]))
         self.titles.append(name)
         self.authors.append(author)
         self.dates.append(date)
+    def prependHTML(self, text):
+        self.asideHTML=text+self.asideHTML
+    def appendHTML(self, text):
+        self.asideHTML=self.asideHTML+text
     def renderSite(self):
         nav=""
-        x=0
-        for title in self.titles:
+        x=len(self.titles)-1
+        for title in self.titles[::-1]:
             nav=nav+("<a href=\"#%i\">%s</a><br/>" % (x, title))
-            x=x+1
+            x=x-1
         main=""
-        x=0
-        for article in self.articles:
+        x=len(self.articles)-1
+        for article in self.articles[::-1]:
             main=main+("<h2 id=\"%i\">%s</h2><p>Written on <time datetime=\"%s\">%s</time> by %s</p><article>%s</article>" %(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))
-            x=x+1
-        styleargs = {"title":self.title,"nav":nav,"main":main,"aside":str(x),"footer":"Copyright 2016 Morten"}
+            main=main+("<a href=\"comments.py?aid=%i\">Comments (%i)</a>") % (x, storage.count("comments-%i"%x))
+            x=x-1
+        styleargs = {"title":self.title,"nav":nav,"main":main,"aside":asideHTML,"footer":"Copyright 2016 Morten"}
         return self.layout%styleargs
diff --git a/index.py b/index.py
index b0d6c17..9b1be82 100755
--- a/index.py
+++ b/index.py
@@ -6,112 +6,6 @@ html=htmlgen.HTMLgen(pagelayout.getLayoutXML().decode('utf-8'),"Home Page")
 count=storage.count("articles")
 for i in range(count):
     html.addArticle(**(storage.get("articles",i)))
+
 print("<!DOCTYPE html>")
 print(html.renderSite())
-html.addArticle("Markdown test","""*
-* 1
-* 2
-* 3
-
-# 1
-# 2
-# 3
-
-## half adder truth table
-
-|   | 0 | 1 |
-|---|---|---|
-| 0 |0 0|0 1|
-| 1 |0 1|1 0|
-""")
-html.addArticle("Markdown test","""*Hello, World!*
-
-test
-test
-**HI**
-SPOILERS:
->! SPOILERED!
->! ロボボプラネットはいいぞ！
-
-""")
-html.addArticle("Markdown test","""*Hello, World!*
-
-test
-test
-**HI**
-
-
-
-**TEST**""")
-html.addArticle("Markdown test","""*Hello, World!*
-
-test
-test
-**HI**
-
-
-
-**TEST**""")
-html.addArticle("Markdown test","""*Hello, World!*
-
-test
-test
-**HI**
-
-
-
-**TEST**""")
-html.addArticle("Markdown test","""*Hello, World!*
-
-test
-test
-**HI**
-
-
-
-**TEST**""")
-html.addArticle("Markdown test","""*Hello, World!*
-
-test
-test
-**HI**
-
-
-
-**TEST**""")
-html.addArticle("Markdown test","""*Hello, World!*
-
-test
-test
-**HI**
-
-
-
-**TEST**""")
-html.addArticle("Markdown test","""*Hello, World!*
-
-test
-test
-**HI**
-
-
-
-**TEST**""")
-html.addArticle("Markdown test","""*Hello, World!*
-
-test
-test
-**HI**
-
-
-
-**TEST**""")
-html.addArticle("Markdown test","""*Hello, World!*
-
-test
-test
-**HI**
-
-
-
-**TEST**""")