Refactoring to fully take advantage of Make

1 files changed, 67 insertions, 155 deletions

diff --git a/scripts/metadata_filter.lua b/scripts/metadata_filter.lua
index 90ca465..21f7759 100644
--- a/scripts/metadata_filter.lua
+++ b/scripts/metadata_filter.lua
@@ -5,27 +5,21 @@ function format_date(date)
     local year, month, day = date:match("(%d%d%d%d)-(%d%d)-(%d%d)")
     if year == nil then return nil end
 
-    local time = os.time({
-        year = tonumber(year),
-        month = tonumber(month),
-        day = tonumber(day)
-    })
+    local time = os.time({year = tonumber(year), month = tonumber(month), day = tonumber(day)})
     return pandoc.MetaMap({
-        yyyy_mm_dd = pandoc.MetaString(os.date("%F", time)),
-        yyyy = pandoc.MetaString(os.date("%Y", time)),
-        mm = pandoc.MetaString(os.date("%m", time)),
-        dd = pandoc.MetaString(os.date("%d", time)),
-        rfc3339 = pandoc.MetaString(os.date("%FT%T+00:00", time)),
-        long = pandoc.MetaString(os.date("%B %d, %Y", time)),
+        yyyy_mm_dd = os.date("%F", time),
+        yyyy = os.date("%Y", time),
+        mm = os.date("%m", time),
+        dd = os.date("%d", time),
+        rfc3339 = os.date("%FT%T+00:00", time),
+        long = os.date("%B %d, %Y", time),
     })
 end
 
 function table_to_list(t, cmp)
     local l = pandoc.List()
 
-    for key, value in pairs(t) do
-        l:insert(pandoc.MetaMap({key = key, value = value}))
-    end
+    for key, value in pairs(t) do l:insert(pandoc.MetaMap({key = key, value = value})) end
 
     l:sort(cmp or function(i1, i2) return i1.key < i2.key end)
 
@@ -83,9 +77,7 @@ function relative_to(dir, target)
     end
 
     if #dir < #target then
-        for i = #dir + 1, #target do
-            path = path .. (path == "" and "" or "/") .. target[i]
-        end
+        for i = #dir + 1, #target do path = path .. (path == "" and "" or "/") .. target[i] end
     elseif #dir > #target then
         for _ = #target + 1, #dir do path = "../" .. path end
     end
@@ -93,31 +85,8 @@ function relative_to(dir, target)
     return path
 end
 
-function apply_path_rewrites(rewrites, str)
-    for i = 1, #rewrites.path do
-        local r = rewrites.path[i]
-        str = str:gsub(pandoc.utils.stringify(r.from),
-                       pandoc.utils.stringify(r.to))
-    end
-    return str
-end
-
-function get_file_out(rewrites, content_dir, file_in)
-    local file_out = file_in:gsub("^" .. content_dir, ""):gsub("%.md$", ".html")
-
-    if file_out:match(".html$") and not file_out:match("/index%.html$") then
-        file_out = file_out:gsub("/(.*)%.html$", "/%1/index.html")
-    end
-
-    file_out = apply_path_rewrites(rewrites, file_out)
-
-    return pandoc.MetaString(file_out)
-end
-
 function make_absolute(rel, base)
-    return
-        rel:find("^/") ~= nil and rel or base:gsub("^(.*)/.-$", "%1") .. "/" ..
-            rel
+    return rel:find("^/") ~= nil and rel or base:gsub("^(.*)/.-$", "%1") .. "/" .. rel
 end
 
 function resolve_url(site_url, ref_file, target_file)
@@ -127,119 +96,82 @@ function resolve_url(site_url, ref_file, target_file)
     local abs = target_file
     local rel = relative_to(ref_base_dir, abs):gsub("/index%.html$", "/")
 
-    return pandoc.MetaMap({
-        abs = pandoc.MetaString(abs),
-        rel = pandoc.MetaString(rel),
-        full = pandoc.MetaString(site_url .. abs)
-    })
+    return pandoc.MetaMap({abs = abs, rel = rel, full = (site_url .. abs)})
 end
 
 function resolve_layout(layout)
-    if layout then
+    if layout ~= nil then
         layout = pandoc.utils.stringify(layout)
-        return pandoc.MetaMap({
-            id = pandoc.MetaString(layout),
-            ["is_" .. layout] = pandoc.MetaBool(true)
-        })
+        return pandoc.MetaMap({id = layout, ["is_" .. layout] = pandoc.MetaBool(true)})
     end
 end
 
-function resolve_section(content_dir, file_in)
-    local section = file_in:gsub("^" .. content_dir, ""):match("^/(.-)[/.]") or
-                        "index"
+function resolve_namespace(namespace)
+    namespace = pandoc.utils.stringify(namespace)
+
+    local root = "index"
+    if namespace ~= "" then root = namespace:gsub("^/([^/]*).*$", "%1") end
+
     return pandoc.MetaMap({
-        id = pandoc.MetaString(section),
-        ["is_" .. section] = pandoc.MetaBool(true)
+        root = pandoc.MetaMap({id = root, ["is_" .. root] = pandoc.MetaBool(true)}),
+        full = namespace,
     })
 end
 
 function resolve_category(categories, category)
-    if categories and category then
+    if categories ~= nil and category ~= nil then
         category = pandoc.utils.stringify(category)
         data = pandoc.MetaMap(categories[category])
-        data.id = pandoc.MetaString(category)
+        data.id = category
         return data
     end
 end
 
-function prep_main_menu(rewrites, section, main_menu)
+function prep_menu(active_id, main_menu)
     local active_item = nil
 
     for i = 1, #main_menu do
         local item = main_menu[i]
-        local active = pandoc.utils.stringify(item.id) == section.id
+        local active = pandoc.utils.stringify(item.id) == active_id
         item.active = pandoc.MetaBool(active)
-        item.url = apply_path_rewrites(rewrites,
-                                       pandoc.utils.stringify(item.url))
         if active then active_item = item end
     end
 
     return pandoc.MetaMap({
-        items = main_menu:filter(function(item)
-            return not item.hidden or item.active
-        end),
-        active = active_item
+        items = main_menu:filter(function(item) return not item.hidden or item.active end),
+        active = active_item,
     })
 end
 
-function organize_subpages(site_url, ref_file, pages)
-    for i = 1, #pages do
-        local page = pages[i]
-        page.url = resolve_url(site_url, ref_file,
-                               pandoc.utils.stringify(page.file_out))
-    end
-
-    local pages_grouped_date =
-        group_by(pages, function(p) return not p.date end)
-
-    local pages_undated = pages_grouped_date[true] or pandoc.MetaList({})
-    pages_undated:sort(function(p1, p2)
-        return pandoc.utils.stringify(p1.title) <
-                   pandoc.utils.stringify(p2.title)
-    end)
+function process_pages(global, pages_by_id)
+    if pages_by_id == nil then pages_by_id = {} end
 
-    local pages_dated = pages_grouped_date[false] or pandoc.MetaList({})
-    pages_dated:sort(function(p1, p2)
-        return pandoc.utils.stringify(p1.date.yyyy_mm_dd) >
-                   pandoc.utils.stringify(p2.date.yyyy_mm_dd)
-    end)
+    local pages_list = pandoc.List()
 
-    local pages_categorized = pages:filter(
-                                  function(p) return p.category ~= nil end)
-    pages_categorized:sort(function(p1, p2)
-        return pandoc.utils.stringify(p1.title) <
-                   pandoc.utils.stringify(p2.title)
-    end)
+    for _, page in pairs(pages_by_id) do
+        page = process(global, page)
+        pages_list:insert(page)
+    end
 
-    local pages_by_year = group_by(pages_dated, function(p)
-        return pandoc.utils.stringify(p.date.yyyy)
-    end)
-    pages_by_year = pandoc.MetaList(table_to_list(pages_by_year,
-                                                  function(i1, i2)
-        return i1.key > i2.key
-    end))
+    local pages_categorized = pages_list:filter(function(p) return p.category ~= nil end)
+    pages_categorized:sort(function(p1, p2) return p1.title < p2.title end)
 
-    local pages_by_category = group_by(pages_categorized, function(p)
-        return pandoc.utils.stringify(p.category.id)
-    end)
+    local pages_by_category = group_by(pages_categorized,
+        function(p) return pandoc.utils.stringify(p.category.id) end)
     pages_by_category = pandoc.MetaList(table_to_list(pages_by_category,
-                                                      function(i1, i2)
-        return i1.key < i2.key
-    end))
+        function(i1, i2) return i1.key < i2.key end))
 
     local pages_data = pandoc.MetaMap({
-        all_dated = pages_dated,
-        all_undated = pages_undated,
-        by_year = pages_by_year,
+        all = pages_list,
+        by_id = pages_by_id,
         by_category = pages_by_category,
-        last_update = #pages_dated ~= 0 and pages_dated[1].last_update
     })
 
     local categories_data = group_by(pages_categorized, function(p)
         return p.category and pandoc.utils.stringify(p.category.id)
     end, function(stats, _, p)
         if not stats then
-            return {name = pandoc.MetaString(p.category.name), count = 1}
+            return {name = p.category.name, count = 1}
         else
             stats.count = stats.count + 1
         end
@@ -247,72 +179,52 @@ function organize_subpages(site_url, ref_file, pages)
     categories_data = pandoc.MetaList(table_to_list(categories_data))
 
     for i = 1, #categories_data do
-        categories_data[i].value.count =
-            pandoc.MetaString(("%d"):format(categories_data[i].value.count))
+        categories_data[i].value.count = ("%d"):format(categories_data[i].value.count)
     end
 
     return pages_data, categories_data
 end
 
-function Meta(meta)
-    meta.content_dir = meta.content_dir:gsub("/$", "")
-    meta.site.url = pandoc.utils.stringify(meta.site.url):gsub("/$", "")
-    meta.rewrites = meta.rewrites or
-                        pandoc.MetaMap({path = pandoc.MetaList({})})
-    meta.page_type = meta.page_type or "page"
+function process(global, meta)
+    meta.namespace = resolve_namespace(meta.namespace)
+    meta.file_out = pandoc.utils.stringify(meta.file_out):gsub("^out", "")
     meta.layout = resolve_layout(meta.layout)
-    meta.section = resolve_section(meta.content_dir, meta.file_in)
+    meta.url = resolve_url(global.site.url, global.file_out, meta.file_out)
 
-    meta.file_out = get_file_out(meta.rewrites, meta.content_dir, meta.file_in)
-    if meta.relative_to == nil then meta.relative_to = meta.file_in end
-    meta.relative_to_out = get_file_out(meta.rewrites, meta.content_dir,
-                                        meta.relative_to)
+    if meta.title ~= nil then
+        meta.title = pandoc.utils.stringify(meta.title)
+    else
+        meta.title = ""
+    end
 
-    meta.url = resolve_url(meta.site.url, meta.relative_to_out, meta.file_out)
     if meta.preview ~= nil then
-        meta.preview = resolve_url(meta.site.url, meta.relative_to_out,
-                                   make_absolute(
-                                       pandoc.utils.stringify(meta.preview),
-                                       meta.file_out))
+        meta.preview = make_absolute(pandoc.utils.stringify(meta.preview), meta.file_out)
+        meta.preview = resolve_url(global.site.url, global.file_out, meta.preview)
     end
 
-    meta.date = format_date(meta.date)
+    if meta.date ~= nil then meta.date = format_date(meta.date) end
+
     if meta.last_update ~= nil then
         meta.last_update = format_date(meta.last_update)
     else
         meta.last_update = meta.date
     end
 
-    meta.category = resolve_category(meta.categories[meta.section.id],
-                                     meta.category)
-    meta.categories = nil
+    meta.category = resolve_category(global.categories[meta.namespace.root.id], meta.category)
 
-    if meta.page_type == "feed" then
-        meta.page = pandoc.MetaMap({
-            url = resolve_url(meta.site.url, meta.relative_to_out,
-                              meta.file_out:gsub("%.xml$", ".html"))
-        })
+    if meta.menus ~= nil and meta.menus.main ~= nil then
+        meta.menus.main = prep_menu(meta.namespace.root.id, meta.menus.main)
     end
 
-    if meta.create_feed then
-        meta.feed = pandoc.MetaMap({
-            url = resolve_url(meta.site.url, meta.relative_to_out,
-                              meta.file_out:gsub("%.html$", ".xml"))
-        })
-    end
+    local pages, local_categories = process_pages(global, meta.pages)
+    meta.pages = pages
+    meta.local_categories = local_categories
 
-    if meta.menus and meta.menus.main then
-        meta.menus.main = prep_main_menu(meta.rewrites, meta.section,
-                                         meta.menus.main)
-    end
+    return meta
+end
 
-    if meta.pages then
-        local pages, categories = organize_subpages(meta.site.url,
-                                                    meta.relative_to_out,
-                                                    meta.pages)
-        meta.pages = pages
-        meta.categories = categories
-    end
+function Meta(meta)
+    meta.site.url = pandoc.utils.stringify(meta.site.url):gsub("/$", "")
 
-    return meta
+    return process(meta, meta)
 end