wip

src/.init.lua

@@ -18,6 +18,7 @@ app = require("soakbean") {
   cache = { items = {} },
   plugin = {},
   opts  = {},
+  forkpids = {},
   cmd={
     help         = {file="cmd/help.lua", info="display all possible flags"},
     server       = {file="cmd/server.lua", info="starts the webserver"},
@@ -68,7 +69,6 @@ print = function(...) Log(kLogInfo, ... or "''") end -- nice redbean logging fro
 app.url['^/data']   = '/data.lua'          -- setup custom file endpoint
 
 app.url['^/$']                    = '/page/index.lua'
-app.url['^/experiences[/]?$']     = '/page/experiences.lua'
 app.url['^/admin[/]?$']           = '/page/admin/index.lua'
 
 app.get('^/design[/]?$',  util.pagerender('page/design.html')) 
@@ -85,19 +85,33 @@ end)
 
 app                                        --
 .use( require("middleware/httpauth")() )
+.use( function(req,res,next)
+  local diskpath = app.opts.plugin_diskscan_dir
+  local urlpath  = GetPath()
+  print( urlpath .. " => "  .. diskpath)
+  foreach( app.cache.items, function(k,v)
+    print(v.path)
+    --local itempath = v.path:gsub("^.","")
+    --if itempath:sub(0,#diskpath) == diskpath then
+    --  local _, nslashes = itempath:gsub("/","")
+    --  local _, diskslashes = diskpath:gsub("/","")
+    --  if nslashes == diskslashes + 1 then 
+    --    print("slashes = " .. nslashes .. " => " .. diskslashes)
+    --    table.insert(items,v)
+    --  end
+    --end
+  end)
+end)
 .use( require("json").middleware() )       -- try plug'n'play json API middleware 
 .use( app.router( app.url ) )              -- try url router
 .use( app.response() )                     -- try serve app response  (if any)
 .use( function(req,next) Route() end)      -- fallback default redbean fileserver
 
 app.on('init', function()
-  if assert(unix.fork()) == 0 then
+  --if assert(unix.fork()) == 0 then
-    app.plugin.diskscan.scan(app.opts.plugin_diskscan_dir)
-    print_r(app.cache)
-    --os.execute("ls ; sleep 5")
-    print("ok")
   --  local ok, headers, body = Fetch('http://127.0.0.1:8080/test')
-  end
+  --  print_r({ok=ok,header=headers,body=body})
+  --end
 end)
 
 function OnHttpRequest() app.run() end
@@ -105,3 +119,7 @@ function OnHttpRequest() app.run() end
 OnServerStart = function()
   app.init()  -- this triggers init event
 end
+
+OnServerStop = function()
+  print("todo: kill threads")
+end

src/page/dir.lua

@@ -0,0 +1,35 @@
+local util = require("util")
+local tile = require('page/partial/tile')
+
+--if not app.cache['experiences.html'] and util.count(app.cache.items) > 0 then 
+--  print("processing! " .. util.count(app.cache.items) .. " items")
+--  app.cache['experiences.html'] = util.memoize(
+--    function()
+--      local data = util.merge({tiles=''},{ opts = app.opts })
+--      foreach(app.cache.items, function(k,v)
+--        data.tiles = data.tiles .. tile( util.flatten(v,"item") )
+--      end)
+--      local html = util.template( LoadAsset("page/experiences.html"),data)
+--      return html
+--    end,
+--    60*5 -- re-run every 5 mins (otherwise return cache)
+--  )
+--end
+
+
+
+if util.count(app.cache.items) == 0 then
+  SetStatus(200)
+  SetHeader('Content-Type', 'text/html; charset=utf-8')
+  local html = util.template( [[
+    ${header}
+    <br/>
+    <h2>Indexing files: please try again in few seconds</h2>
+    ${footer}
+  ]],data)
+  Write( html )
+else
+  SetStatus(200)
+  SetHeader('Content-Type', 'text/html; charset=utf-8')
+  --Write( app.cache['experiences.html']() )
+end

src/page/experiences.lua

@@ -1,22 +0,0 @@
-local util = require("util")
-local tile = require('page/partial/tile')
-
-if not app.cache['experiences.html'] then 
-
-  print("processing! " .. util.count(app.cache.items) .. " items")
-  app.cache['experiences.html'] = util.memoize(
-    function()
-      local data = util.merge({tiles=''},{ opts = app.opts })
-      foreach(app.cache.items, function(k,v)
-        data.tiles = data.tiles .. tile( util.flatten(v,"item") )
-      end)
-      local html = util.template( LoadAsset("page/experiences.html"),data)
-      return html
-    end,
-    60*5 -- re-run every 5 mins (otherwise return cache)
-  )
-end
-
-SetStatus(200)
-SetHeader('Content-Type', 'text/html; charset=utf-8')
-Write( app.cache['experiences.html']() )

src/page/header.html

@@ -26,7 +26,8 @@
         <td class="menu">
           <div class="margin1L">
             <!-- important: no spaces between anchor tags for older browsers without flexbox -->
-            <a href="/experiences">experiences</a><a href="/about">about</a><a class="xl" href="/howto">Howto</a></div>
+            <a href="/dir">/myverse</a><a href="/about">/about</a>
+            <!--<a class="xl" href="/howto">Howto</a></div>-->
         </td>
       </tr>
     </table>

src/plugin/diskscan.lua

@@ -1,5 +1,10 @@
 local dir = require "opendirectory"
 
+app.on('init', function()
+  print("scanning experiences (this make take a while..)")
+  app.plugin.diskscan.scan(app.opts.plugin_diskscan_dir)
+end)
+
 -- this registers the plugin UI /funcs
 return {
   name = "Content (from disk)",
@@ -28,7 +33,7 @@ return {
     local dref, derr = dir.foreach( scandir, function(path,stat,state,name,kind,ino,off,attr,fullpath)
 
       local experience = {
-        path = fullpath,
+        path = fullpath:gsub("^.",""), -- strip .
         name = name,
         title = name,
         tag  = {},

util/xrforge.sh

@@ -20,9 +20,8 @@ download(){
   }
 
   janusweb(){
-    version=1.7.4
     test -f janusweb-${version}.tar.gz || {
-      wget "https://github.com/jbaicoianu/janusweb/releases/download/v${version}/janusweb-${version}.tar.gz"
+      wget "https://github.com/coderofsalvation/janusweb/releases/download/v1.7.5-rc/janusweb-1.7.5.tar.gz"
       tar -xvf janusweb-${version}.tar.gz
       mv janusweb-${version} src/v
     }