fix: clean render logic, idea for a content validater...

Author: neo451

lua/feed/commands.lua

@@ -11,11 +11,11 @@ local cmds = {}
 -- 1. unjam: stop the connection pool?
 -- 2. add_feed: add to database
 -- 3. db_unload: not needed? file handles are just closed... but is that efficient?
--- 4. load_opml: need to load locally
--- 5. export_opml
 -- 6. tag / untag: save to db
 -- 7. show: its a better name lol
 
+--- TODO: config.feeds and opml imported should be <link, table> to avoid dup
+
 ---load opml file to list of sources
 ---@param filepath string
 function cmds.load_opml(filepath)
@@ -24,6 +24,7 @@ function cmds.load_opml(filepath)
    local index_opml = opml.import(config.opml)
    vim.list_extend(index_opml.outline, outlines)
    index_opml:export(config.opml)
+   vim.list_extend(config.feeds, outlines)
 end
 
 ---index buffer commands
@@ -33,10 +34,11 @@ function cmds.show_in_browser()
 end
 
 function cmds.show_in_w3m()
+   local render = require "feed.render"
    if ut.check_command "W3m" then
       vim.cmd("W3m " .. render.current_entry().link)
    else
-      vim.notify "[rss.nvim]: need w3m.nvim installed"
+      vim.notify "[feed.nvim]: need w3m.nvim installed"
    end
 end
 
@@ -99,12 +101,11 @@ function cmds.show_index()
    config.og_colorscheme = vim.g.colors_name
    if not render.state.in_entry then
       if not render.buf.index then
-         print "reerer"
          render.prepare_bufs(cmds)
       end
       render.show_index()
    else
-      if render.state.rendered_once then
+      if render.state.index_rendered then
          if render.state.in_split then
             vim.cmd "q"
             render.state.in_split = false
@@ -117,14 +118,14 @@ end
 
 function cmds.show_next()
    local render = require "feed.render"
+   local db = require("feed.db").db(config.db_dir)
    if render.current_index == #db.index then
       return
    end
    render.current_index = render.current_index + 1
    render.show_entry(render.current_index)
 end
 
--- TODO: properly do 'ring' navigation, ie. wrap around
 function cmds.show_prev()
    local render = require "feed.render"
    if render.current_index == 1 then
@@ -176,7 +177,7 @@ function cmds:add_feed(str) end
 
 function cmds:telescope()
    if ut.check_command "Telescope" then
-      vim.cmd "Telescope rss"
+      vim.cmd "Telescope feed"
    end
 end
 

lua/feed/db.lua

@@ -64,10 +64,10 @@ end
 
 function db_mt:update_index()
    local ok, res = pcall(loadfile, self.dir .. "/index")
-   if ok then
+   if ok and res then
       self.index = res()
    else
-      print "failed to update index?"
+      print("[feed.nvim]: failed to load index: ", ok)
    end
 end
 
@@ -118,9 +118,15 @@ end
 
 ---@param dir string
 local function db(dir)
+   local index
    dir = vim.fn.expand(dir)
    local index_path = dir .. "/index"
-   local index = loadfile(index_path)()
+   local ok, res = pcall(loadfile, index_path)
+   if ok and res then
+      index = res()
+   else
+      print("[feed.nvim]: failed to load index: ", ok)
+   end
    return setmetatable({ dir = dir, index = index }, db_mt)
 end
 

lua/feed/feedparser.lua

@@ -3,6 +3,53 @@ local date = require "feed.date"
 local sha1 = require "feed.sha1"
 local ut = require "feed.utils"
 
+local function make_sure_list(t)
+   if #t == 0 and not vim.islist(t) then
+      t = { t }
+   end
+   return t
+end
+
+local entry_validator_mt = {}
+
+local expected_types = {
+   title = "string",
+   link = "string",
+   id = "string",
+   feed = "string",
+   author = "string",
+   content = "string",
+   time = "number",
+}
+
+local default = {
+   title = "<>",
+   link = "<>",
+   id = "<>",
+   feed = "<>",
+   author = "<>",
+   content = "<>",
+   time = 222222,
+}
+
+-- function entry_validator_mt:__newindex(k, v)
+--    if not (type(v) == expected_types[k]) then
+--       print("expected " .. expected_types[k] .. " got: " .. type(v))
+--       rawset(self, k, default[k]) -- HACK:
+--    end
+--    rawset(self, k, v)
+-- end
+
+local function V(t)
+   return setmetatable(t, entry_validator_mt)
+end
+
+local function remove_meta(t)
+   local mt = getmetatable(t)
+   mt.__index = nil
+   return t
+end
+
 ---check if json
 ---@param str string
 ---@return boolean
@@ -68,13 +115,6 @@ local function reify_entry(entry, feedtype, title)
    return res
 end
 
-local function make_sure_list(t)
-   if #t == 0 and not vim.islist(t) then
-      t = { t }
-   end
-   return t
-end
-
 ---walk the ast and retrive usefull info for all three types
 ---@param ast table
 ---@return feed.feed

lua/feed/render.lua

@@ -4,14 +4,13 @@ local M = {
    },
 }
 
-local flatdb = require "feed.db"
 local config = require "feed.config"
+local db = require("feed.db").db(config.db_dir)
 local ut = require "feed.utils"
-local db = flatdb.db(config.db_dir)
 local format = require "feed.format"
 
 ---@return feed.entry
-function M.current_entry()
+function M.get_entry_under_cursor()
    local row = vim.api.nvim_win_get_cursor(0)[1]
    return db.index[row - 1]
 end
@@ -50,13 +49,10 @@ end
 function M.prepare_bufs(cmds)
    M.buf = {
       index = vim.api.nvim_create_buf(false, true),
-      entry = {},
+      entry = vim.api.nvim_create_buf(false, true),
    }
-   for i = 1, 3 do
-      M.buf.entry[i] = vim.api.nvim_create_buf(false, true)
-      for rhs, lhs in pairs(config.keymaps.entry) do
-         ut.push_keymap(M.buf.entry[i], lhs, cmds[rhs], rhs)
-      end
+   for rhs, lhs in pairs(config.keymaps.entry) do
+      ut.push_keymap(M.buf.entry, lhs, cmds[rhs], rhs)
    end
    for rhs, lhs in pairs(config.keymaps.index) do
       ut.push_keymap(M.buf.index, lhs, cmds[rhs], rhs)
@@ -65,29 +61,30 @@ end
 
 ---render whole db as flat list
 function M.show_index()
-   if ut.check_command "ZenMode" then
-      vim.cmd "ZenMode"
-   end
    db:update_index()
    local lines = {}
    lines[1] = M.show_hint()
    for i, entry in ipairs(db.index) do
       lines[i + 1] = format.entry_name(entry)
    end
    M.show(lines, M.buf.index, ut.highlight_index)
-   M.state.rendered_once = true
+   M.state.index_rendered = true
 end
 
----@param index integer
-function M.show_entry(index)
-   local entry = M.get_entry(index)
-   M.show(format.entry(entry, db:get(entry)), M.buf.entry[2], ut.highlight_entry)
+local function apply_formatter(buf)
    local ok, conform = pcall(require, "conform")
    if ok then
-      vim.api.nvim_set_option_value("modifiable", true, { buf = M.buf.entry[2] })
-      conform.format { bufnr = M.buf.entry[2] }
-      vim.api.nvim_set_option_value("modifiable", false, { buf = M.buf.entry[2] })
+      vim.api.nvim_set_option_value("modifiable", true, { buf = buf })
+      conform.format { bufnr = buf }
+      vim.api.nvim_set_option_value("modifiable", false, { buf = buf })
    end
+end
+
+---@param index integer
+function M.show_entry(index)
+   local entry = M.get_entry(index)
+   M.show(format.entry(entry, db:get(entry)), M.buf.entry, ut.highlight_entry)
+   apply_formatter(M.buf.entry)
    entry.tags.unread = nil
    db:save()
 end

lua/telescope/_extensions/feed.lua

@@ -23,35 +23,35 @@ end
 
 local function feed(opts)
    pickers
-       .new(opts, {
-          prompt_title = "Feeds",
-          previewer = previewers.new_buffer_previewer {
-             --- TODO: attach highlighter! format content on disk to markdown
-             define_preview = function(self, entry, _)
-                local db_entry = db:address(db.index[entry.index])
-                conf.buffer_previewer_maker(db_entry, self.state.bufnr, {
-                   bufname = self.state.bufname,
-                   winid = self.state.winid,
-                   preview = opts.preview,
-                   file_encoding = opts.file_encoding,
-                })
-             end,
-          },
-          finder = finders.new_table {
-             results = lines,
-          },
-          attach_mappings = function(prompt_bufnr, map)
-             actions.select_default:replace(function()
-                actions.close(prompt_bufnr)
-                local selection = action_state.get_selected_entry()
-                local entry = db.index[selection.index]
-                render.show(format.entry(entry, db:get(entry)), render.buf.entry[2], ut.highlight_entry)
-             end)
-             return true
-          end,
-          sorter = conf.generic_sorter(opts), -- TODO: sort by date?
-       })
-       :find()
+      .new(opts, {
+         prompt_title = "Feeds",
+         previewer = previewers.new_buffer_previewer {
+            --- TODO: attach highlighter! format content on disk to markdown
+            define_preview = function(self, entry, _)
+               local db_entry = db:address(db.index[entry.index])
+               conf.buffer_previewer_maker(db_entry, self.state.bufnr, {
+                  bufname = self.state.bufname,
+                  winid = self.state.winid,
+                  preview = opts.preview,
+                  file_encoding = opts.file_encoding,
+               })
+            end,
+         },
+         finder = finders.new_table {
+            results = lines,
+         },
+         attach_mappings = function(prompt_bufnr, map)
+            actions.select_default:replace(function()
+               actions.close(prompt_bufnr)
+               local selection = action_state.get_selected_entry()
+               local entry = db.index[selection.index]
+               render.show(format.entry(entry, db:get(entry)), render.buf.entry[2], ut.highlight_entry)
+            end)
+            return true
+         end,
+         sorter = conf.generic_sorter(opts), -- TODO: sort by date?
+      })
+      :find()
 end
 
 return telescope.register_extension {

lua/treedoc/utils.lua

@@ -51,6 +51,4 @@ ut.list_tostring = function(obj)
    return ("%s [ %s ]"):format(obj.tag, table.concat(buf, " "))
 end
 
-ut.list_unhandled_tags "/home/n451/Plugins/feed.nvim/tree-sitter-html/src/grammar.json"
-
 return ut