1 files changed, 80 insertions, 28 deletions

diff --git a/notYetAnotherWiki.lua b/notYetAnotherWiki.lua
index c5814f3..f53691b 100755
--- a/notYetAnotherWiki.lua
+++ b/notYetAnotherWiki.lua
@@ -215,27 +215,51 @@ else
     print("Can't open everything.md for writing.")
 end
 
--- Scan the subdirectories looking for our files.
-local Directory = arg[1]
+-- Scan the sub folders looking for our files.
+local Folder = arg[1]
 toSub('')
-if nil == Directory then Directory = '.' end
-
--- Sort out realURL for symlinked .md.md files.
-for l in io.popen('find -L ' .. Directory .. ' -name unsorted -prune -o -name "*.md.md" -xtype l -printf "%P\n"'):lines() do
+if nil == Folder then Folder = '.' end
+--GlobalMetaData.root = Folder
+
+--[[ Sort out realURL for symlinked .md.md files.
+    realURL is the generic URL part for this page.  By policy it points to whatever is the latest copy / symlink of the original download .md.md.
+    realURL starts out being the path to the downloaded file and friends.
+    If we make a symlink during SuckIt, then that gets updated to point to the place the symlink is in.
+        below we compare timestamps and select the latest version if there's more than one symlink.
+    For the "page symlinked" problem, this should work if realURL is kept updated.
+    For the "page copied"    problem, this should work if realURL is kept updated, same as symlinked really, coz that's just another copy.
+    For the "page moved"     problem, that'll be the most recent symlink, the old one still has it's symlink pointing to the download .md.md, which gets updated with the current realURL.
+        So when some external old URL points to someplace a page used to be, it's old symlink points to the up to date download .md.md, and we know where to go to find the page now.
+        A left over .md.md file should have a redirect .HTML page created for it.
+]]
+for l in io.popen('find -L ' .. Folder .. ' -name unsorted -prune -o -name "*.md.md" -xtype l -printf "%P\n"'):lines() do
     local metadata = readMdMd(string.sub(l, 1, -4), {})
--- FIXME - if this already exists, compare the timestamps, most recent wins.
-    metadata.realURL = string.sub(l, 1, -7)
-    local a, e = io.open(l, 'w')
-    if nil == a then print('Could not open ' .. l .. ' - ' .. e) else
-        for k, v in pairs(metadata) do
-            a:write(k .. '=' .. v .. '\n')
+    if nil == metadata.realURL then
+        metadata.realURL = string.sub(l, 1, -7)
+    else
+        if metadata.realURL ~= string.sub(l, 1, -7) then
+            metadata.realURL = string.sub(l, 1, -7)
+            -- If this already exists, compare the timestamps, most recent wins.
+            local time0 = io.popen('ls -l --time-style=+%s "' .. metadata.realURL .. '.md.md" | cut -d \' \' -f 6'):read('l')
+            local time1 = io.popen('ls -l --time-style=+%s "' ..                l ..       '" | cut -d \' \' -f 6'):read('l')
+            if time0 > time1 then               metadata = nil end
+        else                                    metadata = nil end
+    end
+
+    if nil ~= metadata then
+-- DUNNO if this writes to the original file, or overwrites the symlink.
+        local a, e = io.open(l, 'w')
+        if nil == a then print('Could not open ' .. l .. ' - ' .. e) else
+            for k, v in pairs(metadata) do
+                a:write(k .. '=' .. v .. '\n')
+            end
+            a:close()
         end
-        a:close()
     end
 end
 
 -- Clean up unsorted.
-for l in io.popen('find -L ' .. Directory .. ' -name unsorted -prune -o -name "*.md" -a -not -name "*.md.md" -xtype l -printf "%P\n"'):lines() do
+for l in io.popen('find -L ' .. Folder .. ' -name unsorted -prune -o -name "*.md" -a -not -name "*.md.md" -xtype l -printf "%P\n"'):lines() do
     local tp = '_fos'
     local metadata = readMdMd(l, {})
     if nil ~= metadata then
@@ -245,16 +269,36 @@ for l in io.popen('find -L ' .. Directory .. ' -name unsorted -prune -o -name "*
             local a, e = io.open(unsort .. tp .. '.md' , 'r')
             if nil ~= a then
                 a:close()
-                os.execute('rm ' .. unsort .. tp .. '.*')
+                -- Keep the .md.md symlink, delete the rest.
+                os.execute('rm ' .. unsort .. tp .. '.HTML')
+                os.execute('rm ' .. unsort .. tp .. '.md')
+                a, e = io.open(unsort .. tp .. '.HTML', 'w')
+                if nil == a then print('Could not open ' .. unsort .. tp .. '.HTML' .. ' - ' .. e) else
+                    local dst = string.sub(l, 1, -4) .. '.HTML'
+                    local cnt = 1
+                    for j = 1, #metadata.ogFile do
+                        if '/' == string.sub(metadata.ogFile, j, j) then cnt = cnt + 1 end
+                    end
+                    dst = string.rep('../', cnt) .. dst
+                    a:write(
+[=[<!DOCTYPE html>
+<html>
+  <head><meta http-equiv="refresh" content="0; url=]=] .. dst .. '"' .. [=[/></head>
+  <body><p>Click this if you don't get redirected to the real page - <a href="]=] .. dst .. '"' .. [=[>Redirect</a></p></body>
+</html>
+]=])
+                    a:close()
+                    print('REDIRECT ' .. unsort .. tp .. '.HTML \t-> ' .. dst)
+                end
+
             end
         end
     end
 end
 
 -- Look for copied pages from the other wikis.
-for l in io.popen('find -L ' .. Directory .. ' -name "*.HTM" -type f,l -printf "%P\n"'):lines() do
--- TODO - Only do this if .HTM is newer than .md, or .md doesn't exist.
-
+for l in io.popen('find -L ' .. Folder .. ' -name "*.HTM" -type f,l -printf "%P\n"'):lines() do
+-- Only do this if .HTM is newer than .md, or .md doesn't exist.
     local htime = io.popen("date -ur " ..            l ..           " +%s"):read('l')
     local mtime = io.popen("date -ur " .. string.sub(l, 1, -4) .. "md +%s 2>/dev/null"):read('l')
     if (nil == mtime) or (htime > mtime) then
@@ -404,14 +448,14 @@ writeString(l .. '_ORIGINAL1', body)
     end
 end
 
-if '.' ~= Directory then
+if '.' ~= Folder then
     for l in io.popen('find -L . -name "*.md" -type f,l -printf "%P\n"'):lines() do
         toFile(string.gsub(l, '%.md$', ''))
     end
 end
 
--- Can add in a distant directory to, for putting it's results in the current directory.
-for l in io.popen('find -L ' .. Directory .. ' -name "*.md" -type f,l -printf "%P\n"'):lines() do
+-- Can add in a distant folder to, for putting it's results in the current folder.
+for l in io.popen('find -L ' .. Folder .. ' -name "*.md" -type f,l -printf "%P\n"'):lines() do
     local n = string.gsub(l, '%.md$', '')
     if nil == Files[n] then toFile(n) end
 end
@@ -472,7 +516,7 @@ for name, sub in pairs(Subs) do
         print("EMPTY " .. name)
         h = io.open(name .. '/index.md', 'w')
         if nil ~= h then
-            h:write('This directory has no files.')
+            h:write('This folder has no files.')
             h:close()
         else
             print("Can't open " .. name .. '/index.md for writing.')
@@ -484,7 +528,7 @@ end
 ---------------------------------------------------------------------------------
 -- These functions assume the above file and sub scan has completed.
 
--- Which page in this directory should we show?
+-- Which page in this folder should we show?
 -- NOTE - only looking for the .md files we scanned for before, any stray HTML, html, HTM, and htm files will get ignored.
 local whichPage = function(f)
     local fl = ''
@@ -527,7 +571,7 @@ local whichWiki = function(metadata)
 end
 
 
--- Calculate a link from the source directory to the destination directory.
+-- Calculate a link from the source folder to the destination folder.
 local linkFrom = function(source, dest)
     -- Evil hacks!
     if 'Profiles' == dest then dest = 'PmWiki/Profiles' end
@@ -763,7 +807,7 @@ function Writer.header(s, level)
     local text = Lunamark.util.rope_to_string(s)
 -- FIXME - Work around a bug in Lunamark?
     text = RE.gsub(text, "{[\\]}", "")
-    return '<h' .. level .. ' id="' .. RE.gsub(text, '{[ ]}', '_') .. '">' .. text .. ' <a style="font-size: 0.42em;" href="#top">👆</a></h' .. level .. '>'
+    return '<h' .. level .. ' id="' .. RE.gsub(text, '{[ ]}', '_') .. '">' .. text .. ' <a style="font-size: 0.42em;" href="#top">🔼</a></h' .. level .. '>'
 end
 local OgWriterLink = Writer.link        -- So we can call the original from within mine, we are just changing the URL.
 function Writer.link(lab, url, tit)
@@ -810,7 +854,7 @@ for name, file in pairs(Files) do
             local pth = file.path
             if '' ~= file.path then pth = file.path .. '/' end
             if 'true' ~= Subs[pth .. f].metadata.hidden then
-                metadata.header = metadata.header .. '<a href="' .. f .. '/' .. whichPage(pth .. f) .. '">' .. f .. '</a> &nbsp; '
+                metadata.header = metadata.header .. '<a href="' .. f .. '/' .. whichPage(pth .. f) .. '">' .. f .. '</a> &nbsp; &#128194; '
             end
         end
 
@@ -847,7 +891,15 @@ for name, file in pairs(Files) do
                 end
             else
                 if nil ~= url then      metadata.menu = metadata.menu .. '<p><a href="' .. url .. '">'      .. title .. ' &#9757;</a></p>'
-                else                    metadata.menu = metadata.menu .. '<p><a href="' .. f   .. '.HTML">' .. title .. '</a></p>'
+                else
+                    local pth = file.path
+                    if '' ~= pth then pth = pth .. '/' end
+                    -- Don't include any left over .md.md files, so don't do this if f.md doesn't exist.
+                    local a, e = io.open(pth .. f .. '.md' , 'r')
+                    if nil ~= a then
+                        a:close()
+                                        metadata.menu = metadata.menu .. '<p><a href="' .. f   .. '.HTML">' .. title .. '</a></p>'
+                    end
                 end
             end
         end
@@ -865,7 +917,7 @@ for name, file in pairs(Files) do
             metadata.history = ''
         end
         if nil ~= metadata.sourcecode   then metadata.footer = '<a href="' .. metadata.sourcecode       .. '">source code</a>'    end
-        if nil ~= metadata.feedatom             then metadata.footer = '<a href="' .. metadata.feedatom         ..   '">atom feed</a> &nbsp; &nbsp; ' .. metadata.footer    end
+        if nil ~= metadata.feedatom             then metadata.footer = '<a href="' .. metadata.feedatom         ..   '">atom feed<img src="feed-icon-14x14.png"></img></a> &nbsp; &nbsp; ' .. metadata.footer    end
         if metadata.footer ~= '' then metadata.footer = 'Web site ' .. metadata.footer end
         -- Add a link to the original page.
         if nil ~= metadata.ogURL then