Refactoring, fixing edge cases

1 files changed, 64 insertions, 58 deletions

diff --git a/lua/simple-denote/internal.lua b/lua/simple-denote/internal.lua
index 7eabe61..319d069 100644
--- a/lua/simple-denote/internal.lua
+++ b/lua/simple-denote/internal.lua
@@ -1,25 +1,36 @@
 local M = {}
-local util = require("simple-denote.util")
 
----@param tags table
---- Create a_tag_string from tags table
-function M.make_tag_str(tags)
-  if not tags then return "" end
-  local tags_str = ""
-  for i, tag in pairs(tags) do
-    tag = util.plain_format(tag)
-    tags_str = tags_str .. tag
-    if i < #tags then
-      tags_str = tags_str .. "_"
-    end
-  end
-  return "__" .. tags_str:lower()
+--- Trim whitespace on either end of string
+function M.trim(str)
+   local from = str:match"^%s*()"
+   return from > #str and "" or str:match(".*%S", from)
 end
 
----@param title heading text
----@param ext file extension
+--- Make lowercase, remove special chars, remove extraneous spaces
+function M.plain_format(string)
+  if not string then return "" end
+  string = string:gsub("[^%w%s]","")
+  string = string:lower()
+  string = M.trim(string)
+  string = string:gsub("%s+"," ")
+  return string
+end
+
+---@param string string
+---@param char delimiter that replaces spaces (- for titles, _ for tags)
+--- Format the title/tags string of a Denote filename
+function M.format_denote_string(string, char)
+  string = M.plain_format(string)
+  if string == "" then return "" end
+  string = char .. char .. string:gsub("%s", char)
+  return string
+end
+
+---@param title string heading text
+---@param ext string file extension
+---Set the first line to title, including the appropriate heading char
 function M.set_heading(title, ext)
-  prefix = ""
+  local prefix = ""
   if ext == "md" then
     prefix = "# "
   elseif ext == "org" or ext == "norg" then
@@ -28,23 +39,30 @@ function M.set_heading(title, ext)
   vim.api.nvim_buf_set_lines(0, 0, 1, false, {prefix .. title})
 end
 
+---@param new_filename string
+---@param old_filename string
+---Save new file, delete old file
+function M.replace_file(old_filename, new_filename)
+  if old_filename ~= new_filename then
+    vim.cmd('saveas ' .. new_filename)
+    vim.cmd('silent !rm ' .. old_filename)
+  end
+end
+
 ---@param options table
----@param name string
+---@param title string
 ---@param tags table|nil
---- Opens your note
-function M.note(options, name, tags)
-  name = util.trim(name)
-  local og_name = name
-  local tags_str = M.make_tag_str(tags)
-  name = util.plain_format(name)
+---Edit a new note with a Denote filename
+function M.note(options, title, tags)
+  title = M.trim(title)
+  local og_title = title
+  tags = M.format_denote_string(tags, "_")
+  title = M.format_denote_string(title, "-")
   local file = options.dir .. os.date("%Y%m%dT%H%M%S")
-  if name ~= "" then
-    file = file .. "--"
-  end
-  file = file .. name .. tags_str .. "." .. options.ext
-  vim.cmd("e " .. file)
-  if options.add_heading and og_name ~= "" then
-    M.set_heading(og_name, options.ext)
+  file = file .. title .. tags .. "." .. options.ext
+  vim.cmd("edit " .. file)
+  if options.add_heading and og_title ~= "" then
+    M.set_heading(og_title, options.ext)
     vim.cmd("norm! o")
   end
   vim.cmd("startinsert")
@@ -52,51 +70,39 @@ end
 
 ---@param options table
 ---@param filename string
----@param new_title string
+---@param title string
 --- Retitles the filename and changes the first heading of the note
-function M.retitle(options, filename, new_title)
-  local new_filename = filename:match("^(.*%d%d%d%d%d%d%d%dT%d%d%d%d%d%d).-")
-  local tags_str = filename:match(".*(__.*)%..*")
+function M.retitle(options, filename, title)
+  local new_filename = filename:match("^(.-%d%d%d%d%d%d%d%dT%d%d%d%d%d%d).*")
+  local tags = filename:match(".-(__.*)%..*")
   if new_filename == nil then
     error("This file doesn't look like it has a Denote-style name")
   end
-  new_title = util.trim(new_title)
-  if options.retitle_heading and new_title ~= "" then
+  title = M.trim(title)
+  if options.retitle_heading and title ~= "" then
     local first_char = vim.api.nvim_buf_get_lines(0, 0, 1, false)[1]:sub(1, 1)
     if (first_char == "#" and options.ext == "md") or 
        (first_char == "*" and (options.ext == "org" or options.ext == "norg")) then
-      M.set_heading(new_title, options.ext)
+      M.set_heading(title, options.ext)
     end
   end
-  new_title = util.plain_format(new_title)
-  if new_title ~= "" then
-    new_title = "--" .. new_title
-  end
-  new_filename = new_filename .. new_title .. (tags_str or "") .. "." .. options.ext
-  if filename ~= new_filename then
-    vim.cmd('saveas ' .. new_filename)
-    vim.cmd('silent !rm ' .. filename)
-  end
+  title = M.format_denote_string(title, "-")
+  new_filename = new_filename .. title .. (tags or "") .. "." .. options.ext
+  M.replace_file(filename, new_filename)
 end
 
 ---@param options table
 ---@param filename string
 ---@param new_tags table
----Replaces the tags in filename with the tags in new_tags
-function M.retag(options, filename, new_tags)
+---Replaces the tags in filename
+function M.retag(options, filename, tags)
   local new_filename = filename:match("^(.*)__.*$")
   if new_filename == nil then
     new_filename = filename:match("^(.*)%..*$")
   end
-  local tags_str = M.make_tag_str(new_tags)
-  if tags_str ~= "" then
-    new_filename = new_filename .. tags_str
-  end
-  new_filename = new_filename .. "." .. options.ext
-  if filename ~= new_filename then
-    vim.cmd('saveas ' .. new_filename)
-    vim.cmd('silent !rm ' .. filename)
-  end
+  tags = M.format_denote_string(tags, "_")
+  new_filename = new_filename .. tags .. "." .. options.ext
+  M.replace_file(filename, new_filename)
 end
 
 return M