Fix back linking to actually show links on pages

4 files changed, 70 insertions, 55 deletions

diff --git a/tools/front_page.lua b/tools/front_page.lua
index 74731d8..9557a53 100644
--- a/tools/front_page.lua
+++ b/tools/front_page.lua
@@ -1,3 +1,4 @@
+local meta_tools = require("tools/meta_tools")
 
 local function load_notes(note_list)
     local notes = {}
@@ -7,24 +8,6 @@ local function load_notes(note_list)
     return notes
 end
 
-local function get_note(note_name)
-    local file = io.open(string.format("build/%s.meta", note_name), "r")
-    local note = {}
-
-    for line in file:lines() do
-        local sep = string.find(line, ",")
-        local index = string.sub(line, 1, sep-1)
-        local content = string.sub(line, sep+1, -1)
-
-        note[index] = content
-    end
-
-    note["note_name"] = note_name
-
-    file:close()
-    return note
-end
-
 local function compare_note_dates(a, b)
     return a.last_edit > b.last_edit
 end
@@ -36,7 +19,7 @@ function Pandoc(doc)
     local notes = {}
     local note_names = load_notes(doc.meta["note_list"])
     for index, note in ipairs(note_names) do
-        table.insert(notes, get_note(note))
+        table.insert(notes, meta_tools.get_note(note))
     end
 
     table.sort(notes, compare_note_dates)
diff --git a/tools/link_gen.lua b/tools/link_gen.lua
index d23b923..fb53b53 100644
--- a/tools/link_gen.lua
+++ b/tools/link_gen.lua
@@ -1,5 +1,6 @@
 local pipe = pandoc.pipe
 local stringify = (require 'pandoc.utils').stringify
+local meta_tools = require("tools/meta_tools")
 
 local meta = PANDOC_DOCUMENT.meta
 local preview = ""
@@ -14,38 +15,6 @@ local function append_str(buf, s)
     return buf
 end
 
-local function file_exists(name)
-  local f = io.open(name, 'r')
-  if f ~= nil then
-    io.close(f)
-    return true
-  else
-    return false
-  end
-end
-
-local function read_link_file(name)
-    local f = io.open(name, 'r')
-    if f ~= nil then
-        local output = {}
-        for line in f:lines() do
-            table.insert(output, line)
-        end
-        f:close()
-        return output
-    else
-        return {}
-    end
-end
-
-local function write_link_file(name, links)
-    local f = io.open(name, 'w')
-    for i,v in ipairs(links) do
-        f:write(string.format("%s\n", v))
-    end
-    f:close()
-end
-
 local function item_in_table(table, item)
     local inside = false
     for i,v in ipairs(table) do
@@ -78,13 +47,13 @@ function Doc(body, metadata, variables)
         local link_file = "./build/" .. v .. ".links"
 
         -- check if markdown version of the file exists
-        if file_exists(markdown_file) then
-            links = read_link_file(link_file) 
+        if meta_tools.file_exists(markdown_file) then
+            links = meta_tools.read_link_file(link_file) 
             if not item_in_table(links, input_file) then
                 table.insert(links, input_file)
             end
 
-            write_link_file(link_file, links)
+            meta_tools.write_link_file(link_file, links)
         else
             io.stderr:write(string.format("Linking to non-existant file '%s'\n", v))
         end
diff --git a/tools/meta_tools.lua b/tools/meta_tools.lua
new file mode 100644
index 0000000..006e156
--- /dev/null
+++ b/tools/meta_tools.lua
@@ -0,0 +1,53 @@
+local meta_tools = {}
+
+function meta_tools.file_exists(name)
+  local f = io.open(name, 'r')
+  if f ~= nil then
+    io.close(f)
+    return true
+  else
+    return false
+  end
+end
+
+function meta_tools.read_link_file(name)
+    local f = io.open(name, 'r')
+    if f ~= nil then
+        local output = {}
+        for line in f:lines() do
+            table.insert(output, line)
+        end
+        f:close()
+        return output
+    else
+        return {}
+    end
+end
+
+function meta_tools.write_link_file(name, links)
+    local f = io.open(name, 'w')
+    for i,v in ipairs(links) do
+        f:write(string.format("%s\n", v))
+    end
+    f:close()
+end
+
+function meta_tools.get_note(note_name)
+    local file = io.open(string.format("build/%s.meta", note_name), "r")
+    local note = {}
+
+    for line in file:lines() do
+        local sep = string.find(line, ",")
+        local index = string.sub(line, 1, sep-1)
+        local content = string.sub(line, sep+1, -1)
+
+        note[index] = content
+    end
+
+    note["note_name"] = note_name
+
+    file:close()
+    return note
+end
+
+return meta_tools
diff --git a/tools/note.lua b/tools/note.lua
index 0d3aff3..16acbc8 100644
--- a/tools/note.lua
+++ b/tools/note.lua
@@ -1,6 +1,16 @@
 local stringify = (require 'pandoc.utils').stringify
+local meta_tools = require("tools/meta_tools")
 
-local status_map = {"seadling", "budding", "evergreen"}
+local status_map = {"seedling", "budding", "evergreen"}
+
+function Link(link)
+    if not string.find(link.target, "://") then
+        local note = meta_tools.get_note(link.target)
+        return {pandoc.Link(note["title"], "/notes/"..link.target..".html")}
+    else
+        return link  
+    end
+end
 
 function Pandoc(doc)
     doc.meta["main_class"] = "html-note-page"