searchlink 2.3.87 → 2.3.88

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ec0f6dcca720a1630213bc1addbad3dc28cc949756b5d43ca74394b9a3a1023
-  data.tar.gz: 979260379965c9d0c69de75990fea6639f8cd628f4cf1c9fd7b9f9b226170761
+  metadata.gz: 1d1e0567872f0b80b0d51b37a4522c91cd70f3af268b07ee9d2ed35e56ee3288
+  data.tar.gz: a5327a1f2e2d355b3f1ba7c5818f9b51c640207e3e0e48374527038e4e2d049e
 SHA512:
-  metadata.gz: '0934cdf6a1c087e2fe2dee24bb962ca699fcfafc9848260fd0c75500c2d1531e75cb5f6a33ce4a32ab586c7594ef630a325ccca644bbf0a3a68ca659997d9ab4'
-  data.tar.gz: e4767b29327c7f7147efb584ea3e1dee68eafd982802b5b3375b6dddd8f3eb8e1aeb4ed444f9f8486422999eeb6f6b7f4bf94e8b051124d48c3d265867a05827
+  metadata.gz: 6bbf35b751bbdfc03e990ef90de99b62117183759640c0ffc102d606be0aed4e8982bec6d1bfaec7ffc67e0dd4670252174307ef2d8953752402f6789e388953
+  data.tar.gz: 1f2e05c2e4220b8f38a6bebe99c1ca019474d8dde50e2c61ecf57e557c265ad2536d317a5d7e47ad5583dc065ae983fa475f215650e1ceeb24c24b1e07440618

data/lib/searchlink/curl/html.rb

@@ -142,7 +142,7 @@ module Curl
     def images
       output = []
       %w[og:image twitter:image].each do |src|
-        next unless @meta.key?(src)
+        next unless @meta&.key?(src)
 
         output << {
           type: "opengraph",

data/lib/searchlink/output.rb

@@ -3,14 +3,19 @@
 module SL
   class << self
     attr_writer :titleize, :clipboard, :output, :footer, :line_num,
-                :match_column, :match_length, :originput, :errors, :report, :printout,
-                :shortener
+                :match_column, :match_length, :originput, :errors, :error_count,
+                :report, :printout, :shortener
 
     # Whether or not to add a title to the output
     def titleize
       @titleize ||= false
     end
 
+    # Count of errors
+    def error_count
+      @error_count ||= 0
+    end
+
     # Whether or not to copy results to clipbpard
     def clipboard
       @clipboard ||= false
@@ -106,11 +111,17 @@ module SL
     # @return     [String] The link.
     #
     def make_link(type, text, url, title: false, force_title: false)
-      title = title.gsub(/\P{Print}|\p{Cf}/, "") if title
-      text = title || SL::URL.title(url) if SL.titleize && (!text || text.strip.empty?)
-      text = text ? text.strip : title
+      url.sub!(%r{^//}, "https://")
+      is_image = url =~ /(gif|jpe?g|png|webp)(?:\?.*?)?$/ ? true : false
+      if is_image
+        title = text || File.basename(url).sub(/\?.*$/, "")
+        text = title if text.nil? || text.strip.empty?
+      else
+        title = title.gsub(/\P{Print}|\p{Cf}/, "") if title
+        text = title || SL::URL.title(url) if SL.titleize && (!text || text.strip.empty?)
+        text = text ? text.strip : title
+      end
       title = title && (SL.config["include_titles"] || force_title) ? %( "#{title.clean}") : ""
-
       title = title.gsub(/[ \t]+/, " ")
 
       url.add_query_string!
@@ -123,8 +134,7 @@ module SL
       when :ref_link
         %([#{text}][#{url}])
       when :inline
-        image = url =~ /\.(gif|jpe?g|png|webp)$/ ? "!" : ""
-        %(#{image}[#{text}](#{url}#{title}))
+        %(#{is_image ? '!' : ''}[#{text}](#{url}#{title}))
       end
     end
 
@@ -214,6 +224,8 @@ module SL
       end
       SL.errors[type] ||= []
       SL.errors[type].push("(#{position}): #{str}")
+      SL.error_count ||= 0
+      SL.error_count += 1
     end
 
     # Add to query string

data/lib/searchlink/parse.rb

@@ -28,25 +28,14 @@ module SL
       latest_version = SL.new_version?
       SL.add_output("<!-- v#{latest_version} available, run SearchLink on the word 'update' to install. -->") if latest_version
 
-      @links = {}
       SL.footer = []
-      counter_links = 0
-      counter_errors = 0
 
       input.sub!(/\n?<!-- Report:.*?-->\n?/m, "")
       input.sub!(/\n?<!-- Errors:.*?-->\n?/m, "")
 
-      input.scan(/\[(.*?)\]:\s+(.*?)\n/).each { |match| @links[match[1].strip] = match[0] }
+      @links = input.scan_links
 
-      @prefix = if SL.config["prefix_random"]
-                  if input =~ /\[(\d{4}-)\d+\]: \S+/
-                    Regexp.last_match(1)
-                  else
-                    format("%04d-", rand(9999))
-                  end
-                else
-                  ""
-                end
+      @prefix = determine_prefix(input)
 
       @highest_marker = 0
       input.scan(/^\s{,3}\[(?:#{@prefix})?(\d+)\]: /).each do
@@ -61,16 +50,19 @@ module SL
       end
 
       if SL.config["complete_bare"]
+        # match all URLs not preceded by a ( or : or <, and are followed by a space or newline
         rx = %r{(?ix-m)(?<!\(|:\s|<)(?:
                 (?:https?://)(?:[\da-z.-]+)\.(?:[a-z.]{2,6})
                 (?:[/\w\d.\-()_+=?&%]*?(?=[\s\n]|$))
               )}
+        # replace with [%](url)
         input.gsub!(rx) do
           url_match = Regexp.last_match
           url_match.pre_match =~ /!\S+ +$/ ? url_match[0] : "[%](#{url_match[0]})"
         end
       end
 
+      # Handle multi-line links in the form of [\ntext\n](url)
       if input =~ /\[\n(.*?\n)+\]\((.*?)?\)/
         input.gsub!(/\[\n(((\s*(?:[-+*]|\d+\.)?\s+)*(!\S+ +)?(.*?))\n)+\]\((!\S+.*?)?\)/) do
           m = Regexp.last_match
@@ -95,431 +87,470 @@ module SL
 
       # Handle links in the form of [text](url) or [text](url "title")
       if input =~ /\[(.*?)\]\((.*?)\)/
-        lines = input.split("\n")
-        out = []
-
-        total_links = input.scan(/\[(.*?)\]\((.*?)\)/).length
-        in_code_block = false
-        line_difference = 0
-        lines.each_with_index do |line, num|
-          SL.line_num = num - line_difference
-          @cursor_difference = 0
-          # ignore links in code blocks
-          if line =~ /^(( {4,}|\t+)[^*+-])/
-            out.push(line)
-            next
-          end
-          if line =~ /^\s*[~`]{3,}/
-            if in_code_block
-              in_code_block = false
-              out.push(line)
-              next
-            else
-              in_code_block = true
-            end
-          end
-          if in_code_block
-            out.push(line)
-            next
-          end
+        parse_brackets(input)
+      else # Assume single line input
+        parse_single_line(input)
+      end
+    end
 
-          @delete_line = false
+    private
 
-          @search_count = 0
+    # Determine the prefix for footnotes
+    def determine_prefix(input)
+      if SL.config["prefix_random"]
+        if input =~ /\[(\d{4}-)\d+\]: \S+/
+          Regexp.last_match(1)
+        else
+          format("%04d-", rand(9999))
+        end
+      else
+        ""
+      end
+    end
 
-          line.gsub!(/\[(.*?)\]\((.*?)\)/) do |match|
-            this_match = Regexp.last_match
+    def parse_single_line(input)
+      link_only = false
+      SL.clipboard = false
 
-            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
+      res = parse_arguments(input.strip!).strip
+      input = res.nil? ? input.strip : res
+      query, input = input.extract_query({})
 
-            invalid_search = false
-            @ref_title = false
+      # if the end of input contain "^", copy to clipboard instead of STDOUT
+      SL.clipboard = true if input =~ /\^[!~:\s]*$/
 
-            if match_before.scan(/(^|[^\\])`/).length.odd?
-              SL.add_report("Match '#{@match_string}' within an inline code block")
-              invalid_search = true
-            end
+      # if the end of input contains "!!", only print the url
+      link_only = true if input =~ /!![\^~:\s]*$/
 
-            counter_links += 1
-            $stderr.print("\033[0K\rProcessed: #{counter_links} of #{total_links}, #{counter_errors} errors. ") unless SILENT
+      reference_link = input =~ /:([!\^~\s]*)$/
 
-            @link_text = this_match[1] || ""
-            link_info = parse_arguments(this_match[2].strip).strip || ""
-            query, link_info = link_info.extract_query({})
+      # if end of input contains ~, pull url from clipboard
+      if input =~ /~[:\^!\s]*$/
+        input.sub!(/[:!\^\s~]*$/, "")
+        clipboard = `__CF_USER_TEXT_ENCODING=$UID:0x8000100:0x8000100 pbpaste`.strip
+        if SL::URL.url?(clipboard)
+          type = reference_link ? :ref_title : :inline
+          print SL.make_link(type, input.strip, clipboard)
+        else
+          print SL.originput
+        end
+        Process.exit
+      end
 
-            if @link_text.strip == "" && link_info =~ /".*?"/
-              link_info.gsub!(/"(.*?)"/) do
-                m = Regexp.last_match
-                @link_text = m[1] if @link_text == ""
-                m[0]
-              end
-            end
+      input.sub!(/[:!\^\s~]*$/, "")
 
-            link_info.gsub!(/<(.*?)>/) do
-              %(%22#{Regexp.last_match(1)}%22)
-            end
+      ## Maybe if input is just a URL, convert it to a link
+      ## 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)
+        Process.exit
+      end
 
-            if link_info.strip =~ /:$/ && line.strip == match
-              @ref_title = true
-              link_info.sub!(/\s*:\s*$/, "")
-            end
+      # check for additional search terms in parenthesis
+      additional_terms = ""
+      if input =~ /\((.*?)\)/
+        additional_terms = " #{Regexp.last_match(1).strip}"
+        input.sub!(/\(.*?\)/, "")
+      end
 
-            if @link_text.empty? && link_info.sub(/^[!\^]\S+/, "").strip.empty?
-              SL.add_error("No input", match)
-              counter_errors += 1
-              invalid_search = true
-            end
+      # Maybe detect "search + addition terms" and remove additional terms from link text?
+      # if input =~ /\+(.+?)$/
+      #   additional_terms = "#{additional_terms} #{Regexp.last_match(1).strip}"
+      #   input.sub!(/\+.*?$/, '').strip!
+      # end
 
-            if link_info =~ /^!(\S+)/
-              search_type = Regexp.last_match(1).extract_shortener
-              unless SL::Searches.valid_search?(search_type) || search_type =~ /^(\S+\.)+\S+$/
-                SL.add_error("Invalid search#{SL::Searches.did_you_mean(search_type)}", match)
-                invalid_search = true
-              end
-            end
+      @link_text = false
 
-            if invalid_search
-              match
-            elsif link_info =~ /^\^(.+)/
-              m = Regexp.last_match
-              create_footnote(m)
-              # Handle [](URL) and [%](URL), filling in title
-            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 == ""
+      if input =~ /"(.*?)"/
+        @link_text = Regexp.last_match(1)
+        input.gsub!(/"(.*?)"/, '\1')
+      end
 
-              search_type = ""
-              search_terms = ""
-              link_only = false
-              SL.clipboard = false
-              SL.titleize = SL.config["empty_uses_page_title"]
+      # remove quotes from terms, just in case
+      # input.sub!(/^(!\S+)?\s*(["'])(.*?)\2([\!\^]+)?$/, "\\1 \\3\\4")
 
-              if link_info =~ /^(?:[!\^](\S+))\s*(.*)$/
-                m = Regexp.last_match
+      case input
+      when /^!(\S+)\s+(.*)$/
+        type = Regexp.last_match(1).extract_shortener
+        link_info = Regexp.last_match(2).strip
 
-                search_type = if m[1].nil?
-                                SL::GoogleSearch.api_key? ? "gg" : "g"
-                              else
-                                m[1]
-                              end
+        @link_text ||= link_info
+        terms = link_info + additional_terms
+        terms.strip!
 
-                search_type.extract_shortener!
+        if SL::Searches.valid_search?(type) || type =~ /^(\S+\.)+\S+$/
+          if type && terms && !terms.empty?
+            # Iterate through custom searches for a match, perform search if matched
+            type, terms = custom_search(type, terms)
+          end
 
-                search_terms = m[2].gsub(/(^["']|["']$)/, "")
-                search_terms.strip!
+          # if contains TLD, use site-specific search
+          if type =~ /^(\S+\.)+\S+$/
+            terms = "site:#{type} #{terms}"
+            type = SL::GoogleSearch.api_key? ? "gg" : "g"
+          end
+          @search_count ||= 0
+          @search_count += 1
 
-                # if the link text is just '%' replace with title regardless of config settings
-                if @link_text == "%" && search_terms && !search_terms.empty?
-                  SL.titleize = true
-                  @link_text = ""
-                end
+          SL.add_query(query) if query
+          @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)
+          SL.error_count
+        end
+        # Social handle expansion
+      when /^([tfilm])?@(\S+)\s*$/
+        type = Regexp.last_match(1)
+        type ||= if Regexp.last_match(2) =~ /[a-z0-9_]@[a-z0-9_.]+/i
+                   "m"
+                 else
+                   "t"
+                 end
+        @link_text = input.sub(/^[tfilm]/, "")
+        SL.add_query(query) if query
+        @url, title = SL::SocialSearch.social_handle(type, @link_text)
+        @link_text = title
+      else
+        SL.add_query(query) if query
+        @link_text ||= input
+        @url, title, @link_text = SL.ddg(input, @link_text)
+      end
 
-                search_terms = @link_text if search_terms == ""
+      if @url
+        res = confirmed?(@url)
+        if res
+          if res.is_a?(String) && SL::URL.url?(res)
+            @url = res
+            title = SL::URL.title(@url) if SL.titleize && title == ""
+          end
 
-                # 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 =~ /^\+[^+]/
+          if type =~ /sp(ell)?/
+            SL.add_output(@url)
+          elsif link_only
+            SL.add_output(@url)
+          elsif @url == "embed"
+            SL.add_output(title)
+          else
+            type = reference_link ? :ref_title : :inline
 
-                # if the end of input contain "^", copy to clipboard instead of STDOUT
-                SL.clipboard = true if search_terms =~ /(!!)?\^(!!)?$/
+            SL.add_output SL.make_link(type, @link_text, @url, title: title, force_title: false)
+            SL.print_errors
+          end
+        else
+          SL.add_error("Canceled", "User canceled result #{@url}")
+          SL.add_output SL.originput.chomp
+          SL.print_errors
+        end
+      else
+        SL.add_error("No results", title)
+        SL.add_output SL.originput.chomp
+        SL.print_errors
+      end
 
-                # if the end of input contains "!!", only print the url
-                link_only = true if search_terms =~ /!!\^?$/
+      return unless SL.clipboard
 
-                search_terms = search_terms.sub(/(!!)?\^?(!!)?$/, "")
+      if SL.output == SL.originput
+        warn "No results found"
+      else
+        `echo #{Shellwords.escape(SL.output.join(""))}|tr -d "\n"|pbcopy`
+        warn "Results in clipboard"
+      end
+    end
 
-                if search_type =~ /^(\S+\.)+\S+$/
-                  search_type = "g"
-                  search_terms = "site:#{m[1]} #{search_terms}"
-                end
-              elsif link_info =~ /^!/
-                search_word = link_info.match(/^!(\S+)/)
-                st = search_word[1].extract_shortener
-                if search_word && SL::Searches.valid_search?(st)
-                  search_type = st unless search_word.nil?
-                  search_terms = @link_text
-                elsif search_word && st =~ /^(\S+\.)+\S+$/
-                  search_type = SL::GoogleSearch.api_key? ? "gg" : "g"
-                  search_terms = "site:#{search_word[1]} #{@link_text}"
-                else
-                  SL.add_error("Invalid search#{SL::Searches.did_you_mean(st)}", match)
-                  search_type = false
-                  search_terms = false
-                end
-              elsif @link_text && !@link_text.empty? && (!link_info || link_info.empty?)
-                search_type = SL::GoogleSearch.api_key? ? "gg" : "g"
-                search_terms = @link_text
-              elsif link_info && !link_info.empty?
-                search_type = SL::GoogleSearch.api_key? ? "gg" : "g"
-                search_terms = link_info
-              else
-                SL.add_error("Invalid search", match)
-                search_type = false
-                search_terms = false
-              end
+    def parse_brackets(input)
+      lines = input.split("\n")
+      out = []
 
-              search_type, search_terms = custom_search(search_type, search_terms) if search_type && !search_terms.empty?
+      total_links = 0
+      in_code_block = false
+      in_list = false
+      last_indent = 0
+      line_difference = 0
+      counter_links = 0
+      lines.each_with_index do |line, num|
+        SL.line_num = num - line_difference
+        @cursor_difference = 0
 
-              SL.add_query(query) if query
+        if line =~ /^\s*[~`]{3,}/
+          if in_code_block
+            in_code_block = false
+            out.push(line)
+            next
+          else
+            in_code_block = true
+          end
+        elsif in_code_block
+          out.push(line)
+          next
+        elsif line.strip.empty?
+          out.push(line)
+          next
+        elsif line =~ /^\s*([-+*]|\d+\.)\s/
+          in_list = true
+          last_indent = line.indent_level
+        elsif in_list && line.indent_level > last_indent + 2
+          out.push(line)
+          next
+        elsif in_list && line.indent_level < last_indent && line !~ /^\s*([-+*]|\d+\.)\s/
+          in_list = false
+        elsif in_list && line.indent_level == last_indent + 1
+          # noop
+        else
+          in_list = false
+          # ignore links in code blocks
+          if line =~ /^(( {4,}|\t+)[^*+-])/
+            last_indent = line.indent_level
+            out.push(line)
+            next
+          end
+          last_indent = line.indent_level
+        end
 
-              if (search_type && search_terms) || @url
-                # warn "Searching #{search_type} for #{search_terms}"
+        total_links += line.count_links
 
-                @search_count += 1
-                @url, title, @link_text = do_search(search_type, search_terms, @link_text, @search_count)
+        @delete_line = false
 
-                if (@link_text == "" || @link_text == "%") && @url
-                  if title
-                    @link_text = title
-                  else
-                    add_title(@url)
-                  end
-                end
+        @search_count = 0
 
-                if @url
-                  res = confirmed?(@url)
-                  return match unless res
-
-                  @url = res if res.is_a?(String) && SL::URL.url?(res)
-
-                  title = SL::URL.title(@url) if SL.titleize && (title.nil? || title.empty?)
-
-                  @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)
-                    end
-                    @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
-                    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: 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
-                    SL.match_length = res.length
-                    SL.add_report("#{@match_string} => #{@url}")
-                    res
-                  end
-                else
-                  SL.add_error("No results", "#{search_terms} (#{@match_string})")
-                  counter_errors += 1
-                  match
-                end
-              else
-                SL.add_error("Invalid search", match)
-                counter_errors += 1
-                match
-              end
-            end
-          end
-          line_difference += 1 if @delete_line
-          out.push(line) unless @delete_line
-          @delete_line = false
-        end
-        warn "\n" unless SILENT
+        line.gsub!(/\[(.*?)\]\((.*?)\)/) do |match|
+          this_match = Regexp.last_match
 
-        input = out.delete_if { |l| l.strip =~ /^<!--DELETE-->$/ }.join("\n")
+          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
 
-        if SL.config["inline"]
-          SL.add_output "#{input}\n"
-          SL.add_output "\n#{SL.print_footer}" unless SL.footer.empty?
-        elsif SL.footer.empty?
-          SL.add_output input
-        else
-          last_line = input.strip.split("\n")[-1]
-          case last_line
-          when /^\[.*?\]: http/
-            SL.add_output "#{input.rstrip}\n"
-          when /^\[\^.*?\]: /
-            SL.add_output input.rstrip
-          else
-            SL.add_output "#{input}\n\n"
+          invalid_search = false
+          @ref_title = false
+
+          if match_before.scan(/(^|[^\\])`/).length.odd?
+            SL.add_report("Match '#{@match_string}' within an inline code block")
+            invalid_search = true
           end
-          SL.add_output "#{SL.print_footer}\n\n"
-        end
+          counter_links += 1
+          $stderr.print("\033[0K\rProcessed: #{counter_links} of #{total_links}, #{SL.error_count} errors. ") unless SILENT
 
-        SL.line_num = nil
-        SL.add_report("Processed: #{total_links} links, #{counter_errors} errors.")
-        SL.print_report
-        SL.print_errors
-      else # Assume single line input
-        link_only = false
-        SL.clipboard = false
+          @link_text = this_match[1] || ""
+          link_info = parse_arguments(this_match[2].strip).strip || ""
+          query, link_info = link_info.extract_query({})
 
-        res = parse_arguments(input.strip!).strip
-        input = res.nil? ? input.strip : res
-        query, input = input.extract_query({})
+          if @link_text.strip == "" && link_info =~ /".*?"/
+            link_info.gsub!(/"(.*?)"/) do
+              m = Regexp.last_match
+              @link_text = m[1] if @link_text == ""
+              m[0]
+            end
+          end
 
-        # if the end of input contain "^", copy to clipboard instead of STDOUT
-        SL.clipboard = true if input =~ /\^[!~:\s]*$/
+          link_info.gsub!(/<(.*?)>/) do
+            %(%22#{Regexp.last_match(1)}%22)
+          end
 
-        # if the end of input contains "!!", only print the url
-        link_only = true if input =~ /!![\^~:\s]*$/
+          if link_info.strip =~ /:$/ && line.strip == match
+            @ref_title = true
+            link_info.sub!(/\s*:\s*$/, "")
+          end
 
-        reference_link = input =~ /:([!\^~\s]*)$/
+          if @link_text.empty? && link_info.sub(/^[!\^]\S+/, "").strip.empty?
+            SL.add_error("No input", match)
+            invalid_search = true
+          end
 
-        # if end of input contains ~, pull url from clipboard
-        if input =~ /~[:\^!\s]*$/
-          input.sub!(/[:!\^\s~]*$/, "")
-          clipboard = `__CF_USER_TEXT_ENCODING=$UID:0x8000100:0x8000100 pbpaste`.strip
-          if SL::URL.url?(clipboard)
-            type = reference_link ? :ref_title : :inline
-            print SL.make_link(type, input.strip, clipboard)
-          else
-            print SL.originput
+          if link_info =~ /^!(\S+)/
+            search_type = Regexp.last_match(1).extract_shortener
+            unless SL::Searches.valid_search?(search_type) || search_type =~ /^(\S+\.)+\S+$/
+              SL.add_error("Invalid search#{SL::Searches.did_you_mean(search_type)}", match)
+              invalid_search = true
+            end
           end
-          Process.exit
-        end
 
-        input.sub!(/[:!\^\s~]*$/, "")
+          if invalid_search
+            match
+          elsif link_info =~ /^\^(.+)/
+            m = Regexp.last_match
+            create_footnote(m)
+            # Handle [](URL) and [%](URL), filling in title
+          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 == ""
 
-        ## Maybe if input is just a URL, convert it to a link
-        ## 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)
-          Process.exit
-        end
+            search_type = ""
+            search_terms = ""
+            link_only = false
+            SL.clipboard = false
+            SL.titleize = SL.config["empty_uses_page_title"]
 
-        # check for additional search terms in parenthesis
-        additional_terms = ""
-        if input =~ /\((.*?)\)/
-          additional_terms = " #{Regexp.last_match(1).strip}"
-          input.sub!(/\(.*?\)/, "")
-        end
+            if link_info =~ /^(?:[!\^](\S+))\s*(.*)$/
+              m = Regexp.last_match
 
-        # Maybe detect "search + addition terms" and remove additional terms from link text?
-        # if input =~ /\+(.+?)$/
-        #   additional_terms = "#{additional_terms} #{Regexp.last_match(1).strip}"
-        #   input.sub!(/\+.*?$/, '').strip!
-        # end
+              search_type = if m[1].nil?
+                              SL::GoogleSearch.api_key? ? "gg" : "g"
+                            else
+                              m[1]
+                            end
 
-        @link_text = false
+              search_type.extract_shortener!
 
-        if input =~ /"(.*?)"/
-          @link_text = Regexp.last_match(1)
-          input.gsub!(/"(.*?)"/, '\1')
-        end
+              search_terms = m[2].gsub(/(^["']|["']$)/, "")
+              search_terms.strip!
 
-        # remove quotes from terms, just in case
-        # input.sub!(/^(!\S+)?\s*(["'])(.*?)\2([\!\^]+)?$/, "\\1 \\3\\4")
+              # if the link text is just '%' replace with title regardless of config settings
+              if @link_text == "%" && search_terms && !search_terms.empty?
+                SL.titleize = true
+                @link_text = ""
+              end
 
-        case input
-        when /^!(\S+)\s+(.*)$/
-          type = Regexp.last_match(1).extract_shortener
-          link_info = Regexp.last_match(2).strip
+              search_terms = @link_text if search_terms == ""
 
-          @link_text ||= link_info
-          terms = link_info + additional_terms
-          terms.strip!
+              # 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 =~ /^\+[^+]/
 
-          if SL::Searches.valid_search?(type) || type =~ /^(\S+\.)+\S+$/
-            if type && terms && !terms.empty?
-              # Iterate through custom searches for a match, perform search if matched
-              type, terms = custom_search(type, terms)
-            end
+              # if the end of input contain "^", copy to clipboard instead of STDOUT
+              SL.clipboard = true if search_terms =~ /(!!)?\^(!!)?$/
+
+              # if the end of input contains "!!", only print the url
+              link_only = true if search_terms =~ /!!\^?$/
 
-            # if contains TLD, use site-specific search
-            if type =~ /^(\S+\.)+\S+$/
-              terms = "site:#{type} #{terms}"
-              type = SL::GoogleSearch.api_key? ? "gg" : "g"
+              search_terms = search_terms.sub(/(!!)?\^?(!!)?$/, "")
+
+              if search_type =~ /^(\S+\.)+\S+$/
+                search_type = "g"
+                search_terms = "site:#{m[1]} #{search_terms}"
+              end
+            elsif link_info =~ /^!/
+              search_word = link_info.match(/^!(\S+)/)
+              st = search_word[1].extract_shortener
+              if search_word && SL::Searches.valid_search?(st)
+                search_type = st unless search_word.nil?
+                search_terms = @link_text
+              elsif search_word && st =~ /^(\S+\.)+\S+$/
+                search_type = SL::GoogleSearch.api_key? ? "gg" : "g"
+                search_terms = "site:#{search_word[1]} #{@link_text}"
+              else
+                SL.add_error("Invalid search#{SL::Searches.did_you_mean(st)}", match)
+                search_type = false
+                search_terms = false
+              end
+            elsif @link_text && !@link_text.empty? && (!link_info || link_info.empty?)
+              search_type = SL::GoogleSearch.api_key? ? "gg" : "g"
+              search_terms = @link_text
+            elsif link_info && !link_info.empty?
+              search_type = SL::GoogleSearch.api_key? ? "gg" : "g"
+              search_terms = link_info
+            else
+              SL.add_error("Invalid search", match)
+              search_type = false
+              search_terms = false
             end
-            @search_count ||= 0
-            @search_count += 1
+
+            search_type, search_terms = custom_search(search_type, search_terms) if search_type && !search_terms.empty?
 
             SL.add_query(query) if query
-            @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
-          end
-          # Social handle expansion
-        when /^([tfilm])?@(\S+)\s*$/
-          type = Regexp.last_match(1)
-          type ||= if Regexp.last_match(2) =~ /[a-z0-9_]@[a-z0-9_.]+/i
-                     "m"
-                   else
-                     "t"
-                   end
-          @link_text = input.sub(/^[tfilm]/, "")
-          SL.add_query(query) if query
-          @url, title = SL::SocialSearch.social_handle(type, @link_text)
-          @link_text = title
-        else
-          SL.add_query(query) if query
-          @link_text ||= input
-          @url, title, @link_text = SL.ddg(input, @link_text)
-        end
 
-        if @url
-          res = confirmed?(@url)
-          if res
-            if res.is_a?(String) && SL::URL.url?(res)
-              @url = res
-              title = SL::URL.title(@url) if SL.titleize && title == ""
-            end
+            if (search_type && search_terms) || @url
+              # warn "Searching #{search_type} for #{search_terms}"
 
-            if type =~ /sp(ell)?/
-              SL.add_output(@url)
-            elsif link_only
-              SL.add_output(@url)
-            elsif @url == "embed"
-              SL.add_output(title)
-            else
-              type = reference_link ? :ref_title : :inline
+              @search_count += 1
+              @url, title, @link_text = do_search(search_type, search_terms, @link_text, @search_count)
+
+              if (@link_text == "" || @link_text == "%") && @url
+                if title
+                  @link_text = title
+                else
+                  add_title(@url)
+                end
+              end
+
+              if @url
+                res = confirmed?(@url)
+                return match unless res
 
-              SL.add_output SL.make_link(type, @link_text, @url, title: title, force_title: false)
-              SL.print_errors
+                @url = res if res.is_a?(String) && SL::URL.url?(res)
+
+                title = SL::URL.title(@url) if SL.titleize && (title.nil? || title.empty?)
+
+                @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)
+                  end
+                  @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
+                  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: 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
+                  SL.match_length = res.length
+                  SL.add_report("#{@match_string} => #{@url}")
+                  res
+                end
+              else
+                SL.add_error("No results", "#{search_terms} (#{@match_string})")
+                match
+              end
+            else
+              SL.add_error("Invalid search", match)
+              match
             end
-          else
-            SL.add_error("Canceled", "User canceled result #{@url}")
-            SL.add_output SL.originput.chomp
-            SL.print_errors
           end
-        else
-          SL.add_error("No results", title)
-          SL.add_output SL.originput.chomp
-          SL.print_errors
         end
+        line_difference += 1 if @delete_line
+        out.push(line) unless @delete_line
+        @delete_line = false
+      end
+      warn "\n" unless SILENT
 
-        if SL.clipboard
-          if SL.output == SL.originput
-            warn "No results found"
-          else
-            `echo #{Shellwords.escape(SL.output.join(""))}|tr -d "\n"|pbcopy`
-            warn "Results in clipboard"
-          end
+      input = out.delete_if { |l| l.strip =~ /^<!--DELETE-->$/ }.join("\n")
+
+      if SL.config["inline"]
+        SL.add_output "#{input}\n"
+        SL.add_output "\n#{SL.print_footer}" unless SL.footer.empty?
+      elsif SL.footer.empty?
+        SL.add_output input
+      else
+        last_line = input.strip.split("\n")[-1]
+        case last_line
+        when /^\[.*?\]: http/
+          SL.add_output "#{input.rstrip}\n"
+        when /^\[\^.*?\]: /
+          SL.add_output input.rstrip
+        else
+          SL.add_output "#{input}\n\n"
         end
+        SL.add_output "#{SL.print_footer}\n\n"
       end
-    end
 
-    private
+      SL.line_num = nil
+      SL.add_report("Processed: #{total_links} links, #{SL.error_count} errors.")
+      SL.print_report
+      SL.print_errors
+    end
 
     def add_title(link_info)
       @url = link_info

data/lib/searchlink/searches/duckduckgo.rb

@@ -176,7 +176,8 @@ module SL
 
     def first_image(url)
       images = Curl::Html.new(url).images
-      images.filter { |img| img[:type] == "img" }.first[:src]
+      images.filter! { |img| img[:type] == "img" }
+      images.first[:src] if images.any?
     end
   end
 end

data/lib/searchlink/searches/google.rb

@@ -67,7 +67,7 @@ module SL
         output_title = result["title"]
         output_title.remove_seo!(output_url) if SL.config["remove_seo"]
 
-        output_url = SL.first_image if search_type =~ /img$/
+        output_url = SL.first_image(output_url) if search_type =~ /img$/
 
         [output_url, output_title, link_text]
       rescue StandardError

data/lib/searchlink/string.rb

@@ -3,6 +3,32 @@
 module SL
   # String helpers
   class ::String
+    # Scan a string for links
+    # @return     [Hash] Hash of links
+    def scan_links
+      links = {}
+      scan(/\[(.*?)\]:\s+(.*?)\n/).each { |match| links[match[1].strip] = match[0] }
+      links
+    end
+
+    # Count the indent level of a string
+    # @return     [Integer] The indent level
+    def indent_level
+      return 0 if empty?
+
+      gsub!(/^    /, "\t") while self =~ /^    /
+      indent = match(/^\t+/)
+      return 0 unless indent
+
+      indent[0].length
+    end
+
+    # Count the links in a string
+    # @return     [Integer] The number of links
+    def count_links
+      scan(/\[(.*?)\]\((.*?)\)/).length
+    end
+
     # Quote a YAML value if needed
     def yaml_val
       yaml = YAML.safe_load("key: '#{self}'")

data/lib/searchlink/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SL
-  VERSION = "2.3.87"
+  VERSION = "2.3.88"
 end
 
 # Main module

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: searchlink
 version: !ruby/object:Gem::Version
-  version: 2.3.87
+  version: 2.3.88
 platform: ruby
 authors:
 - Brett Terpstra
 bindir: bin
 cert_chain: []
-date: 2025-04-01 00:00:00.000000000 Z
+date: 2025-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64