initial readme

fixed by deleting all html files in the public directory

README.md

@@ -1,2 +1,22 @@
 # luago
 Static website generator written in Lua
+> Still in development
+> Please don't use for production yet
+> There are a lot of work to do
+
+## what it does
+- reads .md files in that directory and create html files
+- transforms basic markdown syntax to html styling
+
+### features
+- read all md files
+- check if index.md and index.html files are exists (if not stop with error)
+- read options section on every md file
+- clear public/ directory and create if not exists
+- create html files using same name template html file
+- if there are no html file for that md file, use index.html
+- {{pageContent}}, {{pageTitle}} and {{list:}}-{{:list}} shortcodes
+- list.item.<option> shortcode inside list shortcode
+
+luago name
+: **lua** + **hugo** (can't thing of anything better)

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
@@ -51,7 +63,7 @@ for index, file in ipairs(markdownFiles) do
             end
 
             -- fill options table
-            for i, value in ipairs(lines) do
+            for _, value in ipairs(lines) do
                 if value:sub(value:len(), value:len()) == "\n" then
                     value = value:sub(1, value:find("\n")-1)
                 end
@@ -73,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")
@@ -87,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)
@@ -109,19 +121,23 @@ end
 
 -- get index.html content
 local indexFile = io.open("index.html"):read("*all")
-local siteName
-local siteTitle
 
--- remove and create "public/" directory
+-- delete html files and create "public/" directory
-lfs.rmdir("public")
+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, 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
+            if markdownFiles[index].hasHtml then content = io.open(markdownFiles[index].fileName .. ".html"):read("*all") end
 
             -- STYLING
             local function styleLists(s)
@@ -160,6 +176,37 @@ for index, value in ipairs(markdownFiles) do
 
                 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 = {}
@@ -170,8 +217,23 @@ for index, value in ipairs(markdownFiles) do
                 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>")
@@ -193,25 +255,61 @@ for index, value in ipairs(markdownFiles) do
                 s = s:gsub("`(.-)`", "<code>%1</code>")
                 -- horizontal rule
                 s = s:gsub("%-%-%-", "<hr>")
-            -- TODO: p for normal text
 
                 return s
             end
             markdownFiles[index].content = styling(markdownFiles[index].content)
 
-        -- replace <!-- sitecontents --> with markdown file content
+            -- start_idx, end_idx = c
-        local start_idx, end_idx = content:find("<!-- sitecontents -->", 1, true)
+            -- {{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
 
@@ -221,4 +319,4 @@ for index, value in ipairs(markdownFiles) do
             print("Error: Cannot create html file for " .. markdownFiles[index].filePath)
         end
     end
-
+end