RenderPosts now uses the PostList global variable

build.py

@@ -60,9 +60,11 @@ def GetBlogList():

                                
                                
                                
                            
                                
                                    
                                        
                                            60  
                                                for slug in PostSlugs:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            61  
                                                    print("Grabbing post list blog-posts/%s" % (slug))
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            62  
                                                    with open("blog-posts/" + slug, encoding="utf-8") as MDFile:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        63 -
                                                    PostHTML = RenderMarkdown(MDFile.read())
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        63 +
                                                    RawMD = MDFile.read()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        64 +
                                                    PostHTML = RenderMarkdown(RawMD)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            65  
                                                        Item = PostHTML.metadata
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            66  
                                                        Item["content"] = PostHTML
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        67 +
                                                    Item["raw-content"] = RawMD
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            68  
                                                        Item["rss-content"] = PostHTML.replace("&", "&amp;").replace(">", "&gt;").replace("<", "&lt;")
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            69  
                                                        Item["atom-content"] = RegReplace("</(?=.*)", "</xhtml:", RegReplace("<(?=[^\/].*)", "<xhtml:", PostHTML))
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            70  
                                                        Item["rss-post-time"] = PostDateToDateObj(Item["date"]).strftime("%a, %d %b %Y") + " 00:00:00 GMT"
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -138,28 +140,23 @@ def GetLists():

                                
                                
                                
                            
                                
                                    
                                        
                                            140  
                                                return Lists
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            141  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            142  
                                            def RenderPosts():
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        141 -
                                            for post in ListDirectory("blog-posts"):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        142 -
                                                path = "blog-posts/" + post
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        143 -
                                                RenderedHTML: str
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        144 -
                                                PostMD: str
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        145 -
                                                PostPath = post.replace(".md", ".html")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        146 -
                                                PlaintextPath = post.replace(".md", ".txt")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        147 -
                                                with open(path, "r", encoding="utf-8") as PostContent:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        148 -
                                                    PostMD = PostContent.read()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        149 -
                                                    PostHTML = RenderMarkdown(PostMD)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        150 -
                                                    Title = PostHTML.metadata["title"]
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        151 -
                                                    PostDate = PostHTML.metadata["date"]
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        152 -
                                                    Revised = False
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        153 -
                                                    if "updated" in PostHTML.metadata:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        154 -
                                                        Revised = PostHTML.metadata["updated"]
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        155 -
                                                    RenderedHTML = RenderTemplate("blog-post.html", Revised=Revised, Title=Title, PostDate=PostDate, Content=PostHTML, PostPath=PostPath, PlaintextPath=PlaintextPath)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        156 -
                                                print("Building blog/%s to %s/blog/%s" % (post, BUILD_DIRECTORY, PostPath))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        157 -
                                                with open(BUILD_DIRECTORY + "/blog/" + PostPath, "w", encoding="utf-8") as PostHTMLFile:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        143 +
                                            global PostList
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        144 +
                                            for post in PostList:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        145 +
                                                Revised = post["updated"] if "updated" in post else False
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        146 +
                                                RenderedHTML = RenderTemplate("blog-post.html",
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        147 +
                                                                              Revised=Revised,
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        148 +
                                                                              Title=post["title"],
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        149 +
                                                                              PostDate=post["date"],
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        150 +
                                                                              Content=post["content"],
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        151 +
                                                                              PostPath=post["pathname"],
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        152 +
                                                                              PlaintextPath=post["plaintext"])
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        153 +
                                                print("Building blog-posts/%s to %s/blog/%s" % (post["origin"], BUILD_DIRECTORY, post["pathname"]))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        154 +
                                                with open(BUILD_DIRECTORY + "/blog/" + post["pathname"], "w", encoding="utf-8") as PostHTMLFile:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            155  
                                                        PostHTMLFile.write(RenderedHTML)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        159 -
                                                print("Copying blog/%s to %s/blog/%s" % (post, BUILD_DIRECTORY, PlaintextPath))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        160 -
                                                with open(BUILD_DIRECTORY + "/blog/" + PlaintextPath, "w", encoding="utf-8") as PostPlaintext:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        161 -
                                                    PostPlaintext.write(PostMD)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        162 -
                                                sitemap.append(SITEMAP_HREF + "/blog/" + PostPath)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        156 +
                                                print("Copying blog-posts/%s to %s/blog/%s" % (post["origin"], BUILD_DIRECTORY, post["plaintext"]))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        157 +
                                                with open(BUILD_DIRECTORY + "/blog/" + post["plaintext"], "w", encoding="utf-8") as PostHTMLFile:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        158 +
                                                    PostHTMLFile.write(post["raw-content"])
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        159 +
                                                sitemap.append(SITEMAP_HREF + "/blog/" + post["pathname"])
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            160  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            161  
                                            def RenderPage(PageInput: str, ContentDest: str, AllowSitemap: bool = True, **kwargs):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            162  
                                                print("Building views/%s to %s/%s" % (PageInput, BUILD_DIRECTORY, ContentDest))
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -169,6 +166,7 @@ def RenderPage(PageInput: str, ContentDest: str, AllowSitemap: bool = True, **kw

                                
                                
                                
                            
                                
                                    
                                        
                                            166  
                                                    DestLocation.write(RenderTemplate(PageInput, **kwargs))
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            167  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            168  
                                            def CreateJSONFeed():
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        169 +
                                            global PostList
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            170  
                                                CreatedJSON = {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            171  
                                                    "version": "https://jsonfeed.org/version/1",
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            172  
                                                    "title": "Steve0Greatness' Blog",
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -215,6 +213,7 @@ def RenderLists():

                                
                                
                                
                            
                                
                                    
                                        
                                            213  
                                                    file.write(RenderTemplate("list-index.html", Content=ListIndex))
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            214  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            215  
                                            def main():
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        216 +
                                            global PostList
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            217  
                                                PostList = GetBlogList()
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            218  
                                                print("Wiping directory")
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            219  
                                                WipeFinalDir()