satelito

commit 7840e618e315c8f074f3bd20f1174358465aecbe
parent b344797181bb26f978624b6e08448efcf2f7f1ec
Author: Hugo Soucy <hugo@soucy.cc>
Date:   Tue, 29 Nov 2022 19:38:16 -0500

Move archives and tags executions in site.lua

Diffstat:
M
satelito/model.lua
 | 
12
------------
M
satelito/site.lua
 | 
17
++++++++++++++---

2 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/satelito/model.lua b/satelito/model.lua
@@ -2,12 +2,10 @@
 local model = {}
 --
 local etlua = require 'etlua'
-local inspect = require 'inspect'
 local lfs = require 'lfs' -- luafilesystem
 local lume = require 'satelito.lib.lume.lume'
 local dirtree = require 'satelito.dirtree'
 local file = require 'satelito.file'
-local list = require 'satelito.list'
 local markdown = require 'discount' -- lua-discount
 local template = require 'satelito.template'
 
@@ -71,16 +69,6 @@ function model.set(filepath)
     pagedata.collection_list = file.get_collection(pagedata.collection)
   end
 
-  -- Archives
-  if pagedata.archives then
-    pagedata.archives_children = list.get_archives(contentdir)
-  end
-
-  -- Tags
-  if pagedata.tags then
-    pagedata.tags_children = list.get_tags(contentdir)
-  end
-
   -- Change the language for a specific content
   pagedata.language = pagedata.language or config.language
 
diff --git a/satelito/site.lua b/satelito/site.lua
@@ -34,6 +34,7 @@ function site.make(sitedata)
   local duration
   local export = _G.Satelito.args['export']
   local timestart = _G.Satelito.timestart
+  local contentdir = _G.Satelito.contentdir
 
   for i = 1, #sitedata do
     local html, html_path
@@ -46,9 +47,19 @@ function site.make(sitedata)
       sitedata[i].children = list.get_children(sitedata[i].list, sitedata, sitedata[i].asc)
     end
 
-    -- if sitedata[i].collection and sitedata[i].collection_list then
-    --   sitedata[i].collection = list.get_children(sitedata[i].collection_list, sitedata, sitedata[i].asc)
-    -- end
+    if sitedata[i].collection and sitedata[i].collection_list then
+      sitedata[i].collection = list.get_children(sitedata[i].collection_list, sitedata, sitedata[i].asc)
+    end
+
+    -- Archives
+    if sitedata[i].archives then
+      sitedata[i].archives_children = list.get_archives(contentdir)
+    end
+
+    -- Tags
+    if sitedata[i].tags then
+      sitedata[i].tags_children = list.get_tags(contentdir)
+    end
 
     if i > 1 then
       sitedata[i].relprev = sitedata[i-1]