commit 86f4e121a89f3eaa19d4207043516dadf191b3cf
parent 07d34cf5b0f4c7900096c59be383505b0bba25e5
Author: Hugo Soucy <hugo@soucy.cc>
Date: Mon, 26 Sep 2022 08:42:13 -0400
test for collection modification
Diffstat:
3 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/satelito/init.lua b/satelito/init.lua
@@ -20,7 +20,7 @@ local parser = argparse()
:name 'satelito'
:description 'Satelito is a static site generator in lua script.'
:epilog 'For more info, see https://soucy.cc/git/satelito/file/README.md.html'
-local args
+--local args
-- Set 'init' command
init = parser:command('init', 'Init the sample website in your $HOME folder.')
diff --git a/satelito/list.lua b/satelito/list.lua
@@ -3,29 +3,30 @@ local list = {}
--
local dirtree = require 'satelito.dirtree'
local file = require 'satelito.file'
+local inspect = require 'inspect'
local lfs = require 'lfs' -- luafilesystem
local lume = require 'satelito.lib.lume.lume'
-- Pagination
function list.set_pagination(pagelist, len)
local slicedlist = {}
- local i = 1
+ local i = 1
- while(i < #pagelist) do
- local j
+ while(i < #pagelist) do
+ local j
- if i == 1 then
- j = 1
- i = i + (len-1)
- else
- j = i + 1
- i = i + len
- end
-
- slicedlist[#slicedlist+1] = lume.slice(pagelist, j, i)
+ if i == 1 then
+ j = 1
+ i = i + (len-1)
+ else
+ j = i + 1
+ i = i + len
end
- return slicedlist
+ slicedlist[#slicedlist+1] = lume.slice(pagelist, j, i)
+ end
+
+ return slicedlist
end
-- Children
@@ -57,6 +58,7 @@ function list.get_collection(collection, sitemap, asc)
local collection_list = {}
local contentdir = lfs.currentdir()..'/'..sitemap[1].paths.content
+
for i = 1, #collection do
if lfs.attributes(contentdir..collection[i]).mode == 'directory' then
collection_list[#collection_list+1] = file.get_collection(contentdir..collection[i], contentdir)
@@ -71,6 +73,10 @@ function list.get_collection(collection, sitemap, asc)
return
end
+function list.set_collection(collection, sitemap, asc)
+ print(collection, inspect(sitemap), asc)
+end
+
-- Archives
function list.get_archives(contentdir)
local archives_table = {}
diff --git a/satelito/site.lua b/satelito/site.lua
@@ -1,6 +1,7 @@
-- @module site
local site = {}
--
+local inspect = require 'inspect'
local lfs = require 'lfs'
--
local assets = require 'satelito.assets'
@@ -47,6 +48,13 @@ function site.make(sitemap, export, timestart)
sitemap[i].collection = list.get_collection(sitemap[i].collection, sitemap, sitemap[i].asc)
end
+ if sitemap[i].collection and not sitemap[i].list then
+ --print(inspect(file.get_collection(sitemap[i].path, sitemap[i].contentdir)))
+ --print(inspect(sitemap[i].collection))
+ print(sitemap[i].contentdir, sitemap[i].path)
+ print(inspect(args))
+ end
+
if i > 1 then
sitemap[i].relprev = sitemap[i-1]
end