BREAKING CHANGES(sitecontents and title): pageContent and pageTitle shortcodes

fixed by deleting all html files in the public directory

luago.lua

@@ -12,20 +12,32 @@ for file in lfs.dir(currentDir) do
     -- ignore "." and ".." files
     if not(file:sub(1,2) == ".." or file:sub(1,1) == '.') then
         local filePath = currentDir .. '/' .. file
-        -- match file names ending with ".md"
         if file:match("index.md") then haveIndexmd = true end
         if file:match("index.html") then haveIndexhtml = true end
+        -- match file names ending with ".md"
         if file:match("%.md$") then
             markdownFileCount = markdownFileCount + 1
             markdownFiles[markdownFileCount] = {
                 options = {},
                 filePath = filePath,
                 fileName = file:sub(1, file:len()-3),
-                content = ""
+                content = "",
+                hasHtml = false
             }
         end
     end
 end
+-- check html files with same name as the md files
+for file in lfs.dir(currentDir) do
+    if file:match("%.html$") then
+        for index, value in ipairs(markdownFiles) do
+            if file:match(value.fileName .. ".html") then
+                markdownFiles[index].hasHtml = true
+                print(value.fileName .. "file has a html template file.")
+            end
+        end
+    end
+end
 
 -- stop the program if "index.html" or "index.md" doesn't exist
 if (not(haveIndexhtml) and not(haveIndexmd)) then return print("Can't find index.html or index.md!") end
@@ -110,8 +122,12 @@ end
 -- get index.html content
 local indexFile = io.open("index.html"):read("*all")
 
--- remove and create "public/" directory
-lfs.rmdir("public")
+-- delete html files and create "public/" directory
+for file in lfs.dir(currentDir .. "/public") do
+    if file:match("%.html$") then
+        os.remove(currentDir .. "/public/" .. file)
+    end
+end
 lfs.mkdir("public")
 
 for index, _ in ipairs(markdownFiles) do
@@ -121,6 +137,7 @@ for index, _ in ipairs(markdownFiles) do
         local htmlFile = io.open(workDir .. "/public/" .. markdownFiles[index].fileName .. ".html", 'w')
         if htmlFile then
             local content = indexFile
+            if markdownFiles[index].hasHtml then content = io.open(markdownFiles[index].fileName .. ".html"):read("*all") end
 
             -- STYLING
             local function styleLists(s)
@@ -243,19 +260,56 @@ for index, _ in ipairs(markdownFiles) do
             end
             markdownFiles[index].content = styling(markdownFiles[index].content)
 
-        -- replace <!-- sitecontents --> with markdown file content
-        local start_idx, end_idx = content:find("<!-- sitecontents -->", 1, true)
+            -- start_idx, end_idx = c
+            -- {{pageContent}} shortcode
+            content = content:gsub("{{pageContent}}", markdownFiles[index].content)
+            -- {{pageTitle}} shortcode
+            content = content:gsub("{{pageTitle}}", markdownFiles[index].options["title"])
+
+            local start_idx, end_idx
+            -- list shortcodes
+            while content:find("{{list:}}", 1, true) do
+                start_idx, end_idx = content:find("{{list:}}")
                 if start_idx and end_idx then
                     local first = content:sub(1, start_idx - 1)
                     local second = content:sub(end_idx + 1)
-            content = first .. markdownFiles[index].content .. second
+                    if second:find("{{:list}}", 1, true) then
+                        start_idx, end_idx = second:find("{{:list}}")
+                        if start_idx and end_idx then
+                            local shortcode = second:sub(1, start_idx - 1)
+                            local third = second:sub(end_idx + 1)
+                            local function formatShortcode(element)
+                                local dir = markdownFiles[index].filePath:match("(.*)/[^/]+%.md$")
+                                local results = {}
+
+                                for mdfile in lfs.dir(dir) do
+                                    if mdfile:match("%.md$") and mdfile ~= markdownFiles[index].fileName .. ".md" then
+                                        local fileName = mdfile:match("(.-)%.md$")
+
+                                        for i, _ in ipairs(markdownFiles) do
+                                            if markdownFiles[i].fileName == fileName then
+                                                local copy = element
+
+                                                -- replace items starting with list.item.
+                                                for option in copy:gmatch("{{list%.item%.(.-)}}") do
+                                                    local value = markdownFiles[i].options[option]
+                                                    if value then
+                                                        copy = copy:gsub("{{list%.item%." .. option .. "}}", value)
+                                                    end
+                                                end
+
+                                                table.insert(results, copy)
+                                            end
+                                        end
+                                    end
+                                end
+
+                                return table.concat(results, "\n")
+                            end
+                            shortcode = formatShortcode(shortcode)
+                            content = first .. shortcode .. third
+                        end
                     end
-        while content:find("<!-- title -->", 1, true) do
-            start_idx, end_idx = content:find("<!-- title -->", 1, true)
-            if start_idx and end_idx then
-                local first = content:sub(1, start_idx - 1)
-                local second = content:sub(end_idx + 1)
-                content = first .. markdownFiles[index].options["title"] .. second
                 end
             end