6 files changed, 165 insertions, 121 deletions

diff --git a/TODO.HTML b/TODO.HTML
index 35d83c2..70eaac0 100644
--- a/TODO.HTML
+++ b/TODO.HTML
@@ -4,8 +4,8 @@
     <meta charset="utf-8">
     <meta name="generator" contents="lcmark">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
-    <title></title>
-    <link rel="icon" type="image/png" href="" />
+    <title>TODO</title>
+    <link rel="icon" type="image/png" href="cartdave_favicon.png" />
     <style>
       html {font-family: sans-serif;}
 
@@ -34,12 +34,12 @@
     <table>
       <tr>
         <td><img src="Connie_click-me.gif" alt="alt text" title="Not (Yet) (Another / A) Wiki."/></td>
-        <td><a href="about/index.HTML">about</a> &nbsp; <a href="testing/index.HTML">testing</a> &nbsp;  &nbsp; plus login and register buttons</td>
+        <td><a href="about/">about</a> &nbsp; <a href="testing/">testing</a> &nbsp;  &nbsp; plus login and register buttons</td>
       </tr>
         <td rowspan=0 style="background-color: rebeccapurple; text-align:left; white-space:nowrap; vertical-align:top">
             menu for the current directory
-             <p><a href="TODO.HTML">TODO</a></p>
-<p><a href="index.HTML">index</a></p>
+             <p><a href="index.HTML">index</a></p>
+<p><a href="TODO.HTML">TODO</a></p>
 
         </td>
         <td style="background-color: rebeccapurple">
@@ -50,29 +50,29 @@
         <td>
           <main class="contentBox">
             <div name="contentFrame">
-              <h1></h1>
-                Author:   
-                <p>Do these -</p>
-<p>BUG - sub directories get their links screwed with extra path.</p>
-<p>For such fragments, rename their results to menu.FRAGMENT.   metadata.isFragment</p>
-<p>Contstruct metadata.webtrail in createHTML from links to index.HTML in the various bits of the path of the input file.</p>
-<p>Check the timestamps on the files, only update if source is newer than destination.  Meh, it’s already 600 times faster than the pandoc version.</p>
+              <h1>TODO</h1>
+                Author:   onefang
+                <h2>Do these</h2>
+<p>Check the timestamps on the files, only update if source is newer than destination.  Meh, it’s already 600 times faster than the pandoc version.
+One quirk to watch for is if a URL path cahnges, the docs that have that URL need to be redone.</p>
 <p>Add atom feed for single page.  Alas cgit only seems to have ATOM feed on the whole repo, not individual files.</p>
-<p>Try out -</p>
+<h2>Try out</h2>
 <p>htmx</p>
 <p>pandoc replacements
 cmark-gfm</p>
 <p>cgit has Lua</p>
-<p>User system -
-levels -
-banned
-reader
-member
-moderator
-editor
-admin
-shell
-root</p>
+<h2>User system</h2>
+<ul>
+<li>levels -</li>
+<li>banned</li>
+<li>reader</li>
+<li>member</li>
+<li>moderator</li>
+<li>editor</li>
+<li>admin</li>
+<li>shell</li>
+<li>root</li>
+</ul>
 <p>Banned people can’t do squat, except maybe pester an admin once to start the unbanning process.</p>
 <p>When first registered, accounts are set to reader level.
 Initial verification by email.
@@ -100,7 +100,7 @@ Built in file browser might do the trick.  Would be useful for content creators
       </tr>
       <tr>
         <td style="background-color: rebeccapurple">
-          <p>Page <a href="">history</a>. &nbsp; Web site <a href="">atom feed</a> and <a href="">source code</a> &nbsp; Powered by <a href="https://sledjhamr.org/cgit/notYetAnotherWiki/about/">notYetAnotherWiki</a> Version -0.1.</p>
+          <p>Page <a href="https://sledjhamr.org/cgit/notYetAnotherWiki/log/TODO.md">history</a>. &nbsp; Web site <a href="https://sledjhamr.org/cgit/notYetAnotherWiki/atom">atom feed</a> and <a href="https://sledjhamr.org/cgit/notYetAnotherWiki/">source code</a> &nbsp; Powered by <a href="https://sledjhamr.org/cgit/notYetAnotherWiki/about/">notYetAnotherWiki</a> Version -0.1.</p>
         </td>
       </tr>
       <tr>
diff --git a/TODO.md b/TODO.md
index 697904e..beedfba 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,18 +1,21 @@
-Do these -
-
-BUG - sub directories get their links screwed with extra path.
-
-For such fragments, rename their results to menu.FRAGMENT.   metadata.isFragment
-
-Contstruct metadata.webtrail in createHTML from links to index.HTML in the various bits of the path of the input file.
+---
+favicon: cartdave_favicon.png
+pagetitle: "TODO"
+author: onefang
+feedatom: https://sledjhamr.org/cgit/notYetAnotherWiki/atom
+history: https://sledjhamr.org/cgit/notYetAnotherWiki/log/TODO.md
+sourcecode: https://sledjhamr.org/cgit/notYetAnotherWiki/
+---
+## Do these
 
 Check the timestamps on the files, only update if source is newer than destination.  Meh, it's already 600 times faster than the pandoc version.
+    One quirk to watch for is if a URL path cahnges, the docs that have that URL need to be redone.
 
 Add atom feed for single page.  Alas cgit only seems to have ATOM feed on the whole repo, not individual files.
 
 
 
-Try out -
+## Try out
 
 htmx
 
@@ -23,16 +26,17 @@ cgit has Lua
 
 
 
-User system -
-    levels -
-        banned
-        reader
-        member
-        moderator
-        editor
-        admin
-        shell
-        root
+## User system
+
+- levels -
+- banned
+- reader
+- member
+- moderator
+- editor
+- admin
+- shell
+- root
 
 Banned people can't do squat, except maybe pester an admin once to start the unbanning process.
 
diff --git a/about/index.HTML b/about/index.HTML
index e0cbee3..1488bdd 100644
--- a/about/index.HTML
+++ b/about/index.HTML
@@ -34,16 +34,15 @@
     <table>
       <tr>
         <td><img src="Connie_click-me.gif" alt="alt text" title="Not (Yet) (Another / A) Wiki."/></td>
-        <td><a href="about/index.HTML">about</a> &nbsp; <a href="testing/index.HTML">testing</a> &nbsp;  &nbsp; plus login and register buttons</td>
+        <td> &nbsp; plus login and register buttons</td>
       </tr>
         <td rowspan=0 style="background-color: rebeccapurple; text-align:left; white-space:nowrap; vertical-align:top">
             menu for the current directory
-             <p><a href="TODO.HTML">TODO</a></p>
-<p><a href="index.HTML">index</a></p>
+             <p><a href="index.HTML">index</a></p>
 
         </td>
         <td style="background-color: rebeccapurple">
-          &#x1f463; Web trail goes here.
+          &#x1f463; 
         </td>
       </tr>
       <tr>
@@ -68,7 +67,7 @@ system built into the thing.  Now it’s Yet Another Wiki.</p>
       </tr>
       <tr>
         <td style="background-color: rebeccapurple">
-          <p>Page <a href="https://sledjhamr.org/cgit/notYetAnotherWiki/log/About/index.md">history</a>. &nbsp; Web site <a href="">atom feed</a> and <a href="">source code</a> &nbsp; Powered by <a href="https://sledjhamr.org/cgit/notYetAnotherWiki/about/">notYetAnotherWiki</a> Version -0.1.</p>
+          <p>Page <a href="https://sledjhamr.org/cgit/notYetAnotherWiki/log/About/index.md">history</a>. &nbsp; Web site <a href="https://sledjhamr.org/cgit/notYetAnotherWiki/atom">atom feed</a> and <a href="https://sledjhamr.org/cgit/notYetAnotherWiki/">source code</a> &nbsp; Powered by <a href="https://sledjhamr.org/cgit/notYetAnotherWiki/about/">notYetAnotherWiki</a> Version -0.1.</p>
         </td>
       </tr>
       <tr>
diff --git a/default.template b/default.template
index 97f8073..f8a435f 100644
--- a/default.template
+++ b/default.template
@@ -41,7 +41,7 @@
              $menu$
         </td>
         <td style="background-color: rebeccapurple">
-          &#x1f463; $webtrail$
+          &#x1f463; $trail$
         </td>
       </tr>
       <tr>
diff --git a/index.HTML b/index.HTML
index fc6344c..db58d96 100644
--- a/index.HTML
+++ b/index.HTML
@@ -34,16 +34,16 @@
     <table>
       <tr>
         <td><img src="Connie_click-me.gif" alt="alt text" title="Not (Yet) (Another / A) Wiki."/></td>
-        <td><a href="about/index.HTML">about</a> &nbsp; <a href="testing/index.HTML">testing</a> &nbsp;  &nbsp; plus login and register buttons</td>
+        <td><a href="about/">about</a> &nbsp; <a href="testing/">testing</a> &nbsp;  &nbsp; plus login and register buttons</td>
       </tr>
         <td rowspan=0 style="background-color: rebeccapurple; text-align:left; white-space:nowrap; vertical-align:top">
             menu for the current directory
-             <p><a href="TODO.HTML">TODO</a></p>
-<p><a href="index.HTML">index</a></p>
+             <p><a href="index.HTML">index</a></p>
+<p><a href="TODO.HTML">TODO</a></p>
 
         </td>
         <td style="background-color: rebeccapurple">
-          &#x1f463; Web trail goes here.
+          &#x1f463; 
         </td>
       </tr>
       <tr>
@@ -86,6 +86,15 @@ are moved to the decumentation section, where the original participants
 and others can polish it into proper documentation about solving what has
 suddenly become a common problem.  Every one knows where to find it, on
 the one system.  They can chat about it, on the one system.</p>
+<h2>What does it do already?</h2>
+<p>Currently it’ll scan the current directory and subdirectories rooking for
+.md files in CommonMark syntax.  This should cover some MarkDown
+variations.  Then it produces .HTML files converted from these .md files,
+and links them all together into a web site.</p>
+<p>git is used to store the .md files, and provides edit history.  Added on
+the footer is links to cgit, which is used to store the files in git on
+your server.  This provides acces to the source code, history, and ATOM
+feed for the site.</p>
 
             </div>
           </main>
diff --git a/notYetAnotherWiki.lua b/notYetAnotherWiki.lua
index 1746b0a..9d6f3f7 100755
--- a/notYetAnotherWiki.lua
+++ b/notYetAnotherWiki.lua
@@ -2,13 +2,12 @@
 
 local lcmark = require("lcmark")
 
-local globalData = {header = '', footer = '', menu = '', ['_'] = '&nbsp;'}
+local globalData = {header = '', footer = '', menu = '', ['_'] = '&nbsp;', ['dlr'] = '&dollar;'}
 local site = {}
-
-
+local dirs = {}
 local createHTML = function(cm, file)
 --    cm = string.gsub(cm, '.  ', '.&nbsp; ')
-    if nil ~= file then print('About to parse file ' .. file) end
+    if nil ~= file then print('\nAbout to parse file ' .. file) end
     local result = ''
     local body, metadata, err = lcmark.convert(cm, "html", {smart = true, yaml_metadata = true, columns = 0})
 
@@ -25,11 +24,62 @@ local createHTML = function(cm, file)
                     if nill == metadata[k] then metadata[k] = v else print('metadata already has ' .. k) end
                 end
             end
+
+            if nil ~= file then
+                local depth = 0
+                local base = ''
+                for p in string.gmatch(file, '(%w+)/') do
+                    depth = depth + 1
+                    base = p
+                end
+                local path = string.sub(file, 1, #base)
+
+                metadata.header = ''
+                metadata.menu = ''
+                local trl = {}
+                metadata.trail = ''
+                local dir = dirs['']
+                local dr, pdr, tr = '', '', ''
+                while nil ~= dir.subs do
+                    local old = dir
+                    for m, x in pairs(dir.subs) do
+                        if x == string.sub(file, 1, #x) then
+                            pdr = pdr .. '/' .. m
+                            tr = tr .. '../'
+                            dr = m
+                            dir = dirs[dr]
+                            table.insert(trl, '">' .. m .. '</a> &#x1f463;')
+                            break
+                        end
+                    end
+                    if old == dir then break end
+                end
+                table.remove(trl)
+                for m, x in ipairs(trl) do
+                    tr = string.sub(tr, 4)
+                    trl[m] = '&nbsp;<a href="' .. tr .. x
+                end
+                metadata.trail = table.concat(trl)
+
+                if nil ~= dir.files then
+                    for m, x in pairs(dir.files) do
+                        local u = string.sub(x, 1 + #pdr)
+                            metadata.menu = metadata.menu .. '<p><a href="' .. u .. '.HTML">' .. m .. '</a></p>\n'
+                    end
+                end
+                if nil ~= dir.subs then
+                    for m, x in pairs(dir.subs) do
+                        local u = string.sub(x, 1 + #pdr)
+                        metadata.header = metadata.header .. '<a href="' .. u .. '">' .. m .. '</a> &nbsp; '
+                    end
+                end
+            end
+
             metadata.body = lcmark.apply_template(bod, metadata)
 
             local tm = ''
             if nil ~= templateFile then
-                local h = io.open(templateFile, 'r')
+                local h = io.open(templateFile, 'r')
                 if nil ~= h then
                     tm = tm .. h:read('*a')
                     h:close()
@@ -60,82 +110,64 @@ local createHTML = function(cm, file)
 end
 
 
+
 for l in io.popen('find . -name "*.md" -type f -printf "%P\n"'):lines() do
-    local s = {}
-    local f = ''
-    local c = 1
+    local dir = ''
+    local files, subs = {}, {}
+    local c, parent = 1, ''
+
     for p in string.gmatch(l, '(%w+)/') do
-        table.insert(s, p)
+        if '' == dir then
+            dir = p
+            if nil ~= dirs[dir] then
+                subs  = dirs[dir].subs
+                files = dirs[dir].files
+            end
+        end
+
+        local path = string.sub(l, 1, -1 - #(string.gsub(l, '.*/', '')))
+        if nil ~= dirs[parent] then
+            if nil == dirs[parent].subs then dirs[parent].subs = {} end
+            dirs[parent].subs[p] = path
+        elseif 1 == c then          subs[p] = path
+        else
+            if ('' ~= parent) and (dir == parent) then subs[p] = path end
+            dirs[parent] = {subs = {[p] = path}}
+        end
         c = c + #p + 1
+        parent = p
+    end
+
+    if (1 == c) and (nil ~= dirs[dir]) then
+        subs  = dirs[dir].subs
+        files = dirs[dir].files
     end
+
     local base = string.gsub(string.sub(l, c, -1), '%.md$', '')
-    table.insert(s, base)
-
--- TODO - should do the same for header.md and footer.md
-    if 'menu' == base then
-        local h = io.open(l, 'r')
-        if nil ~= h then
-            globalData.menuFound = true
-            print('Found ' .. l)
-            globalData.menu = string.gsub(createHTML(h:read('*a')), 'ul>', 'menu>')
-            h:close()
-        end
+    if nil ~= dirs[parent] then dirs[parent].files[base] = string.sub(l, 1, -4)
+    elseif 1 == c then      files[base] = string.sub(l, 1, -4)
     else
-        if 1 ~= #s then site[l] = s else site[l] = base end
+        if ('' ~= parent) and (dir == parent) then files[base] = string.sub(l, 1, -4) end
+        dirs[parent] = {files = {[base] = string.sub(l, 1, -4)}}
     end
-end
 
-for k, v in pairs(site) do
-    if 'string' == type(v) then
-        if not globalData.menuFound then
-            local m = '[' .. v .. '](' .. v .. '.HTML)\n'
-            globalData.menu = globalData.menu .. string.gsub(createHTML(m), 'ul>', 'menu>')
-        end
-    elseif not globalData.headerFound then
-        local path = ''
-        for i, w in ipairs(v) do
-            path = path .. w .. '/'
-        end
-        globalData.header = globalData.header .. '<a href="' .. string.sub(path, 1, -2) .. '.HTML">' .. v[1] .. '</a> &nbsp; '
-    end
+-- FIXME - still some minor bug somewhere, this fixes that, but causes other problems.  Meh, I can live with excess empty subs tables.
+--    if (nil ~= subs) and (0 == #subs) then subs = nil end
+    dirs[dir] = {files = files, subs = subs}
 end
 
-
-local cm, filename = '', ''
-
-if 0 == #arg then
-    for k, v in pairs(site) do
-        local path = ''
-        if 'string' == type(v) then
-            path = v
-        elseif not globalData.headerFound then
-            for i, w in ipairs(v) do
-                path = path .. w .. '/'
+for k, v in pairs(dirs) do
+    if nil ~= v.files then
+        for m, x in pairs(v.files) do
+            local file = x .. '.md'
+            local h = io.open(file, 'r')
+            if nil ~= h then
+                createHTML(h:read('*a'), file)
+                h:close()
+            else
+                print('oops! No such file ' .. file)
             end
-            path = string.sub(path, 1, -2)
-        end
-        path = path .. '.md'
 
-        cm = ''
-        local h = io.open(path, 'r')
-        if nil ~= h then
-            createHTML(h:read('*a'), path)
-            h:close()
-        else
-            print('oops! No such file ' .. path)
-        end
-    end
-else
-    for i,a in ipairs(arg) do
-        if filename == '' then filename = a end
-        local h = io.open(a, 'r')
-        if nil ~= h then
-            cm = cm .. h:read('*a')
-            h:close()
-        else
-            print('oops! No such file ' .. a)
         end
     end
-    if filename == '' then filename = 'test.md' end
-    createHTML(cm, filename)
 end