fix: proper lazy load in whole plugin, fixed bug in intial db mkdir

Author: neo451

lua/feed.lua

@@ -8,7 +8,6 @@ vim.api.nvim_create_user_command("Feed", function(opts)
    local ut = require "feed.utils"
    local cmds = require("feed.commands").cmds
 
-   -- config.og_colorscheme = vim.g.colors_name
    render.prepare_bufs(cmds)
 
    if ut.check_command "Telescope" then

lua/feed/commands.lua

@@ -1,9 +1,5 @@
---- TODO: lazy load these ...
 local config = require "feed.config"
-local fetch = require "feed.fetch"
-local render = require "feed.render"
 local ut = require "feed.utils"
-local db = require("feed.db").db(config.db_dir)
 
 -- IDEAS:
 -- show random entry
@@ -20,46 +16,19 @@ local cmds = {}
 -- 6. tag / untag: save to db
 -- 7. show: its a better name lol
 
-cmds.load_opml = {
-   ---load opml file to list of sources
-   ---@param file string
-   impl = function(file)
-      local feedparser = require "feed.feedparser"
-      local feeds = feedparser.parse(file, { type = "opml" })
-      for _, feed in ipairs(feeds) do
-         local title = feed.title
-         local xmlUrl = feed.xmlUrl
-         table.insert(config.feeds, { xmlUrl, name = title })
-      end
-   end,
-   complete = function(lead)
-      local tab = { "abc", "efg", "hijk" }
-      return vim.iter(tab):filter(function(t)
-         return t:find(lead) ~= nil
-      end)
-   end,
-}
-
-local function Fee(opts)
-   local fargs = opts.fargs
-   local sub_key = table.remove(fargs, 1)
-   local sub_cmd = cmds[sub_key]
-   if not sub_cmd then
-      vim.notify("Feed: Unknown command: " .. sub_key, vim.log.levels.ERROR)
-   end
-   sub_cmd.impl(fargs, opts)
+---load opml file to list of sources
+---@param filepath string
+function cmds.load_opml(filepath)
+   local opml = require "feed.opml"
+   local outlines = opml.import(filepath).outline
+   local index_opml = opml.import(config.opml)
+   vim.list_extend(index_opml.outline, outlines)
+   index_opml:export(config.opml)
 end
 
-vim.api.nvim_create_user_command("Fee", Fee, {
-   nargs = "+",
-   desc = "Feed comp test",
-   complete = function(arg_lead, cmdline, _)
-      print(arg_lead)
-   end,
-})
-
 ---index buffer commands
 function cmds.show_in_browser()
+   local render = require "feed.render"
    vim.ui.open(render.current_entry().link)
 end
 
@@ -72,41 +41,48 @@ function cmds.show_in_w3m()
 end
 
 local function current_index()
+   local render = require "feed.render"
    local index = vim.api.nvim_win_get_cursor(0)[1] - 1
    render.current_index = index
    return index
 end
 
 function cmds.show_in_split()
+   local render = require "feed.render"
    render.state.in_split = true
    vim.cmd(config.split)
    vim.cmd(config.split:find "v" and "wincmd k" or "wincmd j")
    render.show_entry(current_index())
 end
 
 function cmds.show_entry()
+   local render = require "feed.render"
    render.state.in_entry = true
    render.show_entry(current_index())
 end
 
 function cmds.link_to_clipboard()
+   local render = require "feed.render"
    vim.fn.setreg("+", render.current_entry().link)
 end
 
 function cmds.tag()
+   local render = require "feed.render"
    local input = vim.fn.input "Tag: "
    render.current_entry().tags[input] = true
    -- db:save() -- TODO: do it on exit / or only if ":w" , make an option
    render.show_index() -- TODO: inefficient??, only rerender the one entry
 end
 
 function cmds.untag()
+   local render = require "feed.render"
    local input = vim.fn.input "Untag: "
    render.current_entry().tags[input] = nil
    render.show_index()
 end
 
 function cmds.quit_index()
+   local render = require "feed.render"
    --TODO: jump to the buffer before the index
    --- TODO: check if in index
    if ut.check_command "ZenMode" then
@@ -119,6 +95,8 @@ end
 
 --- entry buffer actions
 function cmds.show_index()
+   local render = require "feed.render"
+   config.og_colorscheme = vim.g.colors_name
    if not render.state.in_entry then
       if not render.buf.index then
          print "reerer"
@@ -138,6 +116,7 @@ function cmds.show_index()
 end
 
 function cmds.show_next()
+   local render = require "feed.render"
    if render.current_index == #db.index then
       return
    end
@@ -147,6 +126,7 @@ end
 
 -- TODO: properly do 'ring' navigation, ie. wrap around
 function cmds.show_prev()
+   local render = require "feed.render"
    if render.current_index == 1 then
       return
    end
@@ -159,7 +139,9 @@ function cmds.list_feeds()
 end
 
 function cmds.update()
-   config.opml_t = require("feed.opml").import(config.opml)
+   local db = require("feed.db").db(config.db_dir)
+   local fetch = require "feed.fetch"
+   local opml = require("feed.opml").import(config.opml)
    local ok, progress = pcall(require, "fidget.progress")
    local handle
    if not ok then
@@ -172,8 +154,8 @@ function cmds.update()
       }
    end
 
-   if config.opml_t then
-      config.feeds = vim.list_extend(config.feeds, config.opml_t.outline) -- TODO: remove duplicates ...
+   if opml then
+      config.feeds = vim.list_extend(config.feeds, opml.outline) -- TODO: remove duplicates ...
    end
 
    for _, link in ipairs(config.feeds) do
@@ -209,23 +191,15 @@ end
 
 ---@param args string[]
 local function load_command(args)
-   Pr(args)
    local cmd = table.remove(args, 1)
-   return cmds[cmd](unpack(args))
+   if type(cmds[cmd]) == "table" then
+      return cmds[cmd].impl(unpack(args))
+   elseif type(cmds[cmd]) == "function" then
+      return cmds[cmd](unpack(args))
+   end
 end
 
-local popup = require "plenary.popup"
-
 return {
    load_command = load_command,
    cmds = cmds,
 }
-
--- vim.api.nvim_create_autocmd("VimLeavePre", {
---    pattern = "*.md",
---    callback = function()
---       print "leave!"
---       db:save()
---       -- autocmds.update()
---    end,
--- })

lua/feed/fetch.lua

@@ -40,8 +40,6 @@ function M.update_feed(feed, total, handle)
          print(ast)
          return
       end
-      ---@type feed.opml
-      config.opml_t:append(ast.title, nil, ast.link, url)
       local entries = ast.entries
       for _, entry in ipairs(entries) do
          local content = entry.content

lua/feed/types.lua

@@ -2,7 +2,9 @@
 
 ---@alias feed.action function
 
----@class feed.feed
+---@alias feed.feed feed._feed | table | string
+
+---@class feed._feed
 ---@field title string
 ---@field link string
 ---@field entries feed.entry[]