Moar linky tweakage.

1 files changed, 18 insertions, 16 deletions

diff --git a/notYetAnotherWiki.lua b/notYetAnotherWiki.lua
index 0a1e8b3..b85ede7 100755
--- a/notYetAnotherWiki.lua
+++ b/notYetAnotherWiki.lua
@@ -759,8 +759,8 @@ local lunaLinky = function(url, lab, tit)		-- Fix up the links.
         u = u
     elseif u:sub(1, 15) == 'wiki.devuan.org' then
         u = u
-    else
-        return url
+--    else
+--print('************************ ' .. url)
     end
     if ('https://wiki.devuan.org/' ~= url) and ('https://fos.wiki.devuan.org/' ~= url) then
         -- TODO - This might be covering up a bug elsewhere.
@@ -775,7 +775,7 @@ local lunaLinky = function(url, lab, tit)		-- Fix up the links.
         if '/System/' == url:sub(1, 8) then
             url = 'https://fos.wiki.devuan.org' .. url
         end
-        for i, p in ipairs{'https://wiki.devuan.org/?n=', 'https://wiki.devuan.org?n=', 'PmWiki/uploads/', 'Foswiki/pub/', '/', 'https://fos.wiki.devuan.org/'} do
+        for i, p in ipairs{'https://wiki.devuan.org/?n=', 'https://wiki.devuan.org?n=', 'PmWiki/uploads/', 'Foswiki/pub/', 'https://fos.wiki.devuan.org/'} do
             if p == url:sub(1, #p) then
                 local ur = url:sub(#p + 1)
 -- TODO - could probably replace some of this mess with RE.gsub() and friends.  Meh, it works.
@@ -820,21 +820,23 @@ local lunaLinky = function(url, lab, tit)		-- Fix up the links.
             end
         end
     end
+    if (url:sub(-4) ~= '.png') and (url:sub(-5) ~= '.HTML') then url = url .. '.HTML' end
     if not done then
---[[
-                    -- TODO - Should check if this came from DocuWiki in the first place, AND double check this is for img src.
-                    elseif '/' == p then
-                        local cnt = 3
-                        for j = 1, #p do
-                            if '/' == p:sub(j, j) then cnt = cnt + 1 end
-                        end
-                        if p:sub(1, 9) ~= 'DocuWiki/' then cnt = cnt + 1 end
-                        if ur:sub(-4) ~= '.png' then ur = ur .. '.HTML'; cnt = cnt - 2 end
-                        url = string.rep('../', cnt) .. 'DocuWiki/pages' .. p .. ur
-]]
+        -- TODO - Should check if this came from DocuWiki in the first place, AND double check this is for img src.
+        if url:sub(1, 1) == '/' then
+            local p = url
+            local cnt = 0
+            for j = 1, #p do
+                if '/' == p:sub(j, j) then cnt = cnt + 1 end
+            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
+        elseif url:sub(1, 37) == 'https://friendsofdevuan.org/doku.php/' then
+            url = 'DocuWiki/pages' .. url:sub(37):gsub(':', '/')
+        end
     end
-    if (url:sub(-4) ~= '.png') and (url:sub(-5) ~= '.HTML') then url = url .. '.HTML' end
-    return url
+    return url:gsub('//DocuWiki//DocuWiki//', '/DocuWiki/')
 end
 
 function Writer.header(s, level)