More DocuWiki stuff.

3 files changed, 21 insertions, 5 deletions

diff --git a/SuckIt b/SuckIt
index d56bdc4..48a01dc 100755
--- a/SuckIt
+++ b/SuckIt
@@ -4,6 +4,11 @@ TIMEFORMAT="    took %lR using %P%% CPU"
 time {
 pushd /opt/nyaw
 
+#rm -fr DocuWiki/*
+mkdir -p DocuWiki
+cp -r /opt/DocuWiki/data/pages/* ./DocuWiki
+cp -r /opt/DocuWiki/data/media/* ./DocuWiki
+cp -r /opt/nyaw_EMPTY/DocuWiki .
 #rm -fr Foswiki/*
 cp -r /opt/nyaw_EMPTY/Foswiki .
 #rm -fr PmWiki/*
@@ -15,13 +20,24 @@ cp -r /opt/nyaw_EMPTY/unsorted .
 mkdir -p users
 cp -r /opt/nyaw_EMPTY/users .
 
+ogURL=""
 ogWiki="DocuWiki"
 time find DocuWiki \
 -name "*.txt" -type f,l -printf "%P\n" | while read line
 do
     base=`echo "${line}" | cut -d '/' -f 1- | rev | cut -d '/' -f 2- | rev`
     file=`echo "${line}" | rev | cut -d '/' -f 1 | cut -b 5- | rev`
-    pandoc -f dokuwiki -t commonmark_x --self-contained ${ogWiki}/${line} >${ogWiki}/${base}/${file}.md
+    if [ `echo "${base}" | rev | cut -d '.' -f 1` == "txt" ]; then
+        base=""
+    else
+        base="${base}/"
+    fi
+    realURL=${ogWiki}/${base}${file}
+    time=`date --rfc-3339=seconds -ur /opt/DocuWiki/data/pages/${line} | cut -d '+' -f 1`
+    mkdir -p ${ogWiki}/${base}
+    echo -e "ogWiki=${ogWiki}\nogURL=${ogURL}\nrealURL=${realURL}\nogBase=${base}\nogFile=${file}\ntimestamp=${time}\n" > ${ogWiki}/${base}/${file}.md.md
+
+    pandoc -f dokuwiki -t commonmark_x --self-contained ${ogWiki}/${line} >${ogWiki}/${base}${file}.md
 done
 
 # Copy across things like images that where uploaded.
diff --git a/SuckItClean b/SuckItClean
index cddd28e..a6ca475 100755
--- a/SuckItClean
+++ b/SuckItClean
@@ -4,7 +4,7 @@ TIMEFORMAT="    took %lR using %P%% CPU"
 time {
 pushd /opt/nyaw
 
-rm -fr DocuWiki/*.md
+rm -fr DocuWiki/*
 rm -fr Foswiki/*
 rm -fr PmWiki/*
 rm -fr unsorted
diff --git a/notYetAnotherWiki.lua b/notYetAnotherWiki.lua
index 114af16..355af99 100755
--- a/notYetAnotherWiki.lua
+++ b/notYetAnotherWiki.lua
@@ -542,7 +542,7 @@ local whichPage = function(f)
         if nil ~= Subs[f].files then
             if 1 == #(Subs[f].files) then       fl = Subs[f].files[1] else
                 -- Standard files to search for.
-                for i, v in ipairs{'about', 'readme', 'index', 'homepage', 'mainpage', 'webhome'} do
+                for i, v in ipairs{'about', 'readme', 'index', 'homepage', 'mainpage', 'webhome', 'start'} do
                     for j, w in ipairs(Subs[f].files) do
                         if v == w:lower() then
                             fl = w
@@ -832,9 +832,9 @@ local lunaLinky = function(url, lab, tit)		-- Fix up the links.
             end
 --          if p:sub(1, 9) ~= 'DocuWiki/' then cnt = cnt + 1 end
             if url:sub(-4) == '.png' then cnt = cnt + 1 end
-            url = string.rep('../', cnt) .. 'DocuWiki/pages' .. p
+            url = string.rep('../', cnt) .. 'DocuWiki' .. p
         elseif url:sub(1, 37) == 'https://friendsofdevuan.org/doku.php/' then
-            url = 'DocuWiki/pages' .. url:sub(37):gsub(':', '/')
+            url = 'DocuWiki' .. url:sub(37):gsub(':', '/')
         end
     end
     return url:gsub('//DocuWiki//DocuWiki//', '/DocuWiki/')