searchlink 2.3.69 → 2.3.71

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9615984b2fcd6435ae483198dd59b311218ab9df21e6b5b41df5dcfbe80e293
-  data.tar.gz: c0ef544491bfeb402c60b0f3843233515291dc706cac1b9cf448e0a5535aaffa
+  metadata.gz: 55880b0891d029bf3dde58968a5b55c4cb302b14ceecd8e5f279338abc070895
+  data.tar.gz: 7ea4da442f494ce7c956d9510f7eb20f295de133d91d7abe538c380bfd7b4d79
 SHA512:
-  metadata.gz: 4da2625e08d78d367917246412a11dec1e4c33888201ea6444bc19ee10764e243e20651e9ca883ba1c54cb6d7ba3a6131fba64a1f6a968fe43a0dfd69daa3380
-  data.tar.gz: c01d67b2ec225e12bd8bd25fa18833936f73f2e24b05ce28189873bd2dcc627513d00c68a23862ee7753519cc90a65d3512a5a51b12b9b3954e0a85569ed1323
+  metadata.gz: 61efe73ac610acaea6d949186358bb863df9ff10d9fd0698f6b5510c3128c4833e2904347deccdb335573e1dcc4793739ae801150e97ba4bbf1e0ade8544d979
+  data.tar.gz: 0dc5b9f05b691833a8a515f186513a4ee7c281d8358e81f1abdaf1f7412d855480ce8d34f4bbfd383682d811eeb016fbb1868cd6ff165b5cca36afd50eaea87b

data/lib/searchlink/exceptions.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module SL
+  # Custom Semantic Versioning error
+  class VersionError < StandardError
+    def initialize(msg)
+      msg = msg ? ": #{msg}" : ''
+      puts "Versioning error#{msg}"
+
+      super()
+
+      Process.exit 1
+    end
+  end
+
+  # Custom plugin error
+  class PluginError < StandardError
+    def initialize(msg = nil, plugin: nil)
+      plugin = %("#{plugin}") if plugin
+      plugin ||= 'plugin'
+      msg = ": #{msg}" if msg
+      puts "Error in #{plugin}#{msg}"
+
+      super()
+
+      Process.exit 1
+    end
+  end
+end

data/lib/searchlink/output.rb

@@ -62,13 +62,16 @@ module SL
 
     # Posts macOS notifications
     #
-    # @param      str   The title of the notification
-    # @param      sub   The text of the notification
+    # @param      title     [String]   The title of the notification
+    # @param      subtitle  [String]   The text of the notification
     #
-    def notify(str, sub)
+    def notify(title, subtitle)
       return unless SL.config['notifications']
 
-      `osascript -e 'display notification "SearchLink" with title "#{str}" subtitle "#{sub}"'`
+      title = title.gsub(/"/, '\\"')
+      subtitle = subtitle.gsub(/"/, '\\"')
+
+      `osascript -e 'display notification "SearchLink" with title "#{title}" subtitle "#{subtitle}"'`
     end
   end
 end

data/lib/searchlink/parse.rb

@@ -20,14 +20,14 @@ module SL
 
       input.parse_flags! unless skip_flags
 
-      options = %w[debug country_code inline prefix_random include_titles remove_seo validate_links]
+      options = %w[debug country_code inline prefix_random include_titles remove_seo validate_links complete_bare]
       options.each do |o|
         if input =~ /^ *#{o}:\s+(\S+)$/
           val = Regexp.last_match(1).strip
           val = true if val =~ /true/i
           val = false if val =~ /false/i
           SL.config[o] = val
-          $stderr.print "\r\033[0KGlobal config: #{o} = #{SL.config[o]}\n" unless SILENT
+          warn "\r\033[0KGlobal config: #{o} = #{SL.config[o]}\n" unless SILENT
         end
 
         next if skip_flags
@@ -57,7 +57,7 @@ module SL
       case input.strip
       when /^!?help$/i
         if SILENT
-          help_dialog # %x{open http://brettterpstra.com/projects/searchlink/}
+          help_dialog
         else
           $stdout.puts SL.version_check.to_s
           $stdout.puts 'See https://github.com/ttscoff/searchlink/wiki for help'
@@ -75,6 +75,117 @@ module SL
       Process.exit 0
     end
 
+    def create_footnote(mtch)
+      if mtch[1].nil? || mtch[1] == ''
+        match
+      else
+        note = mtch[1].strip
+        @footnote_counter += 1
+        ref = if !@link_text.empty? && @link_text.scan(/\s/).empty?
+                @link_text
+              else
+                format('%<p>sfn%<c>04d', p: @prefix, c: @footnote_counter)
+              end
+        SL.add_footer "[^#{ref}]: #{note}"
+        res = "[^#{ref}]"
+        @cursor_difference += (SL.match_length - res.length)
+        SL.match_length = res.length
+        SL.add_report("#{@match_string} => Footnote #{ref}")
+        res
+      end
+    end
+
+    def add_title(link_info)
+      @url = link_info
+      title = SL::URL.title(@url)
+      @link_text = title
+
+      if @ref_title
+        unless @links.key? @url
+          @links[@url] = @link_text
+          SL.add_footer SL.make_link(:ref_title, @link_text, @url, title: title, force_title: false)
+        end
+        @delete_line = true
+      elsif SL.config['inline']
+        res = SL.make_link(:inline, @link_text, @url, title: title, force_title: false)
+        @cursor_difference += SL.match_length - res.length
+        SL.match_length = res.length
+        SL.add_report("#{@match_string} => #{@url}")
+        res
+      else
+        unless @links.key? @url
+          @highest_marker += 1
+          @links[@url] = format('%<pre>s%<m>04d', pre: @prefix, m: @highest_marker)
+          SL.add_footer SL.make_link(:ref_title, @links[@url], @url, title: title, force_title: false)
+        end
+
+        type = SL.config['inline'] ? :inline : :ref_link
+        res = SL.make_link(type, @link_text, @links[@url], title: false, force_title: false)
+        @cursor_difference += SL.match_length - res.length
+        SL.match_length = res.length
+        SL.add_report("#{@match_string} => #{@url}")
+        res
+      end
+    end
+
+    def custom_search(search_type, search_terms)
+      SL.config['custom_site_searches'].each do |k, v|
+        next unless search_type == k
+
+        @link_text = search_terms if !SL.titleize && @link_text == ''
+        v = parse_arguments(v, { no_restore: true })
+        if v =~ %r{^(/|http)}i
+          search_type = 'r'
+          tokens = v.scan(/\$term\d+[ds]?/).sort.uniq
+
+          if !tokens.empty?
+            highest_token = 0
+            tokens.each do |token|
+              if token =~ /(\d+)[ds]?$/ && Regexp.last_match(1).to_i > highest_token
+                highest_token = Regexp.last_match(1).to_i
+              end
+            end
+            terms_p = search_terms.split(/ +/)
+            if terms_p.length > highest_token
+              remainder = terms_p[highest_token - 1..-1].join(' ')
+              terms_p = terms_p[0..highest_token - 2]
+              terms_p.push(remainder)
+            end
+            tokens.each do |t|
+              next unless t =~ /(\d+)[ds]?$/
+
+              int = Regexp.last_match(1).to_i - 1
+              replacement = terms_p[int]
+              case t
+              when /d$/
+                replacement.downcase!
+                re_down = ''
+              when /s$/
+                replacement.slugify!
+                re_down = ''
+              else
+                re_down = '(?!d|s)'
+              end
+              v.gsub!(/#{Regexp.escape(t) + re_down}/, replacement.url_encode)
+            end
+            search_terms = v
+          else
+            search_terms = v.gsub(/\$term[ds]?/i) do |mtch|
+              search_terms.downcase! if mtch =~ /d$/i
+              search_terms.slugify! if mtch =~ /s$/i
+              search_terms.url_encode
+            end
+          end
+        else
+          search_type = SL::GoogleSearch.api_key? ? 'gg' : 'g'
+          search_terms = "site:#{v} #{search_terms}"
+        end
+
+        break
+      end
+      [search_type, search_terms]
+    end
+
     def parse(input)
       SL.output = []
       return false if input.empty?
@@ -94,7 +205,7 @@ module SL
         SL.add_output("<!-- v#{latest_version} available, run SearchLink on the word 'update' to install. -->")
       end
 
-      links = {}
+      @links = {}
       SL.footer = []
       counter_links = 0
       counter_errors = 0
@@ -102,9 +213,9 @@ module SL
       input.sub!(/\n?<!-- Report:.*?-->\n?/m, '')
       input.sub!(/\n?<!-- Errors:.*?-->\n?/m, '')
 
-      input.scan(/\[(.*?)\]:\s+(.*?)\n/).each { |match| links[match[1].strip] = match[0] }
+      input.scan(/\[(.*?)\]:\s+(.*?)\n/).each { |match| @links[match[1].strip] = match[0] }
 
-      prefix = if SL.config['prefix_random']
+      @prefix = if SL.config['prefix_random']
                  if input =~ /\[(\d{4}-)\d+\]: \S+/
                    Regexp.last_match(1)
                  else
@@ -114,16 +225,27 @@ module SL
                  ''
                end
 
-      highest_marker = 0
-      input.scan(/^\s{,3}\[(?:#{prefix})?(\d+)\]: /).each do
+      @highest_marker = 0
+      input.scan(/^\s{,3}\[(?:#{@prefix})?(\d+)\]: /).each do
         m = Regexp.last_match
-        highest_marker = m[1].to_i if m[1].to_i > highest_marker
+        @highest_marker = m[1].to_i if m[1].to_i > @highest_marker
       end
 
-      footnote_counter = 0
-      input.scan(/^\s{,3}\[\^(?:#{prefix})?fn(\d+)\]: /).each do
+      @footnote_counter = 0
+      input.scan(/^\s{,3}\[\^(?:#{@prefix})?fn(\d+)\]: /).each do
         m = Regexp.last_match
-        footnote_counter = m[1].to_i if m[1].to_i > footnote_counter
+        @footnote_counter = m[1].to_i if m[1].to_i > @footnote_counter
+      end
+
+      if SL.config['complete_bare']
+        rx = %r{(?ix-m)(?<!\(|:\s|<)(?:
+                (?:https?://)(?:[\da-z.-]+)\.(?:[a-z.]{2,6})
+                (?:[/\w\d.\-()_/+=?&%]*?(?=[\s\n]|$))
+              )}
+        input.gsub!(rx) do
+          url_match = Regexp.last_match
+          url_match.pre_match =~ /!\S+ +$/ ? url_match[0] : "[%](#{url_match[0]})"
+        end
       end
 
       if input =~ /\[(.*?)\]\((.*?)\)/
@@ -135,7 +257,7 @@ module SL
         line_difference = 0
         lines.each_with_index do |line, num|
           SL.line_num = num - line_difference
-          cursor_difference = 0
+          @cursor_difference = 0
           # ignore links in code blocks
           if line =~ /^( {4,}|\t+)[^*+\-]/
             out.push(line)
@@ -155,22 +277,22 @@ module SL
             next
           end
 
-          delete_line = false
+          @delete_line = false
 
-          search_count = 0
+          @search_count = 0
 
           line.gsub!(/\[(.*?)\]\((.*?)\)/) do |match|
             this_match = Regexp.last_match
-            SL.match_column = this_match.begin(0) - cursor_difference
-            match_string = this_match.to_s
-            SL.match_length = match_string.length
+            SL.match_column = this_match.begin(0) - @cursor_difference
+            @match_string = this_match.to_s
+            SL.match_length = @match_string.length
             match_before = this_match.pre_match
 
             invalid_search = false
-            ref_title = false
+            @ref_title = false
 
             if match_before.scan(/(^|[^\\])`/).length.odd?
-              SL.add_report("Match '#{match_string}' within an inline code block")
+              SL.add_report("Match '#{@match_string}' within an inline code block")
               invalid_search = true
             end
 
@@ -179,14 +301,14 @@ module SL
               $stderr.print("\033[0K\rProcessed: #{counter_links} of #{total_links}, #{counter_errors} errors. ")
             end
 
-            link_text = this_match[1] || ''
+            @link_text = this_match[1] || ''
             link_info = parse_arguments(this_match[2].strip).strip || ''
 
-            if link_text.strip == '' && link_info =~ /".*?"/
+            if @link_text.strip == '' && link_info =~ /".*?"/
               link_info.gsub!(/"(.*?)"/) do
-                m = Regexp.last_match(1)
-                link_text = m if link_text == ''
-                %("#")
+                m = Regexp.last_match
+                @link_text = m[1] if @link_text == ''
+                m[0]
               end
             end
 
@@ -195,11 +317,11 @@ module SL
             end
 
             if link_info.strip =~ /:$/ && line.strip == match
-              ref_title = true
+              @ref_title = true
               link_info.sub!(/\s*:\s*$/, '')
             end
 
-            unless !link_text.empty? || !link_info.sub(/^[!\^]\S+/, '').strip.empty?
+            unless !@link_text.empty? || !link_info.sub(/^[!\^]\S+/, '').strip.empty?
               SL.add_error('No input', match)
               counter_errors += 1
               invalid_search = true
@@ -217,60 +339,15 @@ module SL
               match
             elsif link_info =~ /^\^(.+)/
               m = Regexp.last_match
-              if m[1].nil? || m[1] == ''
-                match
-              else
-                note = m[1].strip
-                footnote_counter += 1
-                ref = if !link_text.empty? && link_text.scan(/\s/).empty?
-                        link_text
-                      else
-                        format('%<p>sfn%<c>04d', p: prefix, c: footnote_counter)
-                      end
-                SL.add_footer "[^#{ref}]: #{note}"
-                res = "[^#{ref}]"
-                cursor_difference += (SL.match_length - res.length)
-                SL.match_length = res.length
-                SL.add_report("#{match_string} => Footnote #{ref}")
-                res
-              end
+              create_footnote(m)
             # Handle [](URL) and [%](URL), filling in title
-            elsif (link_text == '' || link_text == '%') && SL::URL.url?(link_info)
-              url = link_info
-              title = SL::URL.title(link_info)
-              link_text = title
-
-              if ref_title
-                unless links.key? url
-                  links[url] = link_text
-                  SL.add_footer SL.make_link(:ref_title, link_text, url, title: title, force_title: false)
-                end
-                delete_line = true
-              elsif SL.config['inline']
-                res = SL.make_link(:inline, link_text, url, title: title, force_title: false)
-                cursor_difference += SL.match_length - res.length
-                SL.match_length = res.length
-                SL.add_report("#{match_string} => #{url}")
-                res
-              else
-                unless links.key? url
-                  highest_marker += 1
-                  links[url] = format('%<pre>s%<m>04d', pre: prefix, m: highest_marker)
-                  SL.add_footer SL.make_link(:ref_title, links[url], url, title: title, force_title: false)
-                end
-
-                type = SL.config['inline'] ? :inline : :ref_link
-                res = SL.make_link(type, link_text, links[url], title: false, force_title: false)
-                cursor_difference += SL.match_length - res.length
-                SL.match_length = res.length
-                SL.add_report("#{match_string} => #{url}")
-                res
-              end
-            elsif (link_text == '' && link_info == '') || SL::URL.url?(link_info)
+            elsif (@link_text == '' || @link_text == '%') && SL::URL.url?(link_info)
+              add_title(link_info)
+            elsif (@link_text == '' && link_info == '') || SL::URL.url?(link_info)
               SL.add_error('Invalid search', match) unless SL::URL.url?(link_info)
               match
             else
-              link_info = link_text if !link_text.empty? && link_info == ''
+              link_info = @link_text if !@link_text.empty? && link_info == ''
 
               search_type = ''
               search_terms = ''
@@ -291,15 +368,15 @@ module SL
                 search_terms.strip!
 
                 # if the link text is just '%' replace with title regardless of config settings
-                if link_text == '%' && search_terms && !search_terms.empty?
+                if @link_text == '%' && search_terms && !search_terms.empty?
                   SL.titleize = true
-                  link_text = ''
+                  @link_text = ''
                 end
 
-                search_terms = link_text if search_terms == ''
+                search_terms = @link_text if search_terms == ''
 
                 # if the input starts with a +, append it to the link text as the search terms
-                search_terms = "#{link_text} #{search_terms.strip.sub(/^\+\s*/, '')}" if search_terms.strip =~ /^\+[^+]/
+                search_terms = "#{@link_text} #{search_terms.strip.sub(/^\+\s*/, '')}" if search_terms.strip =~ /^\+[^+]/
 
                 # if the end of input contain "^", copy to clipboard instead of STDOUT
                 SL.clipboard = true if search_terms =~ /(!!)?\^(!!)?$/
@@ -314,19 +391,19 @@ module SL
 
                 if search_word && SL::Searches.valid_search?(search_word[1])
                   search_type = search_word[1] unless search_word.nil?
-                  search_terms = link_text
+                  search_terms = @link_text
                 elsif search_word && search_word[1] =~ /^(\S+\.)+\S+$/
                   search_type = SL::GoogleSearch.api_key? ? 'gg' : 'g'
                   puts SL::GoogleSearch.api_key?
-                  search_terms = "site:#{search_word[1]} #{link_text}"
+                  search_terms = "site:#{search_word[1]} #{@link_text}"
                 else
                   SL.add_error("Invalid search#{SL::Searches.did_you_mean(search_word[1])}", match)
                   search_type = false
                   search_terms = false
                 end
-              elsif link_text && !link_text.empty? && (!link_info || link_info.empty?)
+              elsif @link_text && !@link_text.empty? && (!link_info || link_info.empty?)
                 search_type = SL::GoogleSearch.api_key? ? 'gg' : 'g'
-                search_terms = link_text
+                search_terms = @link_text
               elsif link_info && !link_info.empty?
                 search_type = SL::GoogleSearch.api_key? ? 'gg' : 'g'
                 search_terms = link_info
@@ -337,109 +414,64 @@ module SL
               end
 
               if search_type && !search_terms.empty?
-                SL.config['custom_site_searches'].each do |k, v|
-                  next unless search_type == k
-
-                  link_text = search_terms if !SL.titleize && link_text == ''
-                  v = parse_arguments(v, { no_restore: true })
-                  if v =~ %r{^(/|http)}i
-                    search_type = 'r'
-                    tokens = v.scan(/\$term\d+[ds]?/).sort.uniq
-
-                    if !tokens.empty?
-                      highest_token = 0
-                      tokens.each do |token|
-                        if token =~ /(\d+)[ds]?$/ && Regexp.last_match(1).to_i > highest_token
-                          highest_token = Regexp.last_match(1).to_i
-                        end
-                      end
-                      terms_p = search_terms.split(/ +/)
-                      if terms_p.length > highest_token
-                        remainder = terms_p[highest_token - 1..-1].join(' ')
-                        terms_p = terms_p[0..highest_token - 2]
-                        terms_p.push(remainder)
-                      end
-                      tokens.each do |t|
-                        next unless t =~ /(\d+)[ds]?$/
-
-                        int = Regexp.last_match(1).to_i - 1
-                        replacement = terms_p[int]
-                        case t
-                        when /d$/
-                          replacement.downcase!
-                          re_down = ''
-                        when /s$/
-                          replacement.slugify!
-                          re_down = ''
-                        else
-                          re_down = '(?!d|s)'
-                        end
-                        v.gsub!(/#{Regexp.escape(t) + re_down}/, replacement.url_encode)
-                      end
-                      search_terms = v
-                    else
-                      search_terms = v.gsub(/\$term[ds]?/i) do |mtch|
-                        search_terms.downcase! if mtch =~ /d$/i
-                        search_terms.slugify! if mtch =~ /s$/i
-                        search_terms.url_encode
-                      end
-                    end
-                  else
-                    search_type = SL::GoogleSearch.api_key? ? 'gg' : 'g'
-                    search_terms = "site:#{v} #{search_terms}"
-                  end
-
-                  break
-                end
+                search_type, search_terms = custom_search(search_type, search_terms)
               end
 
-              if (search_type && search_terms) || url
+              if (search_type && search_terms) || @url
                 # warn "Searching #{search_type} for #{search_terms}"
-                unless url
-                  search_count += 1
-                  url, title, link_text = do_search(search_type, search_terms, link_text, search_count)
+                unless @url
+                  @search_count += 1
+                  @url, title, @link_text = do_search(search_type, search_terms, @link_text, @search_count)
+                end
+
+                if (@link_text == '' || @link_text == '%') && @url
+                  if title
+                    @link_text = title
+                  else
+                    add_title(@url)
+                  end
                 end
 
-                if url
-                  title = SL::URL.title(url) if SL.titleize && title == ''
+                if @url
+                  title = SL::URL.title(@url) if SL.titleize && title == ''
 
-                  link_text = title if link_text == '' && title
+                  @link_text = title if @link_text == '' && title
                   force_title = search_type =~ /def/ ? true : false
 
-                  if link_only || search_type =~ /sp(ell)?/ || url == 'embed'
-                    url = title if url == 'embed'
-                    cursor_difference += SL.match_length - url.length
-                    SL.match_length = url.length
-                    SL.add_report("#{match_string} => #{url}")
-                    url
-                  elsif ref_title
-                    unless links.key? url
-                      links[url] = link_text
-                      SL.add_footer SL.make_link(:ref_title, link_text, url, title: title, force_title: force_title)
+                  if link_only || search_type =~ /sp(ell)?/ || @url == 'embed'
+                    @url = title if @url == 'embed'
+                    @cursor_difference += SL.match_length - @url.length
+                    SL.match_length = @url.length
+                    SL.add_report("#{@match_string} => #{@url}")
+                    @url
+                  elsif @ref_title
+                    unless @links.key? @url
+                      @links[@url] = @link_text
+                      SL.add_footer SL.make_link(:ref_title, @link_text, @url, title: title, force_title: force_title)
                     end
-                    delete_line = true
+                    @delete_line = true
                   elsif SL.config['inline']
-                    res = SL.make_link(:inline, link_text, url, title: title, force_title: force_title)
-                    cursor_difference += SL.match_length - res.length
+                    res = SL.make_link(:inline, @link_text, @url, title: title, force_title: force_title)
+                    @cursor_difference += SL.match_length - res.length
                     SL.match_length = res.length
-                    SL.add_report("#{match_string} => #{url}")
+                    SL.add_report("#{@match_string} => #{@url}")
                     res
                   else
-                    unless links.key? url
-                      highest_marker += 1
-                      links[url] = format('%<pre>s%<m>04d', pre: prefix, m: highest_marker)
-                      SL.add_footer SL.make_link(:ref_title, links[url], url, title: title, force_title: force_title)
+                    unless @links.key? @url
+                      @highest_marker += 1
+                      @links[@url] = format('%<pre>s%<m>04d', pre: @prefix, m: @highest_marker)
+                      SL.add_footer SL.make_link(:ref_title, @links[@url], @url, title: title, force_title: force_title)
                     end
 
                     type = SL.config['inline'] ? :inline : :ref_link
-                    res = SL.make_link(type, link_text, links[url], title: false, force_title: force_title)
-                    cursor_difference += SL.match_length - res.length
+                    res = SL.make_link(type, @link_text, @links[@url], title: false, force_title: force_title)
+                    @cursor_difference += SL.match_length - res.length
                     SL.match_length = res.length
-                    SL.add_report("#{match_string} => #{url}")
+                    SL.add_report("#{@match_string} => #{@url}")
                     res
                   end
                 else
-                  SL.add_error('No results', "#{search_terms} (#{match_string})")
+                  SL.add_error('No results', "#{search_terms} (#{@match_string})")
                   counter_errors += 1
                   match
                 end
@@ -450,9 +482,9 @@ module SL
               end
             end
           end
-          line_difference += 1 if delete_line
-          out.push(line) unless delete_line
-          delete_line = false
+          line_difference += 1 if @delete_line
+          out.push(line) unless @delete_line
+          @delete_line = false
         end
         warn "\n" unless SILENT
 
@@ -514,8 +546,8 @@ module SL
         ## using hostname as text without doing search
         if SL::URL.only_url?(input.strip)
           type = reference_link ? :ref_title : :inline
-          url, title = SL::URL.url_to_link(input.strip, type)
-          print SL.make_link(type, title, url, title: false, force_title: false)
+          @url, title = SL::URL.url_to_link(input.strip, type)
+          print SL.make_link(type, title, @url, title: false, force_title: false)
           Process.exit
         end
 
@@ -532,10 +564,10 @@ module SL
         #   input.sub!(/\+.*?$/, '').strip!
         # end
 
-        link_text = false
+        @link_text = false
 
         if input =~ /"(.*?)"/
-          link_text = Regexp.last_match(1)
+          @link_text = Regexp.last_match(1)
           input.gsub!(/"(.*?)"/, '\1')
         end
 
@@ -546,7 +578,7 @@ module SL
         when /^!(\S+)\s+(.*)$/
           type = Regexp.last_match(1)
           link_info = Regexp.last_match(2).strip
-          link_text ||= link_info
+          @link_text ||= link_info
           terms = link_info + additional_terms
           terms.strip!
 
@@ -556,7 +588,7 @@ module SL
               SL.config['custom_site_searches'].each do |k, v|
                 next unless type == k
 
-                link_text = terms if link_text == ''
+                @link_text = terms if @link_text == ''
                 v = parse_arguments(v, { no_restore: true })
                 if v =~ %r{^(/|http)}i
                   type = 'r'
@@ -614,10 +646,10 @@ module SL
               terms = "site:#{type} #{terms}"
               type = SL::GoogleSearch.api_key? ? 'gg' : 'g'
             end
-            search_count ||= 0
-            search_count += 1
+            @search_count ||= 0
+            @search_count += 1
 
-            url, title, link_text = do_search(type, terms, link_text, search_count)
+            @url, title, @link_text = do_search(type, terms, @link_text, @search_count)
           else
             SL.add_error("Invalid search#{SL::Searches.did_you_mean(type)}", input)
             counter_errors += 1
@@ -630,25 +662,25 @@ module SL
                    else
                      't'
                    end
-          link_text = input.sub(/^[tfilm]/, '')
-          url, title = SL::SocialSearch.social_handle(type, link_text)
-          link_text = title
+          @link_text = input.sub(/^[tfilm]/, '')
+          @url, title = SL::SocialSearch.social_handle(type, @link_text)
+          @link_text = title
         else
-          link_text ||= input
-          url, title, link_text = SL.ddg(input, link_text)
+          @link_text ||= input
+          @url, title, @link_text = SL.ddg(input, @link_text)
         end
 
-        if url
+        if @url
           if type =~ /sp(ell)?/
-            SL.add_output(url)
+            SL.add_output(@url)
           elsif link_only
-            SL.add_output(url)
-          elsif url == 'embed'
+            SL.add_output(@url)
+          elsif @url == 'embed'
             SL.add_output(title)
           else
             type = reference_link ? :ref_title : :inline
 
-            SL.add_output SL.make_link(type, link_text, url, title: title, force_title: false)
+            SL.add_output SL.make_link(type, @link_text, @url, title: title, force_title: false)
             SL.print_errors
           end
         else

data/lib/searchlink/script_plugin.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+# title: Script plugin
+# description: Load custom searches from non-ruby scripts
+module SL
+  # Script Search
+  class ScriptSearch
+    def initialize(config)
+      @filename = config['filename']
+      @path = config['path']
+
+      %w[trigger searches name script].each do |key|
+        raise PluginError.new(%(configuration missing key "#{key}"), plugin: @filename) unless config.key?(key)
+      end
+
+      @trigger = config['trigger']
+      @searches = config['searches']
+      @name = config['name']
+      @script = find_script(config['script'])
+
+      unless File.executable?(@script)
+        raise PluginError.new(%(script "#{File.basename(@script)}" not executable\nrun `chmod a+x #{@script.shorten_path}` to correct),
+                              plugin: @filename)
+      end
+
+      class << self
+        def settings
+          {
+            trigger: @trigger,
+            searches: @searches
+          }
+        end
+
+        def search(search_type, search_terms, link_text)
+          type = Shellwords.escape(search_type)
+          terms = Shellwords.escape(search_terms)
+          text = Shellwords.escape(link_text)
+
+          stdout = `#{[@script, type, terms, text].join(' ')} 2>&1`
+
+          unless $CHILD_STATUS.success?
+            raise PluginError.new(%("#{File.basename(@script)}" returned error #{$CHILD_STATUS.exitstatus}\n#{stdout}),
+                                  plugin: @filename)
+          end
+
+          begin
+            res = JSON.parse(stdout)
+          rescue JSON::ParserError
+            res = YAML.safe_load(stdout)
+          end
+
+          unless res.is_a?(Hash)
+            raise PluginError.new(%(invalid results from "#{File.basename(@script)}", must be YAML or JSON string),
+                                  plugin: @filename)
+          end
+
+          %w[url title link_text].each do |key|
+            unless res.key?(key)
+              raise PluginError.new(%("#{File.basename(@script)}" output missing key "#{key}"), plugin: @filename)
+            end
+          end
+
+          [res['url'], res['title'], res['link_text']]
+        end
+      end
+
+      SL::Searches.register @name, :search, self
+    end
+
+    def find_script(script)
+      return File.expand_path(script) if File.exist?(File.expand_path(script))
+
+      base = File.expand_path('~/.config/searchlink/plugins')
+      first = File.join(base, script)
+      return first if File.exist?(first)
+
+      base = File.expand_path('~/.config/searchlink')
+      second = File.join(base, script)
+      return second if File.exist?(second)
+
+      raise PluginError.new(%(Script plugin script "#{script}" not found), plugin: @filename)
+    end
+  end
+end

data/lib/searchlink/searches/helpers/chromium.rb

@@ -31,14 +31,25 @@ module SL
       ## @return     [Array] Single bookmark, [url, title, date]
       ##
       def search_brave_history(term)
-        # Google history
-        history_file = File.expand_path('~/Library/Application Support/BraveSoftware/Brave-Browser/Default/History')
-        if File.exist?(history_file)
-          SL.notify('Searching Brave History', term)
-          search_chromium_history(history_file, term)
-        else
-          false
+        base = File.expand_path('~/Library/Application Support/BraveSoftware/Brave-Browser/')
+        profiles = Dir.glob('**/History', base: base)
+        profiles.delete_if { |p| p =~ /^Snapshots/ }
+        profiles.map! { |f| File.join(base, f) }
+
+        res = false
+
+        profiles.each do |bookmarks|
+          next unless File.exist?(bookmarks)
+
+          profile = bookmarks.match(%r{Browser/([^/]+)/})[1]
+
+          SL.notify("Searching Brave History for profile #{profile}", term)
+          res = search_chromium_history(bookmarks, term)
+
+          break if res
         end
+
+        res
       end
 
       ## Search Edge history
@@ -66,9 +77,7 @@ module SL
           break if res
         end
 
-        return res if res
-
-        false
+        res
       end
 
       ## Search Chrome history
@@ -99,9 +108,7 @@ module SL
           break if res
         end
 
-        return res if res
-
-        false
+        res
       end
 
       ##
@@ -172,7 +179,7 @@ module SL
 
         if File.exist?(bookmarks_file)
           SL.notify('Searching Arc Bookmarks', term)
-          return search_json_bookmarks(bookmarks_file, term)
+          return search_arc_json(bookmarks_file, term)
         end
 
         false
@@ -204,9 +211,7 @@ module SL
           break if res
         end
 
-        return res if res
-
-        false
+        res
       end
 
       ##
@@ -225,18 +230,16 @@ module SL
         res = false
 
         profiles.each do |bookmarks|
-          if File.exist?(bookmarks)
-            profile = bookmarks.match(%r{Edge/([^/]+)/})[1]
+          next unless File.exist?(bookmarks)
 
-            SL.notify("Searching Edge Bookmarks for profile #{profile}", term)
-            res = search_chromium_bookmarks(bookmarks, term)
-            break if res
-          end
-        end
+          profile = bookmarks.match(%r{Edge/([^/]+)/})[1]
 
-        return res if res
+          SL.notify("Searching Edge Bookmarks for profile #{profile}", term)
+          res = search_chromium_bookmarks(bookmarks, term)
+          break if res
+        end
 
-        false
+        res
       end
 
       ##
@@ -264,9 +267,7 @@ module SL
           end
         end
 
-        return res if res
-
-        false
+        res
       end
 
       ##
@@ -277,7 +278,7 @@ module SL
       ##
       ## @return     [Array] single bookmark [url, title, date]
       ##
-      def search_json_bookmarks(bookmarks_file, term)
+      def search_arc_json(bookmarks_file, term)
         arc_bookmarks = JSON.parse(IO.read(bookmarks_file))
 
         exact_match = false
@@ -341,7 +342,7 @@ module SL
 
             return false if bookmarks.empty?
 
-            lastest_bookmark = bookmarks.max_by { |u| [u[:created], u[:active]] }
+            lastest_bookmark = bookmarks.min_by { |u| u[:created] }
 
             return [lastest_bookmark[:url], lastest_bookmark[:title], lastest_bookmark[:date]]
           end

data/lib/searchlink/searches.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module SL
+  # Searches and plugin registration
   module Searches
     class << self
       def plugins
@@ -25,7 +26,7 @@ module SL
 
       def description_for_search(search_type)
         description = "#{search_type} search"
-        plugins[:search].each do |_, plugin|
+        plugins[:search].each_value do |plugin|
           search = plugin[:searches].select { |s| s[0].is_a?(Array) ? s[0].include?(search_type) : s[0] == search_type }
           unless search.empty?
             description = search[0][1]
@@ -50,7 +51,11 @@ module SL
                '<tbody>']
 
         searches.each do |s|
-          out << "<tr><td><code>!#{s[0].is_a?(Array) ? "#{s[0][0]} (#{s[0][1..-1].join(',')})" : s[0]}</code></td><td>#{s[1]}</td></tr>"
+          out << "<tr>
+          <td>
+          <code>!#{s[0].is_a?(Array) ? "#{s[0][0]} (#{s[0][1..-1].join(',')})" : s[0]}
+          </code>
+          </td><td>#{s[1]}</td></tr>"
         end
         out.concat(['</tbody>', '</table>']).join("\n")
       end
@@ -62,7 +67,7 @@ module SL
       #
       def available_searches
         searches = []
-        plugins[:search].each { |_, plugin| searches.concat(plugin[:searches].delete_if { |s| s[1].nil? }) }
+        plugins[:search].each_value { |plugin| searches.concat(plugin[:searches].delete_if { |s| s[1].nil? }) }
         out = []
         searches.each do |s|
           out += "!#{s[0].is_a?(Array) ? "#{s[0][0]} (#{s[0][1..-1].join(',')})" : s[0]}#{s[0].spacer}#{s[1]}"
@@ -77,8 +82,8 @@ module SL
 
       def all_possible_searches
         searches = []
-        plugins[:search].each { |_, plugin| plugin[:searches].each { |s| searches.push(s[0]) } }
-        searches.concat(SL.config['custom_site_searches'].keys)
+        plugins[:search].each_value { |plugin| plugin[:searches].each { |s| searches.push(s[0]) } }
+        searches.concat(SL.config['custom_site_searches'].keys.sort)
       end
 
       def did_you_mean(term)
@@ -101,11 +106,11 @@ module SL
       end
 
       def register_plugin(title, type, klass)
-        raise StandardError, "Plugin #{title} has no settings method" unless klass.respond_to? :settings
+        raise PluginError.new("Plugin has no settings method", plugin: title)  unless klass.respond_to? :settings
 
         settings = klass.settings
 
-        raise StandardError, "Plugin #{title} has no search method" unless klass.respond_to? :search
+        raise PluginError.new("Plugin has no search method", plugin: title) unless klass.respond_to? :search
 
         plugins[type] ||= {}
         plugins[type][title] = {
@@ -123,6 +128,8 @@ module SL
           Dir.glob(File.join(plugins_folder, '**/*.rb')).sort.each do |plugin|
             require plugin
           end
+
+          load_custom_scripts(plugins_folder)
         end
 
         return unless File.directory?(new_plugins_folder)
@@ -130,6 +137,25 @@ module SL
         Dir.glob(File.join(new_plugins_folder, '**/*.rb')).sort.each do |plugin|
           require plugin
         end
+
+        load_custom_scripts(new_plugins_folder)
+      end
+
+      def load_custom_scripts(plugins_folder)
+        Dir.glob(File.join(plugins_folder, '**/*.{json,yml,yaml}')).each do |file|
+          ext = File.extname(file).sub(/^\./, '')
+          config = IO.read(file)
+
+          cfg = case ext
+                when /^y/i
+                  YAML.safe_load(config)
+                else
+                  JSON.parse(config)
+                end
+          cfg['filename'] = File.basename(file)
+          cfg['path'] = file.shorten_path
+          SL::ScriptSearch.new(cfg)
+        end
       end
 
       def do_search(search_type, search_terms, link_text, timeout: SL.config['timeout'])

data/lib/searchlink/semver.rb

@@ -5,14 +5,14 @@ module SL
   class SemVer
     attr_accessor :maj, :min, :patch, :pre
 
-    # Initialize a Semantic Version object
-    #
-    # @param      version_string  [String] a semantic version number
-    #
-    # @return     [SemVer] SemVer object
-    #
+    ## Initialize a Semantic Version object
+    ##
+    ## @param      version_string  [String] a semantic version number
+    ##
+    ## @return     [SemVer] SemVer object
+    ##
     def initialize(version_string)
-      raise "Invalid semantic version number: #{version_string}" unless version_string.valid_version?
+      raise VersionError.new("Invalid semantic version number: #{version_string}") unless version_string.valid_version?
 
       @maj, @min, @patch = version_string.split(/\./)
       @pre = nil

data/lib/searchlink/string.rb

@@ -488,5 +488,13 @@ module SL
     def code_indent
       split(/\n/).map { |l| "    #{l}" }.join("\n")
     end
+
+    ##
+    ## Shorten path by adding ~ for home directory
+    ##
+    def shorten_path
+      home_directory = ENV['HOME']
+      sub(home_directory, '~')
+    end
   end
 end

data/lib/searchlink/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SL
-  VERSION = '2.3.69'
+  VERSION = '2.3.71'
 end
 
 # Main module

data/lib/searchlink.rb

@@ -13,10 +13,14 @@ require 'zlib'
 require 'time'
 require 'json'
 require 'erb'
+require 'english'
 
 # import
 require 'tokens' if File.exist?('lib/tokens.rb')
 
+# import
+require 'searchlink/exceptions'
+
 # import
 require 'searchlink/number'
 
@@ -65,4 +69,7 @@ require 'searchlink/output'
 # import
 require 'searchlink/which'
 
+# import
+require 'searchlink/script_plugin'
+
 module Secrets; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchlink
 version: !ruby/object:Gem::Version
-  version: 2.3.69
+  version: 2.3.71
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-09 00:00:00.000000000 Z
+date: 2024-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -235,11 +235,13 @@ files:
 - lib/searchlink/curl.rb
 - lib/searchlink/curl/html.rb
 - lib/searchlink/curl/json.rb
+- lib/searchlink/exceptions.rb
 - lib/searchlink/help.rb
 - lib/searchlink/number.rb
 - lib/searchlink/output.rb
 - lib/searchlink/parse.rb
 - lib/searchlink/plist.rb
+- lib/searchlink/script_plugin.rb
 - lib/searchlink/search.rb
 - lib/searchlink/searches.rb
 - lib/searchlink/searches/amazon.rb