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
@@ -50,7 +62,8 @@ for index, file in ipairs(markdownFiles) do
                 fileOptions = fileOptions:sub(fileOptions:find("\n")+1, fileOptions:len())
             end
 
-            for i, value in ipairs(lines) do
+            -- fill options table
+            for _, value in ipairs(lines) do
                 if value:sub(value:len(), value:len()) == "\n" then
                     value = value:sub(1, value:find("\n")-1)
                 end
@@ -72,7 +85,7 @@ for index, file in ipairs(markdownFiles) do
 end
 
 -- replace markdownFiles.content with md file content
-for index, value in ipairs(markdownFiles) do
+for index, _ in ipairs(markdownFiles) do
     local f = io.open(markdownFiles[index].filePath)
     if f then
         local content = f:read("*a")
@@ -86,7 +99,7 @@ for index, value in ipairs(markdownFiles) do
     end
 end
 
-for index, value in ipairs(markdownFiles) do
+for index, _ in ipairs(markdownFiles) do
     print("---------------")
     -- print file path with index
     print(index .. ': ' .. markdownFiles[index].filePath)
@@ -108,43 +121,196 @@ end
 
 -- get index.html content
 local indexFile = io.open("index.html"):read("*all")
-local siteName
-local siteTitle
 
-for i, v in ipairs(markdownFiles) do
-    if v.fileName == "index" then
-        -- replace sitename and sitetitle
-        local start_idx, end_idx = indexFile:find("<!-- sitetitle -->", 1, true)
-        if start_idx and end_idx then
-            local first = indexFile:sub(1, start_idx - 1)
-            local second = indexFile:sub(end_idx + 1)
-            indexFile = first .. markdownFiles[i].options["sitetitle"] .. second
-        end
-        start_idx, end_idx = indexFile:find("<!-- sitename -->", 1, true)
-        if start_idx and end_idx then
-            local first = indexFile:sub(1, start_idx - 1)
-            local second = indexFile:sub(end_idx + 1)
-            indexFile = first .. markdownFiles[i].options["sitename"] .. second
-        end
+-- 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
-
--- remove and create "public/" directory
-lfs.rmdir("public")
 lfs.mkdir("public")
 
-for index, value in ipairs(markdownFiles) do
+for index, _ in ipairs(markdownFiles) do
+    if markdownFiles[index].options["draft"] ~= "yes" then
         local workDir = lfs.currentdir()
         -- create html file for that md file
         local htmlFile = io.open(workDir .. "/public/" .. markdownFiles[index].fileName .. ".html", 'w')
         if htmlFile then
             local content = indexFile
-        -- replace <!-- sitecontents --> with markdown file content
-        local start_idx, end_idx = content:find("<!-- sitecontents -->", 1, true)
+            if markdownFiles[index].hasHtml then content = io.open(markdownFiles[index].fileName .. ".html"):read("*all") end
+
+            -- STYLING
+            local function styleLists(s)
+                local lines = {}
+                for line in (s .. "\n"):gmatch("([^\n]*)\n") do
+                    table.insert(lines, line)
+                end
+
+                local result = {}
+                local inUl = false
+                local inOl = false
+
+                for _, line in ipairs(lines) do
+                    local ulItem = line:match("^[%-%*%+]%s+(.*)")
+                    local olItem = line:match("^%d+%.%s+(.*)")
+
+                    if ulItem then
+                        if inOl then table.insert(result, "</ol>"); inOl = false end
+                        if not inUl then table.insert(result, "<ul>"); inUl = true end
+                        table.insert(result, "<li>" .. ulItem .. "</li>")  -- ulItem!
+
+                    elseif olItem then
+                        if inUl then table.insert(result, "</ul>"); inUl = false end
+                        if not inOl then table.insert(result, "<ol>"); inOl = true end
+                        table.insert(result, "<li>" .. olItem .. "</li>")
+
+                    else
+                        if inUl then table.insert(result, "</ul>"); inUl = false end
+                        if inOl then table.insert(result, "</ol>"); inOl = false end
+                        table.insert(result, line)
+                    end
+                end
+
+                if inUl then table.insert(result, "</ul>") end
+                if inOl then table.insert(result, "</ol>") end
+
+                return table.concat(result, "\n")
+            end
+            local function styleParagraph(s)
+                local lines = {}
+                for line in (s .. "\n"):gmatch("([^\n]*)\n") do
+                    table.insert(lines, line)
+                end
+
+                local result = {}
+                local pLines = {}
+
+                local function flushP()
+                    if #pLines > 0 then
+                        table.insert(result, "<p>" .. table.concat(pLines, "\n") .. "</p>")
+                        pLines = {}
+                    end
+                end
+
+                for _, line in ipairs(lines) do
+                    local isBlock = line:match("^<") or line:match("^#")
+                    local isEmpty = line:match("^%s*$")
+
+                    if isBlock or isEmpty then
+                        flushP()
+                        table.insert(result, line)
+                    else
+                        table.insert(pLines, line)
+                    end
+                end
+                flushP()
+
+                return table.concat(result, "\n")
+            end
+            local function styling(s)
+                -- blockquote
+                local lines = {}
+                for line in (s .. "\n"):gmatch("([^\n]*)\n?") do
+                    local nline = line:gsub("^>%s*(.*)", "<blockquote>%1</blockquote>")
+                    table.insert(lines, nline)
+                end
+                s = table.concat(lines, "\n")
+                -- lists
+                s = styleLists(s)
+                -- paragraph
+                s = styleParagraph(s)
+                s = s:gsub("<p></p>", "")
+                -- line breaks
+                s = s:gsub("\r?\n", "<br>")
+                -- remove <br> tags around block elements
+                local blockTags = { "ul", "ol", "li", "blockquote", "p",
+                "h1", "h2", "h3", "h4", "h5", "h6", "hr" }
+                for _, tag in ipairs(blockTags) do
+                    s = s:gsub("(</" .. tag .. ">)<br>", "%1")
+                    s = s:gsub("<br>(</" .. tag .. ">)", "%1")
+                    s = s:gsub("(<" .. tag .. ">)<br>", "%1")
+                    s = s:gsub("<br>(<" .. tag .. ">)", "%1")
+                end
+                -- self-closing hr
+                s = s:gsub("(<hr>)<br>", "%1")
+                s = s:gsub("<br>(<hr>)", "%1")
+                -- headers
+                s = s:gsub("######%s*(.-)%s*<br>", "<h6>%1</h6>")
+                s = s:gsub("#####%s*(.-)%s*<br>", "<h5>%1</h5>")
+                s = s:gsub("####%s*(.-)%s*<br>", "<h4>%1</h4>")
+                s = s:gsub("###%s*(.-)%s*<br>", "<h3>%1</h3>")
+                s = s:gsub("##%s*(.-)%s*<br>", "<h2>%1</h2>")
+                s = s:gsub("#%s*(.-)%s*<br>", "<h1>%1</h1>")
+                -- TODO: h1 and h2 using == and --
+                -- bold and italic text
+                s = s:gsub("%*%*(.-)%*%*", "<b>%1</b>")
+                s = s:gsub("%*(.-)%*", "<i>%1</i>")
+                s = s:gsub("%_%_(.-)%_%_", "<b>%1</b>")
+                s = s:gsub("%_(.-)%_", "<i>%1</i>")
+                -- images
+                s = s:gsub("!%[(.-)%]%((.-)%)", '<img src="%2" alt="%1"></img>')
+                -- links
+                s = s:gsub("%[(.-)%]%((.-)%)", '<a href="%2">%1</a>')
+                -- code
+                s = s:gsub("`(.-)`", "<code>%1</code>")
+                -- horizontal rule
+                s = s:gsub("%-%-%-", "<hr>")
+
+                return s
+            end
+            markdownFiles[index].content = styling(markdownFiles[index].content)
+
+            -- 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
+                end
             end
 
             htmlFile:write(content)
@@ -152,5 +318,5 @@ for index, value in ipairs(markdownFiles) do
         else
             print("Error: Cannot create html file for " .. markdownFiles[index].filePath)
         end
+    end
 end
-