Fix inserting templates from nested directory

Fixes #409.

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Fixed
+
+- Fixed inserting templates when the templates directory structure is nested.
+
 ## [v3.3.0](https://github.com/epwalsh/obsidian.nvim/releases/tag/v3.3.0) - 2024-02-17
 
 ### Added

lua/obsidian/commands/template.lua

@@ -17,13 +17,8 @@ return function(client, data)
   end
 
   if string.len(data.args) > 0 then
-    local template_name = data.args
-    local path = client:templates_dir() / template_name
-    if path:is_file() then
-      insert_template(data.args)
-    else
-      log.err "Not a valid template file"
-    end
+    local template_name = util.strip_whitespace(data.args)
+    insert_template(template_name)
     return
   end
 
@@ -35,7 +30,7 @@ return function(client, data)
 
   picker:find_templates {
     callback = function(path)
-      insert_template(vim.fs.basename(path))
+      insert_template(path)
     end,
   }
 end

lua/obsidian/templates.lua

@@ -85,7 +85,7 @@ end
 
 ---Insert a template at the given location.
 ---
----@param name string name of a template in the configured templates folder
+---@param name string name or path of a template in the configured templates folder
 ---@param client obsidian.Client
 ---@param location table a tuple with {bufnr, winnr, row, col}
 M.insert_template = function(name, client, location)
@@ -95,9 +95,29 @@ M.insert_template = function(name, client, location)
     return
   end
   local buf, win, row, col = unpack(location)
-  local template_path = templates_dir / name
   local title = require("obsidian.note").from_buffer(buf, client.dir):display_name()
 
+  ---@type Path
+  local template_path
+  local paths_to_check = { templates_dir / name, Path:new(name) }
+  for _, path in ipairs(paths_to_check) do
+    if path:is_file() then
+      template_path = path
+      break
+    elseif not vim.endswith(tostring(path), ".md") then
+      local path_with_suffix = Path:new(tostring(path) .. ".md")
+      if path_with_suffix:is_file() then
+        template_path = path_with_suffix
+        break
+      end
+    end
+  end
+
+  if template_path == nil then
+    log.err("Template '%s' not found", name)
+    return
+  end
+
   local insert_lines = {}
   local template_file = io.open(tostring(template_path), "r")
   if template_file then