From 312d4546f8da49ce44c9da88c929a558b29d6b3d Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sun, 14 Nov 2021 16:04:05 +0100
Subject: [PATCH] Continuing working on blog engine

---
 devblog/.build_blog.py.swp              | Bin 12288 -> 16384 bytes
 devblog/build_blog.py                   |  32 ++++++++++++++++--------
 devblog/source/2021-11-14.md            |   9 -------
 devblog/source/templates/.blog.html.swp | Bin 12288 -> 12288 bytes
 devblog/source/templates/.post.html.swp | Bin 12288 -> 0 bytes
 devblog/source/templates/blog.html      |   2 +-
 6 files changed, 23 insertions(+), 20 deletions(-)
 delete mode 100644 devblog/source/2021-11-14.md
 delete mode 100644 devblog/source/templates/.post.html.swp

diff --git a/devblog/.build_blog.py.swp b/devblog/.build_blog.py.swp
index 1caeb9ca6ac0a042420e7caef5fba62f937e4bfd..8a5e3c135da9d5489d5a23018e893cd91fe31758 100644
GIT binary patch
delta 1132
zcmaje+iTNM90%~z+cvj#?L_c0k+T*d8)<d=GAlt5giYA+Ixl5p*^+M2G%3mHblzGR
z_#%R}qJmHEVNX762IgNd_Ap^Ze4a1r(;PD2#M?I~+KC_@_?#x^B;Vi3Nm?E$mjfN6
z`-l1mXm7fQpv4JUPgImBeM1_L@2hl7&ObU6s*FS$i!7JwjS}}$XlrXMNJ_Xi=-q&J
zyV@S#-X8K#>Z4_MXM8F4fQF;nFe7*uBOKS#@lq{H$P1VR4bH<5oP!jEVX>8vhfsy9
zkcCTd5eDHH90Urj@V$kQZ}1g9!Wzs$5e`ED2)u2^;%m)>tUv`$1A)(52w8xq&<jaO
zz(x~-;0Zhi8wOzj+Tcqg3c@Vhh3jBIA5aLwY6CK08qPLg^Ab4Nh!FA$mSF};&<}mk
z2~k)J6Y?77;11k`6VMNb-~+aO8D`)aTm~HkXoHv7_XU`R`%nZ+MrXoNI0D_!1>Q^A
z0TfNoQCT*Xye7+3l4!yowKZ0>O*+ByhFnm_HGi~zN+mjKSmV_n$z3I$a*Ov~-k4%&
zrmEPP`cZwVU^&dmQ2rzG(J{+p+BJr_8-9g96S7m9Vh>}^v23QP!tZ2%T%=dDDalYu
z`B7D&1&3v53Vm8tn3iUiWvjZW7(!PUFO;)v>cvsrtgkD>XZUJ1i};KCmHppnBvdDo
zr%Gw1P{30Q-rasd??HIhzo$_2B(4{j&J0cBy-2;~OI{~ZJ&%o-Z7t_Wn};HQCsO@Q
z@M<kyHJYRjvuyWW@?OAQ+}jihW{0aQ-Md4E?zrpSkw7&pUU0MGbRgiktEohAkD?Ot
vJVr<jy#Fk|2;ScFF}E{5AM4@C1zR_nkXH|QWxXx^`=gQNyrP@3oXC)$i9`Vv

delta 721
zcmYMwO=}ZT6o>IMd1<vKHnoaMySO%1lBSKi5UQYEsHjN6O{x$>on|J@U`*0v(h4dK
zU5EumY7|#0T?y{$Y`RdX2yWF6U=XTxA-+_%7JVj$df+#6`QLNT47Xa<su#M(_Klnx
zR)g{VLWSJNzj}H-KG!wrEu_l}w-eshik%r43?`f(-YtQ4O{Qt`G&?J`j?i}JWN5K{
zZb{uyzTku=qI=n89Ghx<`dv`O!4xt$hqD+#9DckGh}^?nT*i4MaR$e506o|Y!S_uf
z-|!W6yvIB;=*Q1CkyX5H<8NQGSi%gBVs)d)M?A(&M6nf}Sl+-O%;E;p7{U?!X%+c`
zI_~2tE+U14=)kWQkvEu!jpHrcRws*PzsPeu!y{P8VhG(>@riuG3p~Lr3K&KhJMo!&
zUBN3n!~<kt!ay2haPPl}MlCGv(0UaWR#T?RHdFbZ=#!?>bL6#bc&~ekcOsT77RvUh
zWuzLNZnqnh*JE{9W$jD3(V{-?oY;L!JKgMebG@96l<iW)&}}nr7YZfA%ImpEG^%3C
zw(Oi4T^|}&mAo}kF_mSgOrg~Hh}3rN+2(xc{q6HyxmK(9b$bmf?X30rwSZ-qdE3fZ
UX6cZst;JGKvVTT%>H|HVzi?KOqW}N^

diff --git a/devblog/build_blog.py b/devblog/build_blog.py
index 6a7e23ed6c..3f2d227fad 100644
--- a/devblog/build_blog.py
+++ b/devblog/build_blog.py
@@ -22,7 +22,7 @@ Here starts the main text ...
 import glob
 from dataclasses import dataclass
 from collections import defaultdict
-from dateutil import parser as dateparser
+from dateutils import parser as dateparser
 from datetime import datetime
 from os.path import abspath, dirname, join as pathjoin, sep
 import mistletoe
@@ -37,6 +37,7 @@ TEMPLATE_DIR = pathjoin(SOURCE_DIR, "templates")
 BLOG_TEMPLATE = "blog.html"
 POST_TEMPLATE = "post.html"
 
+
 @dataclass
 class Post:
     title: str
@@ -52,8 +53,8 @@ def md2html():
     blog_template = jinja_env.get_template(BLOG_TEMPLATE)
     post_template = jinja_env.get_template(POST_TEMPLATE)
 
-    calendar = defaultdict(dict)
-    posts = {}
+    calendar = defaultdict(list)
+    posts = []
 
     for file_path in glob.glob(pathjoin(SOURCE_DIR, "*.md")):
         # parse/check if file is on form YY-MM-DD-Blog-Name.md
@@ -89,9 +90,6 @@ def md2html():
                 elif line.startswith("images"):
                     image_refs = line
 
-        # unique id for post
-        post_id = hash(str(date.toordinal()) + title)
-
         markdown_post = "\n".join(lines)
         # convert markdown to html
         html_post = mistletoe.markdown(markdown_post)
@@ -105,12 +103,26 @@ def md2html():
         }
         html_page = post_template.render(context)
 
-        posts[post_id] = html_page
-        calendar[date.year][post_id]
+        # store
+        post = Post(title=title, date=date, image_refs=image_refs, html=html_page)
+        posts.append(post)
+        calendar[date.year].append(post)
 
     # we have all posts, now insert them into the blog
 
+    posts = sorted(posts, key=lambda pst: -pst.date.toordinal())
+    for year in calendar:
+        calendar[year] = sorted(calendar[year], key=lambda pst: -pst.date.toordinal())
+
+    context = {
+        posts: posts,
+        calendar: calendar
+    }
+
+    html_page = blog_template.render(context)
+
+    return html_page
 
 
-
-
+if __name__ == "__main__":
+    print(md2html())
diff --git a/devblog/source/2021-11-14.md b/devblog/source/2021-11-14.md
deleted file mode 100644
index a5a0bb6724..0000000000
--- a/devblog/source/2021-11-14.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# A way to do things
-
-This is a test blog page for using markdown to write
-[Evennia](https://www.evennia.com) devblog posts.
-
-## Starting out
-
-I'm experimenting with a new section of the docs containing these
-blog posts (obviously the blogs are CC anyway).
diff --git a/devblog/source/templates/.blog.html.swp b/devblog/source/templates/.blog.html.swp
index 696f8b309c89cc5b151eb24c436fb284dcce6961..4f59fec23cfb1e9634fd07e10a80d0678ab26067 100644
GIT binary patch
delta 323
zcmX}iy-Nad0LJl0E>FFKXpk#X>QD%h!(Ln(S_&K@q9H0!DhrB+UW8gABo}L}_^mm&
zMdsGl5Y!R`P7MtWK|$dkP|$bk3m<rfr&_9(5^KW?Q#1Zpc0|-AbtlhPJ-?+$eyEXX
zS)uu6+lnW{pCQRJF@N@G#g+2-ain)V;~uxTzzO!y4+k$XsfHpZ(TT4pKdfUK0e&OW
zD;{uzIx_gSr6-)BXlqV!#${MK#s+$E-65T#i~>es<HM33QO5z6F@X&F;K8*TcW)tQ
r{6Eu9^_bmM&Mc;L(d_2__Lg6%nCgIMmImGCReC3C(m|nF3l6P6HC{XY

delta 430
zcmZ9^ze@sP90u^`I`7oZ!N6QJI64Rn(ITjz%L-Z|`!R$LEov4H+Eqv?WEn(Tg51*B
zkFhC*pdg~wh87`csQ!V%t)Zcw%cj2YdHKHY!~2vI<%BQQ7n_<<heQ3~xPeinnp~f3
zpmq?t@HIpM^`_|YOK$?;GM(z&?z{pF(tA7bME7(_=X6K~N|T$uoWKKZQj`Yh+X1{#
zfnuan7k$`)N4lajs*sOfW#E?fC@NzK5|<+h*rGTobYcU_l%#3W=u-rq>6$8J&;kvS
zN*;1ivkf?<IMt{qRPV-YdN`9ez1oO*+#|~?hLK<1FvkO4>uO(%K;>AmV4d9^nS3tW
zdep-yBVCM`om!O1tl#SSm;HYJ>)#R8QpucPaW<gTZ?sj1Y*n+oH@IkTt!jNgxGnww
DqP|n+

diff --git a/devblog/source/templates/.post.html.swp b/devblog/source/templates/.post.html.swp
deleted file mode 100644
index efd67a460397fa3779aeb8dc0773137155a47803..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeHNJ!lj`6n-%hjT#lT5{#P*R+8KJ16o{C1=J!~X(57aE|c8h-tKX`3B-7cjg4ud
zrGl-HM#bJzY{gPRI}^K@&c<){FSC2IH+Nhj1ZLr5=HB1D_wCH&CApdL+c&0-tHle1
z=Qz>%!Bxwf`bzJg7HPgwwfu60YuY|b)>2!2tb7y&G^f}iv(4*njhUD^PSr}rS++Q1
zyYr^!E;P!_^jWQLTR!v5y6gGHieIziXnNEPXa+iFV8NdoyE=61(!~qo+-I~fVw^m2
zt7CU<s2R`<Xa+O`ngPv#W<WEb8PE*ueFpq`A3a7H`=U~YqOmVCMj!Q{8PE)91~dbj
z0nLDBKr^5j&<tn>Gy|Fe&A=XHz?vmmJxcTw;Q#-RfB*k`jOZ8e3aA6qz%`%*6oGTV
z8DI;3za#&3jF%ALEHDUc93lD)+yhPme-0CU0T?h0tREs;1D*jlfp3FEpMZD3OW+|e
z4HSV>z~(`s72rN_1sDdl4iLQtT;L8c0BjBreFr`QAAmQ&3!n*H22KOd_aj$e1la5+
z`T@KJ?gIV5NBlwL2`~<9;Ey3|zzXmLcmON`y*(w9f16=48ptpVVT$>TJG(T=#qpz1
z!^LA|zv?<Euh?4^UF|;Sx<2bUi6Ba2JH_4t_U4V6k<L!U@R?9jO!;mE?lxwteXC^q
zW$?^1+o;vNRnj&<%tky0oJ;u%Ep|CPFR-3YIL?fZC9h`L_T=)iQLS0?Y^=fNSc5rb
zW;B~%CQy>-AkIrUflJv<pK-!!{Oe7@5_us^3rTUSF~92DjAv81*rpECt6MoY0bjku
z)kfL2Ja3}l;@T*?juDMxcGbCG$bS#{ny{|S4ibwEmga{p*Z}fCQfXQk+?<49X>s<-
zlxk%{nM_Q(<B9|)X-ugw<&?g|yR{cW@u~c*bsjX=GFK5LAR|oaqcl+cfQ$E4hK1x~
zaPrlw<Xhxxf;ALs_0^g>&+=$pNadyp8`*TW72!<2c|@z$o3xiD)xOEGN9x(L&NqAd
z?1-7FZi*albxQ4)L`LC`+@Ub3-I1zJd=bjUlm=mAN_>Uxc}|KBvQ@9u5rG|4u3SlB
zAXm$zGMV@`+V8_OKcZhU7vE+gj3+zTp!~l=x?PEQwfyuXldxgnV*aEUiWs3#k@*=w
z@fi%aP~zAzjl8Ez`ZqLc=#zZr@LrAZX%^p2=Tj6YG-KESy!k?!*`_T>GDuX}e?<vf
phGW&(L_uu+cvsqN7UK5Ja>^CAQ7|eHPZUNamSHSW!E@#*{{w~8k;?!8

diff --git a/devblog/source/templates/blog.html b/devblog/source/templates/blog.html
index 11aca95f80..b306b59501 100644
--- a/devblog/source/templates/blog.html
+++ b/devblog/source/templates/blog.html
@@ -14,7 +14,7 @@
         <script src="javascripts/newsfeed.js">
         </script>
         <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
-        <meta name="description" content="Evennia is a modern Python library and server for creating text-based        multi-player games and virtual worlds (also known as MUD, MUSH, MU, MUX, MUCK, etc).        While Evennia handles all the necessary things every online game needs, like database and         networking, you create the game of your dreams by writing normal Python modules.">
+        <meta name="description" content="Evennia is a modern Python library and server for creating text-based        multi-player games and virtual worlds (also known as MUD, MUSH, MU, MUX, MUCK, etc). While Evennia handles all the necessary things every online game needs, like database and networking, you create the game of your dreams by writing normal Python modules.">
         <!--[if lt IE 9]>
             <script src="//html5shiv.googlecode.com/svn/trunk/html5.js">
             </script>