1 files changed, 30 insertions, 9 deletions

diff --git a/scripts/metadata.lua b/scripts/metadata.lua
index afd0ca5..5d372fc 100644
--- a/scripts/metadata.lua
+++ b/scripts/metadata.lua
@@ -71,13 +71,11 @@ function prep_menu(active_id, main_menu)
     return { items = items, active = active_item }
 end
 
-function process_pages(global, build, meta)
+function process_pages(meta)
     local pages_all = pandoc.List()
     local pages_date_desc = pandoc.List()
 
     for id, p in pairs(meta.pages) do
-        process(global, build, p, meta)
-
         if not p.unlisted then
             pages_all:insert(id)
             if p.last_update then pages_date_desc:insert(id) end
@@ -86,8 +84,14 @@ function process_pages(global, build, meta)
 
     pages_all:sort(sort.page_sort(meta.list_order, meta.pages))
     pages_date_desc:sort(sort.page_sort("date_desc", meta.pages))
+    local pages_random = pages_all:clone():shuffle()
 
-    meta.pages = { all = pages_all, date_desc = pages_date_desc, by_id = meta.pages }
+    meta.pages = {
+        all = pages_all,
+        date_desc = pages_date_desc,
+        random = pages_random,
+        by_id = meta.pages
+    }
 end
 
 function find_depth(meta)
@@ -126,7 +130,7 @@ function resolve_dates(meta)
     meta.was_updated = meta.date and meta.last_update and meta.date.yyyy_mm_dd ~= meta.last_update.yyyy_mm_dd
 end
 
-function process_base(build, meta, parent)
+function process_base(build, meta)
     meta.namespace = prep_namespace(meta.namespace)
     meta.file_out = utils.stringify(meta.file_out)
     meta.unlisted = meta.unlisted or (meta.draft and build.mode ~= "dev")
@@ -140,16 +144,33 @@ function process_base(build, meta, parent)
     meta.position = meta.position and tonumber(utils.stringify(meta.position))
     meta.thumbnail = meta.thumbnail and make_absolute("thumbnail." .. utils.stringify(meta.thumbnail), meta.file_out)
     meta.layout = prep_layout(meta.layout or (meta.redirect and "redirect") or resolve_layout(meta.depth))
-    meta.show_date = parent and parent.list_order == "date_desc"
+
+    meta.description = (meta.description and pandoc.MetaBlocks(pandoc.Para(meta.description))) or
+        (not meta.no_description and meta.content)
+    meta.show_date = meta.parent and meta.parent.list_order == "date_desc"
+    meta.category = meta.parent and meta.parent.title
+    meta.icon = meta.icon or (meta.parent and meta.parent.icon)
+    meta.post_icon = meta.post_icon or (meta.parent and meta.parent.list_post_icon) or
+        (meta.parent and meta.parent.parent and meta.parent.parent.list_post_icon)
+    meta.indicator = meta.parent and meta.parent.list_read_indicators
 end
 
-function process(global, build, meta, parent)
-    process_base(build, meta, parent)
-    process_pages(global, build, meta)
+function process(global, build, meta)
+    process_base(build, meta)
+
+    for _, p in pairs(meta.pages) do
+        p.parent = meta
+        process(global, build, p)
+        p.parent = nil
+    end
+
+    process_pages(meta)
     resolve_dates(meta)
 end
 
 function Meta(meta)
+    math.randomseed(os.time())
+
     local build = {}
 
     for key, value in pairs(meta) do