na 1.2.35 → 1.2.38

data/lib/na/next_action.rb

@@ -3,8 +3,14 @@
 # Next Action methods
 module NA
   class << self
+    include NA::Editor
+
     attr_accessor :verbose, :extension, :na_tag, :command_line, :command, :globals, :global_file, :cwd_is, :cwd, :stdin
 
+    def theme
+      @theme ||= NA::Theme.load_theme
+    end
+
     ##
     ## Output to STDERR
     ##
@@ -16,7 +22,11 @@ module NA
     def notify(msg, exit_code: false, debug: false)
       return if debug && !NA.verbose
 
-      $stderr.puts NA::Color.template("{x}#{msg}{x}")
+      if debug
+        $stderr.puts NA::Color.template("{x}#{NA.theme[:debug]}#{msg}{x}")
+      else
+        $stderr.puts NA::Color.template("{x}#{msg}{x}")
+      end
       Process.exit exit_code if exit_code
     end
 
@@ -45,125 +55,6 @@ module NA
       res.empty? ? default : res =~ /y/i
     end
 
-    def default_editor
-      editor ||= ENV['NA_EDITOR'] || ENV['GIT_EDITOR'] || ENV['EDITOR']
-
-      if editor.good? && TTY::Which.exist?(editor)
-        return editor
-      end
-
-      notify('No EDITOR environment variable, testing available editors', debug: true)
-      editors = %w[vim vi code subl mate mvim nano emacs]
-      editors.each do |ed|
-        try = TTY::Which.which(ed)
-        if try
-          notify("Using editor #{try}", debug: true)
-          return try
-        end
-      end
-
-      notify('{br}No editor found{x}', exit_code: 5)
-
-      nil
-    end
-
-    def editor_with_args
-      args_for_editor(default_editor)
-    end
-
-    def args_for_editor(editor)
-      return editor if editor =~ /-\S/
-
-      args = case editor
-             when /^(subl|code|mate)$/
-               ['-w']
-             when /^(vim|mvim)$/
-               ['-f']
-             else
-               []
-             end
-      "#{editor} #{args.join(' ')}"
-    end
-
-    ##
-    ## Create a process for an editor and wait for the file handle to return
-    ##
-    ## @param      input  [String] Text input for editor
-    ##
-    def fork_editor(input = '', message: :default)
-      # raise NonInteractive, 'Non-interactive terminal' unless $stdout.isatty || ENV['DOING_EDITOR_TEST']
-
-      notify('{br}No EDITOR variable defined in environment{x}', exit_code: 5) if default_editor.nil?
-
-      tmpfile = Tempfile.new(['na_temp', '.na'])
-
-      File.open(tmpfile.path, 'w+') do |f|
-        f.puts input
-        unless message.nil?
-          f.puts message == :default ? '# First line is the action, lines after are added as a note' : message
-        end
-      end
-
-      pid = Process.fork { system("#{editor_with_args} #{tmpfile.path}") }
-
-      trap('INT') do
-        begin
-          Process.kill(9, pid)
-        rescue StandardError
-          Errno::ESRCH
-        end
-        tmpfile.unlink
-        tmpfile.close!
-        exit 0
-      end
-
-      Process.wait(pid)
-
-      begin
-        if $?.exitstatus == 0
-          input = IO.read(tmpfile.path)
-        else
-          exit_now! 'Cancelled'
-        end
-      ensure
-        tmpfile.close
-        tmpfile.unlink
-      end
-
-      input.split(/\n/).delete_if(&:ignore?).join("\n")
-    end
-
-    ##
-    ## Takes a multi-line string and formats it as an entry
-    ##
-    ## @param      input  [String] The string to parse
-    ##
-    ## @return     [Array] [[String]title, [Note]note]
-    ##
-    def format_input(input)
-      notify('No content in entry', exit_code: 1) if input.nil? || input.strip.empty?
-
-      input_lines = input.split(/[\n\r]+/).delete_if(&:ignore?)
-      title = input_lines[0]&.strip
-      notify('{br}No content in first line{x}', exit_code: 1) if title.nil? || title.strip.empty?
-
-      title.expand_date_tags
-
-      note = if input_lines.length > 1
-               input_lines[1..-1]
-             else
-               []
-             end
-
-
-      unless note.empty?
-        note.map!(&:strip)
-        note.delete_if { |l| l =~ /^\s*$/ || l =~ /^#/ }
-      end
-
-      [title, note]
-    end
-
     ##
     ## Helper function to colorize the Y/N prompt
     ##
@@ -213,20 +104,7 @@ module NA
         f.puts(content)
       end
       save_working_dir(target)
-      notify("{y}Created {bw}#{target}")
-    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)
-      return [NA.global_file] if NA.global_file
-
-      files = `find . -maxdepth #{depth} -name "*.#{NA.extension}"`.strip.split("\n")
-      files.each { |f| save_working_dir(File.expand_path(f)) }
-      files
+      notify("#{NA.theme[:warning]}Created #{NA.theme[:file]}#{target}")
     end
 
     ##
@@ -242,7 +120,7 @@ module NA
     def select_file(files, multiple: false)
       res = choose_from(files, prompt: multiple ? 'Select files' : 'Select a file', multiple: multiple)
 
-      notify('{r}No file selected, cancelled', exit_code: 1) unless res && res.length.positive?
+      notify("#{NA.theme[:error]}No file selected, cancelled", exit_code: 1) unless res && res.length.positive?
 
       res
     end
@@ -257,37 +135,41 @@ module NA
     end
 
     def find_projects(target)
-      _, _, projects = parse_actions(require_na: false, file_path: target)
-      projects
+      todo = NA::Todo.new(require_na: false, file_path: target)
+      todo.projects
     end
 
     def find_actions(target, search, tagged = nil, all: false, done: false)
-      _, actions, projects = parse_actions(search: search, require_na: false, file_path: target, tag: tagged, done: done)
-
-      unless actions.count.positive?
-        NA.notify("{r}No matching actions found in {bw}#{File.basename(target, ".#{NA.extension}")}")
+      todo = NA::Todo.new({ search: search,
+                            require_na: false,
+                            file_path: target,
+                            tag: tagged,
+                            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
       end
 
-      return [projects, actions] if actions.count == 1 || all
+      return [todo.projects, todo.actions] if todo.actions.count == 1 || all
 
-      options = actions.map { |action| "#{action.line} % #{action.parent.join('/')} : #{action.action}" }
+      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('{r}Cancelled', exit_code: 1) unless res && res.length.positive?
+      NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1) unless res && res.length.positive?
 
-      selected = []
+      selected = NA::Actions.new
       res.each do |result|
         idx = result.match(/^(\d+)(?= % )/)[1]
-        action = actions.select { |a| a.line == idx.to_i }.first
+        action = todo.actions.select { |a| a.line == idx.to_i }.first
         selected.push(action)
       end
-      [projects, selected]
+      [todo.projects, selected]
     end
 
     def insert_project(target, project, projects)
       path = project.split(%r{[:/]})
-      _, _, projects = parse_actions(file_path: target)
+      todo = NA::Todo.new(file_path: target)
       built = []
       last_match = nil
       final_match = nil
@@ -295,7 +177,7 @@ module NA
       matches = nil
       path.each_with_index do |part, i|
         built.push(part)
-        matches = projects.select { |proj| proj.project =~ /^#{built.join(':')}/i }
+        matches = todo.projects.select { |proj| proj.project =~ /^#{built.join(':')}/i }
         if matches.count.zero?
           final_match = last_match
           new_path = path.slice(i, path.count - i)
@@ -315,12 +197,12 @@ module NA
         end
 
         if new_path.join('') =~ /Archive/i
-          line = projects.last.last_line
+          line = todo.projects.last.last_line
           content = content.split(/\n/).insert(line, input.join("\n")).join("\n")
         else
           split = content.split(/\n/)
-          before = split.slice(0, projects.first.line).join("\n")
-          after = split.slice(projects.first.line, split.count - projects.first.line).join("\n")
+          before = split.slice(0, todo.projects.first.line).join("\n")
+          after = split.slice(todo.projects.first.line, split.count - todo.projects.first.line).join("\n")
           content = "#{before}\n#{input.join("\n")}\n#{after}"
         end
 
@@ -344,34 +226,6 @@ module NA
       new_project
     end
 
-    def process_action(action, priority: 0, finish: false, add_tag: [], remove_tag: [], note: [])
-      string = action.action
-
-      if priority&.positive?
-        string.gsub!(/(?<=\A| )@priority\(\d+\)/, '').strip!
-        string += " @priority(#{priority})"
-      end
-
-      add_tag.each do |tag|
-        string.gsub!(/(?<=\A| )@#{tag.gsub(/([()*?])/, '\\\\1')}(\(.*?\))?/, '')
-        string.strip!
-        string += " @#{tag}"
-      end
-
-      remove_tag.each do |tag|
-        string.gsub!(/(?<=\A| )@#{tag.gsub(/([()*?])/, '\\\\1')}(\(.*?\))?/, '')
-        string.strip!
-      end
-
-      string = "#{string.strip} @done(#{Time.now.strftime('%Y-%m-%d %H:%M')})" if finish && string !~ /(?<=\A| )@done/
-
-      action.action = string
-      action.action.expand_date_tags
-      action.note = note unless note.empty?
-
-      action
-    end
-
     def update_action(target,
                       search,
                       add: nil,
@@ -397,11 +251,11 @@ module NA
         project = project.sub(/:$/, '')
         target_proj = projects.select { |pr| pr.project =~ /#{project.gsub(/:/, '.*?:.*?')}/i }.first
         if target_proj.nil?
-          res = NA.yn(NA::Color.template("{y}Project {bw}#{project}{xy} doesn't exist, add it"), default: true)
+          res = NA.yn(NA::Color.template("#{NA.theme[:warning]}Project #{NA.theme[:file]}#{project}#{NA.theme[:warning]} doesn't exist, add it"), default: true)
           if res
             target_proj = insert_project(target, project, projects)
           else
-            NA.notify('{x}Cancelled', exit_code: 1)
+            NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1)
           end
         end
       end
@@ -410,24 +264,24 @@ module NA
 
       if add.is_a?(Action)
         add_tag ||= []
-        action = process_action(add, priority: priority, finish: finish, add_tag: add_tag, remove_tag: remove_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}$/ }.first
                       else
-                        projects.select { |proj| proj.project =~ /^#{action.parent.join(':')}$/ }.first
+                        projects.select { |proj| proj.project =~ /^#{add.parent.join(':')}$/ }.first
                       end
 
-        NA.notify("{r}Error parsing project #{target}", exit_code: 1) if target_proj.nil?
+        NA.notify("#{NA.theme[:error]}Error parsing project #{NA.theme[:filename]}#{target}", exit_code: 1) if target_proj.nil?
 
         indent = "\t" * target_proj.indent
         note = note.split("\n") unless note.is_a?(Array)
         note = if note.empty?
-                 action.note
+                 add.note
                else
-                 overwrite ? note : action.note.concat(note)
+                 overwrite ? note : add.note.concat(note)
                end
 
         note = note.empty? ? '' : "\n#{indent}\t\t#{note.join("\n#{indent}\t\t").strip}"
@@ -449,9 +303,9 @@ module NA
           target_line = target_proj.line + 1
         end
 
-        contents.insert(target_line, "#{indent}\t- #{action.action}#{note}")
+        contents.insert(target_line, "#{indent}\t- #{add.action}#{note}")
 
-        notify(action.pretty)
+        notify(add.pretty)
       else
         _, actions = find_actions(target, search, tagged, done: done, all: all)
 
@@ -464,12 +318,13 @@ module NA
           projects = shift_index_after(projects, action.line, action.note.count + 1)
 
           if edit
-            new_action, new_note = format_input(fork_editor("#{action.action}\n#{action.note.join("\n")}"))
+            editor_content = "#{action.action}\n#{action.note.join("\n")}"
+            new_action, new_note = Editor.format_input(Editor.fork_editor(editor_content))
             action.action = new_action
             action.note = new_note
           end
 
-          action = process_action(action, priority: priority, finish: finish, add_tag: add_tag, remove_tag: remove_tag)
+          action.process(priority: priority, finish: finish, add_tag: add_tag, remove_tag: remove_tag)
 
           target_proj = if target_proj
                           projects.select { |proj| proj.project =~ /^#{target_proj.project}$/ }.first
@@ -504,7 +359,6 @@ module NA
             target_line = target_proj.line + 1
           end
 
-
           contents.insert(target_line, "#{indent}\t- #{action.action}#{note}")
 
           notify(action.pretty)
@@ -514,7 +368,11 @@ module NA
       backup_file(target)
       File.open(target, 'w') { |f| f.puts contents.join("\n") }
 
-      add ? notify("{by}Task added to {bw}#{target}") : notify("{by}Task updated in {bw}#{target}")
+      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
     end
 
     ##
@@ -535,7 +393,6 @@ module NA
         else
           project = NA.cwd
         end
-        puts [add_tag, project]
       end
 
       action = Action.new(file, project, parent, action, nil, note)
@@ -560,6 +417,11 @@ module NA
       parents
     end
 
+    # Output an Omnifocus-friendly action list
+    #
+    # @param      children  The children
+    # @param      level     The indent level
+    #
     def output_children(children, level = 1)
       out = []
       indent = "\t" * level
@@ -595,220 +457,190 @@ module NA
       out
     end
 
+    def edit_file(file: nil, app: nil)
+      os_open(file, app: app) if file && File.exist?(file)
+    end
+
     ##
-    ## Pretty print a list of actions
+    ## Use the *nix `find` command to locate files matching NA.extension
     ##
-    ## @param      actions  [Array] The actions
-    ## @param      depth    [Number] The depth
-    ## @param      files    [Array] The files actions originally came from
-    ## @param      regexes  [Array] The regexes used to gather actions
+    ## @param      depth  [Number] The depth at which to search
     ##
-    def output_actions(actions, depth, files: nil, regexes: [], notes: false, nest: false, nest_projects: false)
-      return if files.nil?
-
-      if nest
-        template = '%parent%action'
-
-        parent_files = {}
-        out = []
-
-        if nest_projects
-          actions.each do |action|
-            if parent_files.key?(action.file)
-              parent_files[action.file].push(action)
-            else
-              parent_files[action.file] = [action]
-            end
-          end
-
-          parent_files.each do |file, acts|
-            projects = project_hierarchy(acts)
-            out.push("#{file.sub(%r{^./}, '').shorten_path}:")
-            out.concat(output_children(projects, 0))
-          end
-        else
-          template = '%parent%action'
-
-          actions.each do |action|
-            if parent_files.key?(action.file)
-              parent_files[action.file].push(action)
-            else
-              parent_files[action.file] = [action]
-            end
-          end
+    def find_files(depth: 1)
+      return [NA.global_file] if NA.global_file
 
-          parent_files.each do |k, v|
-            out.push("#{k.sub(%r{^\./}, '')}:")
-            v.each do |a|
-              out.push("\t- [#{a.parent.join('/')}] #{a.action}")
-              out.push("\t\t#{a.note.join("\n\t\t")}") unless a.note.empty?
-            end
-          end
-        end
-        NA::Pager.page out.join("\n")
-      else
-        template = if files.count.positive?
-                     if files.count == 1
-                       '%parent%action'
-                     else
-                       '%filename%parent%action'
-                     end
-                   elsif find_files(depth: depth).count > 1
-                     if depth > 1
-                       '%filename%parent%action'
-                     else
-                       '%project%parent%action'
-                     end
-                   else
-                     '%parent%action'
-                   end
-        template += '%note' if notes
-
-        files.map { |f| notify("{dw}#{f}", debug: true) } if files
-
-        output = actions.map { |action| action.pretty(template: { output: template }, regexes: regexes, notes: notes) }
-        NA::Pager.page(output.join("\n"))
-      end
+      files = `find . -maxdepth #{depth} -name "*.#{NA.extension}"`.strip.split("\n")
+      files.each { |f| save_working_dir(File.expand_path(f)) }
+      files
     end
 
-    ##
-    ## Read a todo file and create a list of actions
-    ##
-    ## @param      depth       [Number] The directory depth
-    ##                         to search for files
-    ## @param      done        [Boolean] include @done actions
-    ## @param      query       [Hash] The todo file query
-    ## @param      tag         [Array] Tags to search for
-    ## @param      search      [String] A search string
-    ## @param      negate      [Boolean] Invert results
-    ## @param      regex       [Boolean] Interpret as
-    ##                         regular expression
-    ## @param      project     [String] The project
-    ## @param      require_na  [Boolean] Require @na tag
-    ## @param      file_path   [String] file path to parse
-    ##
-    def parse_actions(depth: 1, done: false, query: nil, tag: nil, search: nil, negate: false, regex: false, project: nil, require_na: true, file_path: nil)
-      actions = []
-      required = []
-      optional = []
-      negated = []
-      required_tag = []
-      optional_tag = []
-      negated_tag = []
-      projects = []
-
-      notify("{dw}Tags: #{tag}", debug:true)
-      notify("{dw}Search: #{search}", debug:true)
-
-      tag&.each do |t|
-        unless t[:tag].nil?
-          if negate
-            optional_tag.push(t) if t[:negate]
-            required_tag.push(t) if t[:required] && t[:negate]
-            negated_tag.push(t) unless t[:negate]
-          else
-            optional_tag.push(t) unless t[:negate]
-            required_tag.push(t) if t[:required] && !t[:negate]
-            negated_tag.push(t) if t[:negate]
-          end
-        end
-      end
-
-      unless search.nil? || search.empty?
-        if regex || search.is_a?(String)
-          if negate
-            negated.push(search)
-          else
-            optional.push(search)
-            required.push(search)
-          end
-        else
-          search.each do |t|
-            opt, req, neg = parse_search(t, negate)
-            optional.concat(opt)
-            required.concat(req)
-            negated.concat(neg)
-          end
-        end
+    def find_files_matching(options = {})
+      defaults = {
+        depth: 1,
+        done: false,
+        file_path: nil,
+        negate: false,
+        project: nil,
+        query: nil,
+        regex: false,
+        require_na: true,
+        search: nil,
+        tag: nil
+      }
+      opts = defaults.merge(options)
+
+      files = find_files(depth: options[:depth])
+
+      files.delete_if do |file|
+        todo = NA::Todo.new({
+                              depth: options[:depth],
+                              done: options[:done],
+                              file_path: file,
+                              negate: options[:negate],
+                              project: options[:project],
+                              query: options[:query],
+                              regex: options[:regex],
+                              require_na: options[:require_na],
+                              search: options[:search],
+                              tag: options[:tag]
+                            })
+        todo.actions.length.zero?
       end
 
-      files = if !file_path.nil?
-                [file_path]
-              elsif query.nil?
-                find_files(depth: depth)
-              else
-                match_working_dir(query)
-              end
-
-      files.each do |file|
-        save_working_dir(File.expand_path(file))
-        content = file.read_file
-        indent_level = 0
-        parent = []
-        in_action = false
-        content.split("\n").each.with_index do |line, idx|
-          if line.project?
-            in_action = false
-            proj = line.project
-            indent = line.indent_level
-
-            if indent.zero? # top level project
-              parent = [proj]
-            elsif indent <= indent_level # if indent level is same or less, split parent before indent level and append
-              parent.slice!(indent, parent.count - indent)
-              parent.push(proj)
-            else # if indent level is greater, append project to parent
-              parent.push(proj)
-            end
+      files
+    end
 
-            projects.push(NA::Project.new(parent.join(':'), indent, idx, idx))
+    ##
+    ## 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
+    ##
+    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)
 
-            indent_level = indent
-          elsif line.blank?
-            in_action = false
-          elsif line.action?
-            in_action = false
+      dirs = file.read_file.split("\n")
 
-            action = line.action
-            new_action = NA::Action.new(file, File.basename(file, ".#{NA.extension}"), parent.dup, action, idx)
+      optional = search.filter { |s| !s[:negate] }.map { |t| t[:token] }
+      required = search.filter { |s| s[:required] && !s[:negate] }.map { |t| t[:token] }
+      negated = search.filter { |s| s[:negate] }.map { |t| t[:token] }
 
-            projects[-1].last_line = idx if projects.count.positive?
+      optional.push('*') if optional.count.zero? && required.count.zero? && negated.count.positive?
+      if optional == negated
+        required = ['*']
+        optional = ['*']
+      end
 
-            next if line.done? && !done
+      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)
 
-            next if require_na && !line.na?
+      if require_last
+        dirs.delete_if { |d| !d.sub(/\.#{NA.extension}$/, '').dir_matches(any: optional, all: required, none: negated) }
+      else
+        dirs.delete_if do |d|
+          !d.sub(/\.#{NA.extension}$/, '')
+            .dir_matches(any: optional, all: required, none: negated, distance: 2, require_last: false)
+        end
+      end
 
-            has_search = !optional.empty? || !required.empty? || !negated.empty?
+      dirs = dirs.sort_by { |d| File.basename(d) }.uniq
+      if dirs.empty? && require_last
+        NA.notify("#{NA.theme[:warning]}No matches, loosening search", debug: true)
+        match_working_dir(search, distance: 2, require_last: false)
+      else
+        dirs
+      end
+    end
 
-            next if has_search && !new_action.search_match?(any: optional,
-                                                            all: required,
-                                                            none: negated)
+    ##
+    ## Save a todo file path to the database
+    ##
+    ## @param      todo_file  The todo file path
+    ##
+    def save_working_dir(todo_file)
+      file = database_path
+      content = File.exist?(file) ? file.read_file : ''
+      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
 
-            if project
-              rx = project.split(%r{[/:]}).join('.*?/.*?')
-              next unless parent.join('/') =~ Regexp.new(rx, Regexp::IGNORECASE)
-            end
+    ##
+    ## Save a backed-up file to the database
+    ##
+    ## @param      file  The file
+    ##
+    def save_modified_file(file)
+      db = database_path(file: 'last_modified.txt')
+      file = File.expand_path(file)
+      files = IO.read(db).split(/\n/).map(&:strip)
+      files.delete(file)
+      files << file
+      File.open(db, 'w') { |f| f.puts(files.join("\n")) }
+    end
 
-            has_tag = !optional_tag.empty? || !required_tag.empty? || !negated_tag.empty?
-            next if has_tag && !new_action.tags_match?(any: optional_tag,
-                                                       all: required_tag,
-                                                       none: negated_tag)
+    ##
+    ## Get the last modified file from the database
+    ##
+    ## @param      search  The search
+    ##
+    def last_modified_file(search: nil)
+      db = database_path(file: 'last_modified.txt')
+      files = IO.read(db).split(/\n/).map(&:strip)
+      files.delete_if { |f| f !~ Regexp.new(search.dir_to_rx(require_last: true)) } if search
+      files.last
+    end
 
-            actions.push(new_action)
-            in_action = true
-          elsif in_action
-            actions[-1].note.push(line.strip) if actions.count.positive?
-            projects[-1].last_line = idx if projects.count.positive?
-          end
-        end
-        projects = projects.dup
+    ##
+    ## Get last modified file and restore a backup
+    ##
+    ## @param      search  The search
+    ##
+    def restore_last_modified_file(search: nil)
+      file = last_modified_file(search: search)
+      if file
+        restore_modified_file(file)
+      else
+        NA.notify("#{NA.theme[:error]}No matching file found")
       end
+    end
 
-      [files, actions, projects]
+    ##
+    ## Restore a file from backup
+    ##
+    ## @param      file  The file
+    ##
+    def restore_modified_file(file)
+      bak_file = File.join(File.dirname(file), ".#{File.basename(file)}.bak")
+      if File.exist?(bak_file)
+        FileUtils.mv(bak_file, file)
+        NA.notify("#{NA.theme[:success]}Backup restored for #{file.highlight_filename}")
+      else
+        NA.notify("#{NA.theme[:error]}Backup file for #{file.highlight_filename} not found")
+      end
     end
 
-    def edit_file(file: nil, app: nil)
-      os_open(file, app: app) if file && File.exist?(file)
+    ##
+    ## Get path to database of known todo files
+    ##
+    ## @return     [String] File path
+    ##
+    def database_path(file: 'tdlist.txt')
+      db_dir = File.expand_path('~/.local/share/na')
+      # Create directory if needed
+      FileUtils.mkdir_p(db_dir) unless File.directory?(db_dir)
+      File.join(db_dir, file)
     end
 
     ##
@@ -848,7 +680,7 @@ module NA
               elsif !file_path.nil?
                 [file_path]
               elsif query.nil?
-                find_files(depth: depth)
+                NA.find_files(depth: depth)
               else
                 match_working_dir(query)
               end
@@ -873,13 +705,13 @@ module NA
              else
                file = database_path
                content = File.exist?(file) ? file.read_file.strip : ''
-               notify('{br}Database empty', exit_code: 1) if content.empty?
+               notify("#{NA.theme[:error]}Database empty", exit_code: 1) if content.empty?
 
                content.split(/\n/)
              end
 
       dirs.map! do |dir|
-        "{xg}#{dir.sub(/^#{ENV['HOME']}/, '~').sub(%r{/([^/]+)\.#{NA.extension}$}, '/{xbw}\1{x}')}"
+        dir.highlight_filename
       end
 
       puts NA::Color.template(dirs.join("\n"))
@@ -892,13 +724,13 @@ module NA
 
       if searches.key?(title)
         res = yn('Overwrite existing definition?', default: true)
-        notify('{r}Cancelled', exit_code: 0) unless res
+        notify("#{NA.theme[:error]}Cancelled", exit_code: 0) unless res
 
       end
 
       searches[title] = search
       File.open(file, 'w') { |f| f.puts(YAML.dump(searches)) }
-      NA.notify("{y}Search #{title} saved", exit_code: 0)
+      NA.notify("#{NA.theme[:success]}Search #{NA.theme[:filename]}#{title}#{NA.theme[:success]} saved", exit_code: 0)
     end
 
     def load_searches
@@ -918,49 +750,37 @@ module NA
     end
 
     def delete_search(strings = nil)
-      NA.notify('{r}Name search required', exit_code: 1) if strings.nil? || strings.empty?
+      NA.notify("#{NA.theme[:error]}Name of search required", exit_code: 1) if strings.nil? || strings.empty?
 
       file = database_path(file: 'saved_searches.yml')
-      NA.notify('{r}No search definitions file found', exit_code: 1) unless File.exist?(file)
+      NA.notify("#{NA.theme[:error]}No search definitions file found", exit_code: 1) unless File.exist?(file)
 
       searches = YAML.safe_load(file.read_file)
       keys = searches.keys.delete_if { |k| k !~ /(#{strings.join('|')})/ }
 
-      res = yn(NA::Color.template(%({y}Remove #{keys.count > 1 ? 'searches' : 'search'} {bw}"#{keys.join(', ')}"{x})),
+      res = yn(NA::Color.template(%(#{NA.theme[:warning]}Remove #{keys.count > 1 ? 'searches' : 'search'} #{NA.theme[:file]}"#{keys.join(', ')}"{x})),
                default: false)
 
-      NA.notify('{r}Cancelled', exit_code: 1) unless res
+      NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1) unless res
 
       searches.delete_if { |k| keys.include?(k) }
 
       File.open(file, 'w') { |f| f.puts(YAML.dump(searches)) }
 
-      NA.notify("{y}Deleted {bw}#{keys.count}{xy} #{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
 
     def edit_searches
       file = database_path(file: 'saved_searches.yml')
       searches = load_searches
 
-      NA.notify('{r}No search definitions found', exit_code: 1) unless searches.count.positive?
+      NA.notify("#{NA.theme[:error]}No search definitions found", exit_code: 1) unless searches.count.positive?
 
-      editor = ENV['EDITOR']
-      NA.notify('{r}No $EDITOR defined', exit_code: 1) unless editor && TTY::Which.exist?(editor)
+      editor = NA.default_editor
+      NA.notify("#{NA.theme[:error]}No $EDITOR defined", exit_code: 1) unless editor && TTY::Which.exist?(editor)
 
       system %(#{editor} "#{file}")
-      NA.notify("Opened #{file} in #{editor}", exit_code: 0)
-    end
-
-    ##
-    ## Get path to database of known todo files
-    ##
-    ## @return     [String] File path
-    ##
-    def database_path(file: 'tdlist.txt')
-      db_dir = File.expand_path('~/.local/share/na')
-      # Create directory if needed
-      FileUtils.mkdir_p(db_dir) unless File.directory?(db_dir)
-      File.join(db_dir, file)
+      NA.notify("#{NA.theme[:success]}Opened #{file} in #{editor}", exit_code: 0)
     end
 
     ##
@@ -972,56 +792,8 @@ module NA
       file = ".#{File.basename(target)}.bak"
       backup = File.join(File.dirname(target), file)
       FileUtils.cp(target, backup)
-      NA.notify("{dw}Backup file created at #{backup}", debug: true)
-    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
-    ##
-    def match_working_dir(search, distance: 1, require_last: true)
-      file = database_path
-      notify('{r}No na database found', exit_code: 1) unless File.exist?(file)
-
-      dirs = file.read_file.split("\n")
-
-      optional = search.filter { |s| !s[:negate] }.map { |t| t[:token] }
-      required = search.filter { |s| s[:required] }.map { |t| t[:token] }
-      negated = search.filter { |s| s[:negate] }.map { |t| t[:token] }
-
-      optional.push('*') if optional.count.zero? && required.count.zero? && negated.count.positive?
-      if optional == negated
-        required = ['*']
-        optional = ['*']
-      end
-
-      NA.notify("{dw}Optional directory regex: {x}#{optional.map(&:dir_to_rx)}", debug: true)
-      NA.notify("{dw}Required directory regex: {x}#{required.map(&:dir_to_rx)}", debug: true)
-      NA.notify("{dw}Negated directory regex: {x}#{negated.map { |t| t.dir_to_rx(distance: 1, require_last: false) }}", debug: true)
-
-      if require_last
-        dirs.delete_if { |d| !d.sub(/\.#{NA.extension}$/, '').dir_matches(any: optional, all: required, none: negated) }
-      else
-        dirs.delete_if { |d| !d.sub(/\.#{NA.extension}$/, '').dir_matches(any: optional, all: required, none: negated, distance: 2, require_last: false) }
-      end
-
-      dirs = dirs.sort.uniq
-      if dirs.empty? && require_last
-        NA.notify("{y}No matches, loosening search", debug: true)
-        match_working_dir(search, distance: 2, require_last: false)
-      else
-        dirs
-      end
+      save_modified_file(target)
+      NA.notify("#{NA.theme[:warning]}Backup file created at #{backup.highlight_filename}", debug: true)
     end
 
     private
@@ -1057,15 +829,15 @@ module NA
                 '--item.foreground=""'
               ]
               args.push '--no-limit' if multiple
-              puts NS::Color.template("{bw}#{prompt}{x}")
+              puts NS::Color.template("#{NA.theme[:prompt]}#{prompt}{x}")
               `echo #{Shellwords.escape(options.join("\n"))}|#{TTY::Which.which('gum')} choose #{args.join(' ')}`.strip
             else
               reader = TTY::Reader.new
               puts
               options.each.with_index do |f, i|
-                puts NA::Color.template(format("{bw}%<idx> 2d{xw}) {y}%<action>s{x}\n", idx: i + 1, action: f))
+                puts NA::Color.template(format("#{NA.theme[:prompt]}%<idx> 2d{xw}) #{NA.theme[:file]}%<action>s{x}\n", idx: i + 1, action: f))
               end
-              result = reader.read_line(NA::Color.template("{bw}#{prompt}{x}")).strip
+              result = reader.read_line(NA::Color.template("#{NA.theme[:prompt]}#{prompt}{x}")).strip
               result.to_i&.positive? ? options[result.to_i - 1] : nil
             end
 
@@ -1074,39 +846,6 @@ module NA
       multiple ? res.split(/\n/) : res
     end
 
-    def parse_search(tag, negate)
-      required = []
-      optional = []
-      negated = []
-      new_rx = tag[:token].to_s.wildcard_to_rx
-
-      if negate
-        optional.push(new_rx) if tag[:negate]
-        required.push(new_rx) if tag[:required] && tag[:negate]
-        negated.push(new_rx) unless tag[:negate]
-      else
-        optional.push(new_rx) unless tag[:negate]
-        required.push(new_rx) if tag[:required] && !tag[:negate]
-        negated.push(new_rx) if tag[:negate]
-      end
-
-      [optional, required, negated]
-    end
-
-    ##
-    ## Save a todo file path to the database
-    ##
-    ## @param      todo_file  The todo file path
-    ##
-    def save_working_dir(todo_file)
-      file = database_path
-      content = File.exist?(file) ? file.read_file : ''
-      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
-
     ##
     ## macOS open command
     ##
@@ -1139,7 +878,7 @@ module NA
       if TTY::Which.exist?('xdg-open')
         `xdg-open #{Shellwords.escape(file)}`
       else
-        notify('{r}Unable to determine executable for `xdg-open`.')
+        notify("#{NA.theme[:error]}Unable to determine executable for `xdg-open`.")
       end
     end
   end