From c28b3167a1b181e8ac8d01f132073763ce7e3cbd Mon Sep 17 00:00:00 2001
From: Govindas <git@govindas.net>
Date: Sat, 22 Jan 2022 11:26:09 +0200
Subject: [PATCH] Start using html5tagger better

---
 generate.py | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/generate.py b/generate.py
index c96ab2f..d7b99a9 100644
--- a/generate.py
+++ b/generate.py
@@ -1,5 +1,5 @@
 import os
-from html5tagger import Document
+from html5tagger import Document, E, HTML
 from shutil import rmtree
 
 #if homepage is at Home.page, set homepage to "Home"
@@ -22,31 +22,32 @@ navbarfound = False
 if os.path.exists("./navbar"):
   with open("./navbar", 'r') as navbarfile:
     navbarfound = True
-    navbar = ""
+    navbar = E
     for line in navbarfile.readlines():
       split = line.strip().split(";", 1)
-      navbar = navbar + "<li><a href='" + split[1] + "'>" + split[0] + "</a></li>"
-else:
+      navbar = navbar.li(HTML("<a href='" + split[1] + "'>" + split[0]))
+
+#checking false instead of else to be more sure
+if navbarfound == False:
   print("No 'navbar' file found, there will be no navigation bar.")
 
 #generate pages
 for file in os.listdir("./"):
   if file.endswith(".page"):
-  with open(file, 'r') as page:
-    pagetitle = os.path.basename(file).replace(".page", "")
-    doc = Document(pagetitle, lang="en")
-    for line in page.readlines():
-      doc.p(line.strip())
+    with open(file, 'r') as page:
+      pagetitle = os.path.basename(file).replace(".page", "")
+      doc = Document(pagetitle, lang="en")
+      for line in page.readlines():
+        doc.p(line.strip())
 
-  #creates ./website-output/pagetitle/index.html file if it is not homepage
-  if pagetitle == homepage:
-    foldername = ""
-  else:
-    foldername = "/" + pagetitle.replace(" ", "-").lower()
-    os.mkdir("./website-output" + foldername)
+    #creates ./website-output/pagetitle/index.html file if it is not homepage
+	foldername = ""
+    if pagetitle =! homepage:
+      foldername = "/" + pagetitle.replace(" ", "-").lower()
+      os.mkdir("./website-output" + foldername)
 
-  with open("./website-output" + foldername + "/index.html", 'w') as newpage:
-    if navbarfound:
-      newpage.write("<ul>" + navbar + "</ul>" + str(doc))
-    else:
-      newpage.write(str(doc))
+    with open("./website-output" + foldername + "/index.html", 'w') as newpage:
+      if navbarfound:
+        newpage.write(str(E.ul(navbar)))
+      else:
+        newpage.write(str(doc))