kristoferssolo/telescope-frecency.nvim
1
0
Fork 0
mirror of https://github.com/kristoferssolo/telescope-frecency.nvim.git synced 2025-10-21 20:10:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: don't use string keys

Browse Source
This commit is contained in:
Senghan Bright 2021-01-16 01:05:23 +01:00
parent 231810a114
commit a12e98f7c7
3 changed files with 41 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lua/telescope/_extensions/frecency.lua
View File

@ -9,7 +9,7 @@ end
-- print("start") -- print("start")
local db_client = require("telescope._extensions.frecency.db_client") local db_client = require("telescope._extensions.frecency.db_client")
-- vim.defer_fn(db_client.init, 100) -- TODO: this is a crappy attempt to lessen loadtime impact, use VimEnter? -- vim.defer_fn(db_client.init, 100) -- TODO: this is a crappy attempt to lessen loadtime impact, use VimEnter?
db_client.init() -- TODO: this is a crappy attempt to lessen loadtime impact, use VimEnter? db_client.init()
-- finder code -- finder code

12
lua/telescope/_extensions/frecency/db_client.lua
View File

@ -56,9 +56,10 @@ end
local function get_file_scores() local function get_file_scores()
if not sql_wrapper then return {} end if not sql_wrapper then return {} end
local queries = sql_wrapper.queries
local scores = {} local scores = {}
local files = sql_wrapper:do_transaction('get_all_filepaths') local files = sql_wrapper:do_eval(queries.get_all_filepaths)
local timestamp_ages = sql_wrapper:do_transaction('get_all_timestamp_ages') local timestamp_ages = sql_wrapper:do_eval(queries.get_all_timestamp_ages)
if vim.tbl_isempty(files) then return scores end if vim.tbl_isempty(files) then return scores end
@ -97,13 +98,14 @@ end
local function validate() local function validate()
if not sql_wrapper then return {} end if not sql_wrapper then return {} end
local files = sql_wrapper:do_transaction('get_all_filepaths') local queries = sql_wrapper.queries
local files = sql_wrapper:do_transaction(queries.get_all_filepaths)
for _, entry in pairs(files) do for _, entry in pairs(files) do
if not util.fs_stat(entry.path).exists then if not util.fs_stat(entry.path).exists then
-- remove entries from file and timestamp tables -- remove entries from file and timestamp tables
print("removing entry: " .. entry.path .. "[" .. entry.id .."]") print("removing entry: " .. entry.path .. "[" .. entry.id .."]")
sql_wrapper:do_transaction('file_delete_entry', { id = entry.id }) sql_wrapper:do_transaction(queries.file_delete_entry, { id = entry.id })
sql_wrapper:do_transaction('timestamp_delete_with_file_id', { file_id = entry.id }) sql_wrapper:do_transaction(queries.timestamp_delete_with_file_id, { file_id = entry.id })
end end
end end
end end

67
lua/telescope/_extensions/frecency/sql_wrapper.lua
View File

@ -10,17 +10,17 @@ end
local MAX_TIMESTAMPS = 10 local MAX_TIMESTAMPS = 10
-- TODO: replace at least SELECT evals with db:select()
local queries = { local queries = {
["file_add_entry"] = "INSERT INTO files (path, count) values(:path, 1);", file_add_entry = "INSERT INTO files (path, count) values(:path, 1);",
["file_delete_entry"] = "DELETE FROM files WHERE id == :id;", file_delete_entry = "DELETE FROM files WHERE id == :id;",
["file_update_counter"] = "UPDATE files SET count = count + 1 WHERE path == :path;", file_update_counter = "UPDATE files SET count = count + 1 WHERE path == :path;",
["timestamp_add_entry"] = "INSERT INTO timestamps (file_id, timestamp) values(:file_id, julianday('now'));", timestamp_add_entry = "INSERT INTO timestamps (file_id, timestamp) values(:file_id, julianday('now'));",
["timestamp_delete_before_id"] = "DELETE FROM timestamps WHERE id < :id and file_id == :file_id;", timestamp_delete_before_id = "DELETE FROM timestamps WHERE id < :id and file_id == :file_id;",
["timestamp_delete_with_file_id"] = "DELETE FROM timestamps WHERE file_id == :file_id;", timestamp_delete_with_file_id = "DELETE FROM timestamps WHERE file_id == :file_id;",
["get_all_filepaths"] = "SELECT * FROM files;", get_all_filepaths = "SELECT * FROM files;",
["get_all_timestamp_ages"] = "SELECT id, file_id, CAST((julianday('now') - julianday(timestamp)) * 24 * 60 AS INTEGER) AS age FROM timestamps;", get_all_timestamp_ages = "SELECT id, file_id, CAST((julianday('now') - julianday(timestamp)) * 24 * 60 AS INTEGER) AS age FROM timestamps;",
["get_row"] = "SELECT * FROM files WHERE path == :path;", get_timestamp_ids_for_file = "SELECT id FROM timestamps WHERE file_id == :file_id;",
["get_timestamp_ids_for_file"] = "SELECT id FROM timestamps WHERE file_id == :file_id;",
} }
-- local ignore_patterns = { -- local ignore_patterns = {
@ -62,37 +62,36 @@ function M:bootstrap(opts)
-- create tables if they don't exist -- create tables if they don't exist
self.db:create("files", { self.db:create("files", {
ensure = true, ensure = true,
id = {"integer", "primary", "key"}, id = {"INTEGER", "PRIMARY", "KEY"},
count = "integer", count = "INTEGER",
path = "text" path = "TEXT"
}) })
self.db:create("timestamps", { self.db:create("timestamps", {
ensure = true, ensure = true,
id = {"integer", "primary", "key"}, id = {"INTEGER", "PRIMARY", "KEY"},
file_id = "integer", file_id = "INTEGER",
count = "integer", count = "INTEGER",
timestamp = "real" timestamp = "REAL"
-- FOREIGN KEY(file_id) REFERENCES files(id) -- FOREIGN KEY(file_id) REFERENCES files(id)
}) })
self.db:close() self.db:close()
end end
function M:do_transaction(query, params)
if not queries[query] then
print("invalid query_preset: " .. query )
return
end
function M:do_eval(query, params)
local res local res
self.db:with_open(function(db) res = db:eval(queries[query], params) end)
self.db:with_open(function(db) res = db:eval(query, params) end)
if res == true then res = {} end -- cater for eval returning true on empty set
return res return res
end end
function M:get_row_id(filepath) function M:get_filepath_row_id(filepath)
local result = self:do_transaction('get_row', { path = filepath }) local res
local func = function(db) res = db:select("files", { where = { path = filepath}}) end
return type(result) == "table" and result[1].id or nil self.db:with_open(func)
return res and res[1].id or nil
end end
function M:update(filepath) function M:update(filepath)
@ -104,23 +103,23 @@ function M:update(filepath)
-- create entry if it doesn't exist -- create entry if it doesn't exist
local file_id local file_id
file_id = self:get_row_id(filepath) file_id = self:get_filepath_row_id(filepath)
if not file_id then if not file_id then
self:do_transaction('file_add_entry', { path = filepath }) self:do_eval(queries.file_add_entry, { path = filepath })
file_id = self:get_row_id(filepath) file_id = self:get_filepath_row_id(filepath)
else else
-- ..or update existing entry -- ..or update existing entry
self:do_transaction('file_update_counter', { path = filepath }) self:do_eval(queries.file_update_counter, { path = filepath })
end end
-- register timestamp for this update -- register timestamp for this update
self:do_transaction('timestamp_add_entry', { file_id = file_id }) self:do_eval(queries.timestamp_add_entry, { file_id = file_id })
-- trim timestamps to MAX_TIMESTAMPS per file (there should be up to MAX_TS + 1 at this point) -- trim timestamps to MAX_TIMESTAMPS per file (there should be up to MAX_TS + 1 at this point)
local timestamps = self:do_transaction('get_timestamp_ids_for_file', { file_id = file_id }) local timestamps = self:do_eval(queries.get_timestamp_ids_for_file, { file_id = file_id })
local trim_at = timestamps[(#timestamps - MAX_TIMESTAMPS) + 1] local trim_at = timestamps[(#timestamps - MAX_TIMESTAMPS) + 1]
if trim_at then if trim_at then
self:do_transaction('timestamp_delete_before_id', { id = trim_at.id, file_id = file_id }) self:do_eval(queries.timestamp_delete_before_id, { id = trim_at.id, file_id = file_id })
end end
end end