na 1.2.80 → 1.2.82

data/lib/na/next_action.rb

@@ -5,27 +5,20 @@ module NA
   class << self
     include NA::Editor
 
-    attr_accessor :verbose, :extension, :include_ext, :na_tag, :command_line, :command, :globals, :global_file, :cwd_is, :cwd, :stdin
+    attr_accessor :verbose, :extension, :include_ext, :na_tag, :command_line, :command, :globals, :global_file,
+                  :cwd_is, :cwd, :stdin, :show_cwd_indicator
 
     def theme
       @theme ||= NA::Theme.load_theme
     end
 
-    ##
-    ## Output to STDERR
-    ##
-    ## @param      msg        [String] The message
-    ## @param      exit_code  [Number] The exit code, no
-    ##                        exit if false
-    ## @param      debug      [Boolean] only display message if running :verbose
-    ##
     def notify(msg, exit_code: false, debug: false)
       return if debug && !NA.verbose
 
       if debug
-        $stderr.puts NA::Color.template("{x}#{NA.theme[:debug]}#{msg}{x}")
+        warn NA::Color.template("{x}#{NA.theme[:debug]}#{msg}{x}")
       else
-        $stderr.puts NA::Color.template("{x}#{msg}{x}")
+        warn NA::Color.template("{x}#{msg}{x}")
       end
       Process.exit exit_code if exit_code
     end
@@ -38,16 +31,16 @@ module NA
       }
     end
 
-    ##
-    ## Display and read a Yes/No prompt
-    ##
-    ## @param      prompt   [String] The prompt string
-    ## @param      default  [Boolean] default value if
-    ##                      return is pressed or prompt is
-    ##                      skipped
-    ##
-    ## @return     [Boolean] result
-    ##
+    #
+    # Display and read a Yes/No prompt
+    #
+    # @param      prompt   [String] The prompt string
+    # @param      default  [Boolean] default value if
+    #                      return is pressed or prompt is
+    #                      skipped
+    #
+    # @return     [Boolean] result
+    #
     def yn(prompt, default: true)
       return default unless $stdout.isatty
 
@@ -63,14 +56,14 @@ module NA
       res.empty? ? default : res =~ /y/i
     end
 
-    ##
-    ## Helper function to colorize the Y/N prompt
-    ##
-    ## @param      choices  [Array] The choices with
-    ##                      default capitalized
-    ##
-    ## @return     [String] colorized string
-    ##
+    #
+    # Helper function to colorize the Y/N prompt
+    #
+    # @param      choices  [Array] The choices with
+    #                      default capitalized
+    #
+    # @return     [String] colorized string
+    #
     def color_single_options(choices = %w[y n])
       out = []
       choices.each do |choice|
@@ -84,53 +77,55 @@ module NA
       NA::Color.template("{xg}[#{out.join('/')}{xg}]{x}")
     end
 
-    ##
-    ## Create a new todo file
-    ##
-    ## @param      target    [String] The target path
-    ## @param      basename  [String] The project base name
-    ##
+    #
+    # Create a new todo file
+    #
+    # @param      target    [String] The target path
+    # @param      basename  [String] The project base name
+    #
     def create_todo(target, basename, template: nil)
       File.open(target, 'w') do |f|
-        if template && File.exist?(template)
-          content = IO.read(template)
-        else
-          content = <<~ENDCONTENT
-            Inbox:
-            #{basename}:
-            \tFeature Requests:
-            \tIdeas:
-            \tBugs:
-            Archive:
-            Search Definitions:
-            \tTop Priority @search(@priority = 5 and not @done)
-            \tHigh Priority @search(@priority > 3 and not @done)
-            \tMaybe @search(@maybe)
-            \tNext @search(@#{NA.na_tag} and not @done and not project = \"Archive\")
-          ENDCONTENT
-        end
+        content = if template && File.exist?(template)
+                    File.read(template)
+                  else
+                    <<~ENDCONTENT
+                      Inbox:
+                      #{basename}:
+                      \tFeature Requests:
+                      \tIdeas:
+                      \tBugs:
+                      Archive:
+                      Search Definitions:
+                      \tTop Priority @search(@priority = 5 and not @done)
+                      \tHigh Priority @search(@priority > 3 and not @done)
+                      \tMaybe @search(@maybe)
+                      \tNext @search(@#{NA.na_tag} and not @done and not project = "Archive")
+                    ENDCONTENT
+                  end
         f.puts(content)
       end
       save_working_dir(target)
       notify("#{NA.theme[:warning]}Created #{NA.theme[:file]}#{target}")
     end
 
-    ##
-    ## Select from multiple files
-    ##
-    ## @note       If `gum` or `fzf` are available, they'll
-    ##             be used (in that order)
-    ##
-    ## @param      files     [Array] The files
-    ## @param      multiple  [Boolean] allow multiple selections
-    ##
-    ## @return [String, Array] array if multiple
+    # Select from multiple files
+    #
+    # If `gum` or `fzf` are available, they'll be used (in that order).
+    #
+    # @param files [Array<String>] The files to select from
+    # @param multiple [Boolean] Allow multiple selections
+    # @return [String, Array<String>] Selected file(s)
     def select_file(files, multiple: false)
       res = choose_from(files, prompt: multiple ? 'Select files' : 'Select a file', multiple: multiple)
-
-      notify("#{NA.theme[:error]}No file selected, cancelled", exit_code: 1) unless res && res.length.positive?
-
-      res
+      if res.nil? || res == false || (res.respond_to?(:length) && res.empty?)
+        notify("#{NA.theme[:error]}No file selected, cancelled", exit_code: 1)
+        return nil
+      end
+      if multiple
+        res
+      else
+        res.is_a?(Array) ? res.first : res
+      end
     end
 
     def shift_index_after(projects, idx, length = 1)
@@ -142,11 +137,25 @@ module NA
       end
     end
 
+    # Find all projects in a todo file
+    #
+    # @param target [String] Path to the todo file
+    # @return [Array<NA::Project>] List of projects
     def find_projects(target)
       todo = NA::Todo.new(require_na: false, file_path: target)
       todo.projects
     end
 
+    # Find actions in a todo file matching criteria
+    #
+    # @param target [String] Path to the todo file
+    # @param search [String, nil] Search string
+    # @param tagged [String, nil] Tag to filter
+    # @param all [Boolean] Return all actions
+    # @param done [Boolean] Include done actions
+    # @param project [String, nil] Project name
+    # @param search_note [Boolean] Search notes
+    # @return [Array] Projects and actions
     def find_actions(target, search, tagged = nil, all: false, done: false, project: nil, search_note: true)
       todo = NA::Todo.new({ search: search,
                             search_note: search_note,
@@ -157,8 +166,9 @@ module NA
                             done: done })
 
       unless todo.actions.count.positive?
-        NA.notify("#{NA.theme[:error]}No matching actions found in #{File.basename(target, ".#{NA.extension}").highlight_filename}")
-        return
+        NA.notify("#{NA.theme[:error]}No matching actions found in #{File.basename(target,
+                                                                                   ".#{NA.extension}").highlight_filename}")
+        return [todo.projects, NA::Actions.new]
       end
 
       return [todo.projects, todo.actions] if todo.actions.count == 1 || all
@@ -166,7 +176,10 @@ module NA
       options = todo.actions.map { |action| "#{action.line} % #{action.parent.join('/')} : #{action.action}" }
       res = choose_from(options, prompt: 'Make a selection: ', multiple: true, sorted: true)
 
-      NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1) unless res && res.length.positive?
+      unless res&.length&.positive?
+        NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1)
+        return [todo.projects, NA::Actions.new]
+      end
 
       selected = NA::Actions.new
       res.each do |result|
@@ -177,7 +190,13 @@ module NA
       [todo.projects, selected]
     end
 
-    def insert_project(target, project, projects)
+    # Insert a new project into a todo file
+    #
+    # @param target [String] Path to the todo file
+    # @param project [String] Project name
+    # @param projects [Array<NA::Project>] Existing projects
+    # @return [NA::Project] The new project
+    def insert_project(target, project, _projects)
       path = project.split(%r{[:/]})
       todo = NA::Todo.new(file_path: target)
       built = []
@@ -207,11 +226,11 @@ module NA
           indent += 1
         end
 
-        if new_path.join('') =~ /Archive/i
+        if new_path.join =~ /Archive/i
           line = todo.projects.last&.last_line || 0
-          content = content.split(/\n/).insert(line, input.join("\n")).join("\n")
+          content = content.split("\n").insert(line, input.join("\n")).join("\n")
         else
-          split = content.split(/\n/)
+          split = content.split("\n")
           line = todo.projects.first&.line || 0
           before = split.slice(0, line).join("\n")
           after = split.slice(line, split.count - 0).join("\n")
@@ -227,8 +246,9 @@ module NA
           input.push("#{"\t" * indent}#{part.cap_first}:")
           indent += 1
         end
-        content = content.split(/\n/).insert(line, input.join("\n")).join("\n")
-        new_project = NA::Project.new(path.map(&:cap_first).join(':'), indent - 1, line + input.count - 1, line + input.count - 1)
+        content = content.split("\n").insert(line, input.join("\n")).join("\n")
+        new_project = NA::Project.new(path.map(&:cap_first).join(':'), indent - 1, line + input.count - 1,
+                                      line + input.count - 1)
       end
 
       File.open(target, 'w') do |f|
@@ -238,6 +258,28 @@ module NA
       new_project
     end
 
+    # Update actions in a todo file (add, edit, delete, move, etc.)
+    #
+    # @param target [String] Path to the todo file
+    # @param search [String, nil] Search string
+    # @param search_note [Boolean] Search notes
+    # @param add [Action, nil] Action to add
+    # @param add_tag [Array<String>] Tags to add
+    # @param all [Boolean] Update all matching actions
+    # @param append [Boolean] Append to project
+    # @param delete [Boolean] Delete matching actions
+    # @param done [Boolean] Mark as done
+    # @param edit [Boolean] Edit matching actions
+    # @param finish [Boolean] Mark as finished
+    # @param note [Array<String>] Notes to add
+    # @param overwrite [Boolean] Overwrite notes
+    # @param priority [Integer] Priority value
+    # @param project [String, nil] Project name
+    # @param move [String, nil] Move to project
+    # @param remove_tag [Array<String>] Tags to remove
+    # @param replace [String, nil] Replacement text
+    # @param tagged [String, nil] Tag to filter
+    # @return [void]
     def update_action(target,
                       search,
                       search_note: true,
@@ -257,7 +299,6 @@ module NA
                       remove_tag: [],
                       replace: nil,
                       tagged: nil)
-
       projects = find_projects(target)
       affected_actions = []
 
@@ -265,9 +306,11 @@ module NA
 
       if move
         move = move.sub(/:$/, '')
-        target_proj = projects.select { |pr| pr.project =~ /#{move.gsub(/:/, '.*?:.*?')}/i }.first
+        target_proj = projects.select { |pr| pr.project =~ /#{move.gsub(':', '.*?:.*?')}/i }.first
         if target_proj.nil?
-          res = NA.yn(NA::Color.template("#{NA.theme[:warning]}Project #{NA.theme[:file]}#{move}#{NA.theme[:warning]} doesn't exist, add it"), default: true)
+          res = NA.yn(
+            NA::Color.template("#{NA.theme[:warning]}Project #{NA.theme[:file]}#{move}#{NA.theme[:warning]} doesn't exist, add it"), default: true
+          )
           if res
             target_proj = insert_project(target, move, projects)
             projects << target_proj
@@ -277,90 +320,64 @@ module NA
         end
       end
 
-      contents = target.read_file.split(/\n/)
+      contents = target.read_file.split("\n")
 
       if add.is_a?(Action)
         add_tag ||= []
         add.process(priority: priority, finish: finish, add_tag: add_tag, remove_tag: remove_tag)
 
-        projects = find_projects(target)
-
-        target_proj = if target_proj
-                        projects.select { |proj| proj.project =~ /^#{target_proj.project}$/i }.first
-                      else
-                        # First try exact full-path match
-                        projects.select { |proj| proj.project =~ /^#{add.parent.join(':')}$/i }.first
-                      end
-
-        # If no exact match, try unique suffix match (e.g., :Ideas at end)
-        if target_proj.nil?
-          leaf = Regexp.escape(add.parent.join(':'))
-          suffix_matches = projects.select { |proj| proj.project =~ /(^|:)#{leaf}$/i }
-          if suffix_matches.count == 1
-            target_proj = suffix_matches.first
-          elsif suffix_matches.count > 1 && $stdout.isatty
-            choice = choose_from(suffix_matches.map(&:project), prompt: 'Select a target project: ', multiple: false)
-            target_proj = projects.select { |proj| proj.project == choice }.first if choice
-          end
-        end
-
-        if target_proj.nil?
-          res = NA.yn(NA::Color.template("#{NA.theme[:warning]}Project #{NA.theme[:file]}#{add.project}#{NA.theme[:warning]} doesn't exist, add it"), default: true)
-
-          if res
-            target_proj = insert_project(target, project, projects)
-            projects << target_proj
-          else
-            NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1)
-          end
-
-          NA.notify("#{NA.theme[:error]}Error parsing project #{NA.theme[:filename]}#{target}", exit_code: 1) if target_proj.nil?
+        # Remove the original action and its notes
+        action_line = add.line
+        note_lines = add.note.is_a?(Array) ? add.note.count : 0
+        contents.slice!(action_line, note_lines + 1)
 
-          projects = find_projects(target)
-          contents = target.read_file.split("\n")
-        end
+        # Prepare updated note
+        note = note.to_s.split("\n") unless note.is_a?(Array)
+        updated_note = if note.empty?
+                         add.note
+                       else
+                         overwrite ? note : add.note.concat(note)
+                       end
 
-        indent = "\t" * target_proj.indent
-        note = note.split("\n") unless note.is_a?(Array)
-        note = if note.empty?
-                 add.note
-               else
-                 overwrite ? note : add.note.concat(note)
-               end
-
-        note = note.empty? ? '' : "\n#{indent}\t\t#{note.join("\n#{indent}\t\t").strip}"
-
-        if append
-          this_idx = 0
-          projects.each_with_index do |proj, idx|
-            if proj.line == target_proj.line
-              this_idx = idx
-              break
-            end
-          end
-          target_line = if this_idx == projects.length - 1
-                          contents.count
+        # Prepare indentation
+        projects = find_projects(target)
+        # If move is set, update add.parent to the target project
+        add.parent = target_proj.project.split(':') if move && target_proj
+        target_proj = projects.select { |proj| proj.project =~ /^#{add.parent.join(':')}$/i }.first
+        indent = target_proj ? ("\t" * target_proj.indent) : ''
+
+        # Format note for insertion
+        note_str = updated_note.empty? ? '' : "\n#{indent}\t\t#{updated_note.join("\n#{indent}\t\t").strip}"
+
+        # Insert at correct location: if moving, insert at start/end of target project
+        if move && target_proj
+          insert_line = if append
+                          # End of project
+                          target_proj.last_line + 1
                         else
-                          projects[this_idx].last_line + 1
+                          # Start of project (after project header)
+                          target_proj.line + 1
                         end
+          contents.insert(insert_line, "#{indent}\t- #{add.action}#{note_str}")
         else
-          target_line = target_proj.line + 1
+          # Not moving, update in-place
+          contents.insert(action_line, "#{indent}\t- #{add.action}#{note_str}")
         end
 
-        contents.insert(target_line, "#{indent}\t- #{add.action}#{note}")
-
         notify(add.pretty)
 
         # Track affected action and description
-        changes = ["added"]
-        changes << "finished" if finish
+        changes = ['updated']
+        changes << 'finished' if finish
         changes << "priority=#{priority}" if priority.to_i.positive?
         changes << "tags+#{add_tag.join(',')}" unless add_tag.nil? || add_tag.empty?
         changes << "tags-#{remove_tag.join(',')}" unless remove_tag.nil? || remove_tag.empty?
-        changes << "note updated" unless note.nil? || note.empty?
+        changes << 'note updated' unless note.nil? || note.empty?
+        changes << "moved to #{target_proj.project}" if move && target_proj
         affected_actions << { action: add, desc: changes.join(', ') }
       else
-        _, actions = find_actions(target, search, tagged, done: done, all: all, project: project, search_note: search_note)
+        _, actions = find_actions(target, search, tagged, done: done, all: all, project: project,
+                                                          search_note: search_note)
 
         return if actions.nil?
 
@@ -425,15 +442,15 @@ module NA
 
           # Track affected action and description
           changes = []
-          changes << "finished" if finish
-          changes << "edited" if edit
+          changes << 'finished' if finish
+          changes << 'edited' if edit
           changes << "priority=#{priority}" if priority.to_i.positive?
           changes << "tags+#{add_tag.join(',')}" unless add_tag.nil? || add_tag.empty?
           changes << "tags-#{remove_tag.join(',')}" unless remove_tag.nil? || remove_tag.empty?
-          changes << "text replaced" if replace
+          changes << 'text replaced' if replace
           changes << "moved to #{target_proj.project}" if target_proj
-          changes << "note updated" unless note.nil? || note.empty?
-          changes = ["updated"] if changes.empty?
+          changes << 'note updated' unless note.nil? || note.empty?
+          changes = ['updated'] if changes.empty?
           affected_actions << { action: action, desc: changes.join(', ') }
         end
       end
@@ -454,23 +471,23 @@ module NA
           action_color = delete ? NA.theme[:error] : NA.theme[:success]
           notify("  #{entry[:action].to_s_pretty} — #{action_color}#{entry[:desc]}")
         end
+      elsif add
+        notify("#{NA.theme[:success]}Task added to #{NA.theme[:filename]}#{target}")
       else
-        if add
-          notify("#{NA.theme[:success]}Task added to #{NA.theme[:filename]}#{target}")
-        else
-          notify("#{NA.theme[:success]}Task updated in #{NA.theme[:filename]}#{target}")
-        end
+        notify("#{NA.theme[:success]}Task updated in #{NA.theme[:filename]}#{target}")
       end
     end
 
-    ##
-    ## Add an action to a todo file
-    ##
-    ## @param      file     [String] The target file
-    ## @param      project  [String] The project name
-    ## @param      action   [String] The action
-    ## @param      note     [String] The note
-    ##
+    # Add an action to a todo file
+    #
+    # @param file [String] Path to the todo file
+    # @param project [String] Project name
+    # @param action [String] Action text
+    # @param note [Array<String>] Notes
+    # @param priority [Integer] Priority value
+    # @param finish [Boolean] Mark as finished
+    # @param append [Boolean] Append to project
+    # @return [void]
     def add_action(file, project, action, note = [], priority: 0, finish: false, append: false)
       parent = project.split(%r{[:/]})
 
@@ -484,18 +501,21 @@ module NA
 
       action = Action.new(file, project, parent, action, nil, note)
 
-      update_action(file, nil, add: action, project: project, add_tag: add_tag, priority: priority, finish: finish, append: append)
+      update_action(file, nil, add: action, project: project, add_tag: add_tag, priority: priority, finish: finish,
+                               append: append)
     end
 
+    # Build a nested hash representing project hierarchy from actions
+    #
+    # @param actions [Array<Action>] List of actions
+    # @return [Hash] Nested hierarchy
     def project_hierarchy(actions)
       parents = { actions: [] }
       actions.each do |a|
         parent = a.parent
         current_parent = parents
         parent.each do |par|
-          if !current_parent.key?(par)
-            current_parent[par] = { actions: [] }
-          end
+          current_parent[par] = { actions: [] } unless current_parent.key?(par)
           current_parent = current_parent[par]
         end
 
@@ -512,14 +532,14 @@ module NA
     def output_children(children, level = 1)
       out = []
       indent = "\t" * level
+      return out if children.nil? || children.empty?
+
       children.each do |k, v|
         if k.to_s =~ /actions/
           indent += "\t"
-
-          v.each do |a|
+          v&.each do |a|
             item = "#{indent}- #{a.action}"
-
-            unless a.tags.empty?
+            unless a.tags.nil? || a.tags.empty?
               tags = []
               a.tags.each do |key, val|
                 next if key =~ /^(due|flagged|done)$/
@@ -528,12 +548,9 @@ module NA
                 tag += "-#{val}" unless val.nil? || val.empty?
                 tags.push(tag)
               end
-
               item += " @tags(#{tags.join(',')})" unless tags.empty?
             end
-
             item += "\n#{indent}\t#{a.note.join("\n#{indent}\t")}" unless a.note.empty?
-
             out.push(item)
           end
         else
@@ -544,26 +561,42 @@ module NA
       out
     end
 
+    # Open a file in the specified editor/application
+    #
+    # @param file [String, nil] Path to the file
+    # @param app [String, nil] Application to use
+    # @return [void]
     def edit_file(file: nil, app: nil)
       os_open(file, app: app) if file && File.exist?(file)
     end
 
-    ##
-    ## Use the *nix `find` command to locate files matching NA.extension
-    ##
-    ## @param      depth  [Number] The depth at which to search
-    ##
-    def find_files(depth: 1)
+    # Locate files matching NA.extension up to a given depth
+    #
+    # @param depth [Integer] The depth at which to search
+    # @param include_hidden [Boolean] Whether to include hidden directories/files
+    # @return [Array<String>] List of matching file paths
+    def find_files(depth: 1, include_hidden: false)
       NA::Benchmark.measure("find_files (depth=#{depth})") do
         return [NA.global_file] if NA.global_file
 
-        pattern = if depth == 1
-                    "*.#{NA.extension}"
-                  else
-                    "{#{'*,' * (depth - 1)}*}.#{NA.extension}"
-                  end
-
-        files = Dir.glob(pattern, File::FNM_DOTMATCH).reject { |f| f.start_with?('.') }
+        # Build a brace-expanded pattern list covering 1..depth levels, e.g.:
+        # depth=1 -> "*.ext"
+        # depth=3 -> "{*.ext,*/*.ext,*/*/*.ext}"
+        ext = NA.extension
+        patterns = (1..[depth.to_i, 1].max).map do |d|
+          prefix = d > 1 ? ('*/' * (d - 1)) : ''
+          "#{prefix}*.#{ext}"
+        end
+        pattern = patterns.length == 1 ? patterns.first : "{#{patterns.join(',')}}"
+
+        files = Dir.glob(pattern, File::FNM_DOTMATCH)
+        # Exclude hidden directories/files unless explicitly requested
+        unless include_hidden
+          files.reject! do |f|
+            # reject any path segment beginning with '.' (excluding '.' and '..')
+            f.split('/').any? { |seg| seg.start_with?('.') && seg !~ /^\.\.?$/ }
+          end
+        end
         files.each { |f| save_working_dir(File.expand_path(f)) }
         files
       end
@@ -575,15 +608,15 @@ module NA
         done: false,
         file_path: nil,
         negate: false,
+        hidden: false,
         project: nil,
         query: nil,
         regex: false,
-        require_na: true,
         search: nil,
         tag: nil
       }
       options = defaults.merge(options)
-      files = find_files(depth: options[:depth])
+      files = find_files(depth: options[:depth], include_hidden: options[:hidden])
 
       files.delete_if do |file|
         cmd_options = {
@@ -605,20 +638,13 @@ module NA
       files
     end
 
-    ##
-    ## Find a matching path using semi-fuzzy matching.
-    ## Search tokens can include ! and + to negate or make
-    ## required.
-    ##
-    ## @param      search        [Array] search tokens to
-    ##                           match
-    ## @param      distance      [Integer] allowed distance
-    ##                           between characters
-    ## @param      require_last  [Boolean] require regex to
-    ##                           match last element of path
-    ##
-    ## @return     [Array] array of matching directories/todo files
-    ##
+    # Find a matching path using semi-fuzzy matching.
+    # Search tokens can include ! and + to negate or make required.
+    #
+    # @param search [Array<Hash>] Search tokens to match
+    # @param distance [Integer] Allowed distance between characters
+    # @param require_last [Boolean] Require regex to match last element of path
+    # @return [Array<String>] Array of matching directories/todo files
     def match_working_dir(search, distance: 1, require_last: true)
       file = database_path
       NA.notify("#{NA.theme[:error]}No na database found", exit_code: 1) unless File.exist?(file)
@@ -637,7 +663,9 @@ module NA
 
       NA.notify("Optional directory regex: {x}#{optional.map { |t| t.dir_to_rx(distance: distance) }}", debug: true)
       NA.notify("Required directory regex: {x}#{required.map { |t| t.dir_to_rx(distance: distance) }}", debug: true)
-      NA.notify("Negated directory regex: {x}#{negated.map { |t| t.dir_to_rx(distance: distance, require_last: false) }}", debug: true)
+      NA.notify("Negated directory regex: {x}#{negated.map do |t|
+        t.dir_to_rx(distance: distance, require_last: false)
+      end}", debug: true)
 
       if require_last
         dirs.delete_if { |d| !d.sub(/\.#{NA.extension}$/, '').dir_matches(any: optional, all: required, none: negated) }
@@ -673,32 +701,30 @@ module NA
       out
     end
 
-    ##
-    ## Save a todo file path to the database
-    ##
-    ## @param      todo_file  The todo file path
-    ##
+    # Save a todo file path to the database
+    #
+    # @param todo_file [String] The todo file path
+    # @return [void]
     def save_working_dir(todo_file)
       NA::Benchmark.measure('save_working_dir') do
         file = database_path
         content = File.exist?(file) ? file.read_file : ''
-        dirs = content.split(/\n/)
+        dirs = content.split("\n")
         dirs.push(File.expand_path(todo_file))
         dirs.sort!.uniq!
         File.open(file, 'w') { |f| f.puts dirs.join("\n") }
       end
     end
 
-    ##
-    ## Save a backed-up file to the database
-    ##
-    ## @param      file  The file
-    ##
+    # Save a backed-up file to the database
+    #
+    # @param file [String] The file
+    # @return [void]
     def save_modified_file(file)
       db = database_path(file: 'last_modified.txt')
       file = File.expand_path(file)
       if File.exist? db
-        files = IO.read(db).split(/\n/).map(&:strip)
+        files = File.read(db).split("\n").map(&:strip)
         files.delete(file)
         files << file
         File.open(db, 'w') { |f| f.puts(files.join("\n")) }
@@ -707,22 +733,20 @@ module NA
       end
     end
 
-    ##
-    ## Get the last modified file from the database
-    ##
-    ## @param      search  The search
-    ##
+    # Get the last modified file from the database
+    #
+    # @param search [String, nil] Optional search string
+    # @return [String, nil] Last modified file path
     def last_modified_file(search: nil)
       files = backup_files
       files.delete_if { |f| f !~ Regexp.new(search.dir_to_rx(require_last: true)) } if search
       files.last
     end
 
-    ##
-    ## Get last modified file and restore a backup
-    ##
-    ## @param      search  The search
-    ##
+    # Get last modified file and restore a backup
+    #
+    # @param search [String, nil] Optional search string
+    # @return [void]
     def restore_last_modified_file(search: nil)
       file = last_modified_file(search: search)
       if file
@@ -732,22 +756,23 @@ module NA
       end
     end
 
-    ##
-    ## Get list of backed up files
-    ##
-    ## @return     [Array] list of file paths
-    ##
+    # Get list of backed up files
+    #
+    # @return [Array<String>] List of file paths
     def backup_files
       db = database_path(file: 'last_modified.txt')
       if File.exist?(db)
-        IO.read(db).strip.split(/\n/).map(&:strip)
+        File.read(db).strip.split("\n").map(&:strip)
       else
         NA.notify("#{NA.theme[:error]}Backup database not found")
-        File.open(db, 'w') { |f| f.puts }
+        File.open(db, 'w', &:puts)
         []
       end
     end
 
+    # Move deprecated backup files to new backup folder
+    #
+    # @return [void]
     def move_deprecated_backups
       backup_files.each do |file|
         if File.exist?(old_backup_path(file))
@@ -757,15 +782,18 @@ module NA
       end
     end
 
+    # Get the old backup file path for a file
+    #
+    # @param file [String] The file
+    # @return [String] Old backup file path
     def old_backup_path(file)
       File.join(File.dirname(file), ".#{File.basename(file)}.bak")
     end
 
-    ##
-    ## Get the backup file path for a file
-    ##
-    ## @param      file  The file
-    ##
+    # Get the backup file path for a file
+    #
+    # @param file [String] The file
+    # @return [String] Backup file path
     def backup_path(file)
       backup_home = File.expand_path('~/.local/share/na/backup')
       backup = old_backup_path(file)
@@ -777,6 +805,10 @@ module NA
       backup_target
     end
 
+    # Remove entries for missing backup files from the database
+    #
+    # @param file [String, nil] Optional file to filter
+    # @return [void]
     def weed_modified_files(file = nil)
       files = backup_files
 
@@ -787,11 +819,10 @@ module NA
       File.open(database_path(file: 'last_modified.txt'), 'w') { |f| f.puts files.join("\n") }
     end
 
-    ##
-    ## Restore a file from backup
-    ##
-    ## @param      file  The file
-    ##
+    # Restore a file from backup
+    #
+    # @param file [String] The file
+    # @return [void]
     def restore_modified_file(file)
       bak_file = backup_path(file)
       if File.exist?(bak_file)
@@ -804,11 +835,10 @@ module NA
       weed_modified_files(file)
     end
 
-    ##
-    ## Get path to database of known todo files
-    ##
-    ## @return     [String] File path
-    ##
+    # Get path to database of known todo files
+    #
+    # @param file [String] The database filename (default: 'tdlist.txt')
+    # @return [String] File path
     def database_path(file: 'tdlist.txt')
       db_dir = File.expand_path('~/.local/share/na')
       # Create directory if needed
@@ -816,11 +846,11 @@ module NA
       File.join(db_dir, file)
     end
 
-    ##
-    ## Platform-agnostic open command
-    ##
-    ## @param      file  [String] The file to open
-    ##
+    # Platform-agnostic open command
+    #
+    # @param file [String] The file to open
+    # @param app [String, nil] Optional application to use
+    # @return [void]
     def os_open(file, app: nil)
       os = RbConfig::CONFIG['target_os']
       case os
@@ -833,9 +863,9 @@ module NA
       end
     end
 
-    ##
-    ## Remove entries from cache database that no longer exist
-    ##
+    #
+    # Remove entries from cache database that no longer exist
+    #
     def weed_cache_file
       db_dir = File.expand_path('~/.local/share/na')
       db_file = 'tdlist.txt'
@@ -863,7 +893,7 @@ module NA
 
       projects = find_projects(target)
       projects.each do |proj|
-        parts = proj.project.split(/:/)
+        parts = proj.project.split(':')
         output = if paths
                    "{bg}#{parts.join('{bw}/{bg}')}{x}"
                  else
@@ -883,12 +913,10 @@ module NA
                content = File.exist?(file) ? file.read_file.strip : ''
                notify("#{NA.theme[:error]}Database empty", exit_code: 1) if content.empty?
 
-               content.split(/\n/)
+               content.split("\n")
              end
 
-      dirs.map! do |dir|
-        dir.highlight_filename
-      end
+      dirs.map!(&:highlight_filename)
 
       puts NA::Color.template(dirs.join("\n"))
     end
@@ -896,7 +924,7 @@ module NA
     def save_search(title, search)
       file = database_path(file: 'saved_searches.yml')
       searches = load_searches
-      title = title.gsub(/[^a-z0-9]/, '_').gsub(/_+/, '_')
+      title = title.gsub(/[^a-zA-Z0-9]/, '_').gsub(/_+/, '_').downcase
 
       if searches.key?(title)
         res = yn('Overwrite existing definition?', default: true)
@@ -909,10 +937,13 @@ module NA
       NA.notify("#{NA.theme[:success]}Search #{NA.theme[:filename]}#{title}#{NA.theme[:success]} saved", exit_code: 0)
     end
 
+    # Load saved search definitions from YAML file
+    #
+    # @return [Hash] Hash of saved searches
     def load_searches
       file = database_path(file: 'saved_searches.yml')
       if File.exist?(file)
-        searches = YAML.safe_load(file.read_file)
+        searches = YAML.load(file.read_file)
       else
         searches = {
           'soon' => 'tagged "due<in 2 days,due>yesterday"',
@@ -925,6 +956,10 @@ module NA
       searches
     end
 
+    # Delete saved search definitions by name
+    #
+    # @param strings [Array<String>, String, nil] Names of searches to delete
+    # @return [void]
     def delete_search(strings = nil)
       NA.notify("#{NA.theme[:error]}Name of search required", exit_code: 1) if strings.nil? || strings.empty?
 
@@ -933,7 +968,7 @@ module NA
 
       strings = [strings] unless strings.is_a? Array
 
-      searches = YAML.safe_load(file.read_file)
+      searches = YAML.load(file.read_file)
       keys = searches.keys.delete_if { |k| k !~ /(#{strings.map(&:wildcard_to_rx).join('|')})/ }
 
       NA.notify("#{NA.theme[:error]}No search named #{strings.join(', ')} found", exit_code: 1) if keys.empty?
@@ -947,9 +982,14 @@ module NA
 
       File.open(file, 'w') { |f| f.puts(YAML.dump(searches)) }
 
-      NA.notify("#{NA.theme[:warning]}Deleted {bw}#{keys.count}{x}#{NA.theme[:warning]} #{keys.count > 1 ? 'searches' : 'search'}", exit_code: 0)
+      NA.notify(
+        "#{NA.theme[:warning]}Deleted {bw}#{keys.count}{x}#{NA.theme[:warning]} #{keys.count > 1 ? 'searches' : 'search'}", exit_code: 0
+      )
     end
 
+    # Edit saved search definitions in the default editor
+    #
+    # @return [void]
     def edit_searches
       file = database_path(file: 'saved_searches.yml')
       searches = load_searches
@@ -963,23 +1003,22 @@ module NA
       NA.notify("#{NA.theme[:success]}Opened #{file} in #{editor}", exit_code: 0)
     end
 
-    ##
-    ## Create a backup file
-    ##
-    ## @param      target [String] The file to back up
-    ##
+    # Create a backup file
+    #
+    # @param target [String] The file to back up
+    # @return [void]
     def backup_file(target)
       FileUtils.cp(target, backup_path(target))
       save_modified_file(target)
       NA.notify("#{NA.theme[:warning]}Backup file created for #{target.highlight_filename}", debug: true)
     end
 
-    ##
-    ## Request terminal input from user, readline style
-    ##
-    ## @param      options  [Hash] The options
-    ## @param      prompt   [String] The prompt
-    ##
+    #
+    # Request terminal input from user, readline style
+    #
+    # @param      options  [Hash] The options
+    # @param      prompt   [String] The prompt
+    #
     def request_input(options, prompt: 'Enter text')
       if $stdin.isatty && TTY::Which.exist?('gum') && (options[:tagged].nil? || options[:tagged].empty?)
         opts = [%(--placeholder "#{prompt}"),
@@ -992,18 +1031,18 @@ module NA
       end
     end
 
-    ##
-    ## Generate a menu of options and allow user selection
-    ##
-    ## @return     [String] The selected option
-    ##
-    ## @param      options   [Array] The options from which to choose
-    ## @param      prompt    [String] The prompt
-    ## @param      multiple  [Boolean] If true, allow multiple selections
-    ## @param      sorted    [Boolean] If true, sort selections alphanumerically
-    ## @param      fzf_args  [Array] Additional fzf arguments
-    ##
-    ## @return [String, Array] array if multiple is true
+    #
+    # Generate a menu of options and allow user selection
+    #
+    # @return     [String] The selected option
+    #
+    # @param      options   [Array] The options from which to choose
+    # @param      prompt    [String] The prompt
+    # @param      multiple  [Boolean] If true, allow multiple selections
+    # @param      sorted    [Boolean] If true, sort selections alphanumerically
+    # @param      fzf_args  [Array] Additional fzf arguments
+    #
+    # @return [String, Array] array if multiple is true
     def choose_from(options, prompt: 'Make a selection: ', multiple: false, sorted: true, fzf_args: [])
       return nil unless $stdout.isatty
 
@@ -1031,12 +1070,14 @@ module NA
               reader = TTY::Reader.new
               puts
               options.each.with_index do |f, i|
-                puts NA::Color.template(format("#{NA.theme[:prompt]}%<idx> 2d{xw}) #{NA.theme[:filename]}%<action>s{x}\n", idx: i + 1, action: f))
+                puts NA::Color.template(format(
+                                          "#{NA.theme[:prompt]}%<idx> 2d{xw}) #{NA.theme[:filename]}%<action>s{x}\n", idx: i + 1, action: f
+                                        ))
               end
               result = reader.read_line(NA::Color.template("#{NA.theme[:prompt]}#{prompt}{x}")).strip
               if multiple
                 mult_res = []
-                result = result.gsub(/,/, ' ').gsub(/ +/, ' ').split(/ /)
+                result = result.gsub(',', ' ').gsub(/ +/, ' ').split(/ /)
                 result.each do |r|
                   mult_res << options[r.to_i - 1] if r.to_i&.positive?
                 end
@@ -1046,19 +1087,20 @@ module NA
               end
             end
 
-      return false if res&.strip&.size&.zero?
+      return false if res&.strip&.empty?
+
       # pp NA::Color.uncolor(NA::Color.template(res))
-      multiple ? NA::Color.uncolor(NA::Color.template(res)).split(/\n/) : NA::Color.uncolor(NA::Color.template(res))
+      multiple ? NA::Color.uncolor(NA::Color.template(res)).split("\n") : NA::Color.uncolor(NA::Color.template(res))
     end
 
     private
 
-    ##
-    ## macOS open command
-    ##
-    ## @param      file  The file
-    ## @param      app   The application
-    ##
+    #
+    # macOS open command
+    #
+    # @param      file  The file
+    # @param      app   The application
+    #
     def darwin_open(file, app: nil)
       if app
         `open -a "#{app}" #{Shellwords.escape(file)}`
@@ -1067,20 +1109,20 @@ module NA
       end
     end
 
-    ##
-    ## Windows open command
-    ##
-    ## @param      file  The file
-    ##
+    #
+    # Windows open command
+    #
+    # @param      file  The file
+    #
     def win_open(file)
       `start #{Shellwords.escape(file)}`
     end
 
-    ##
-    ## Linux open command
-    ##
-    ## @param      file  The file
-    ##
+    #
+    # Linux open command
+    #
+    # @param      file  The file
+    #
     def linux_open(file)
       if TTY::Which.exist?('xdg-open')
         `xdg-open #{Shellwords.escape(file)}`