searchlink 2.3.86 → 2.3.87

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c00e022d8b8155db4e6fd3acd6ccaa69be955a316774be41747cce0e476f0df6
-  data.tar.gz: 8487fcec9ab7d7830c467e5bfa2ed4008104a2363cb776b18864848891a7d98b
+  metadata.gz: 9ec0f6dcca720a1630213bc1addbad3dc28cc949756b5d43ca74394b9a3a1023
+  data.tar.gz: 979260379965c9d0c69de75990fea6639f8cd628f4cf1c9fd7b9f9b226170761
 SHA512:
-  metadata.gz: 66ee6b30d332f4047f4f1528a8f39b6eb51cbb0b6ef0f3abd5b546ea3dd4433ec212c4b72c9d46a680c65e69078afc617caf8d5d7da757181281bb5c16518ad8
-  data.tar.gz: 7b29d19cdddbc9c6ecbe07ecaf7cc23e685da82fd03fe16645a4775ee0aa15ca96bc859da6bc38725fdd074642fa986a396bd745e4af87379bfbfd17f60e83b2
+  metadata.gz: '0934cdf6a1c087e2fe2dee24bb962ca699fcfafc9848260fd0c75500c2d1531e75cb5f6a33ce4a32ab586c7594ef630a325ccca644bbf0a3a68ca659997d9ab4'
+  data.tar.gz: e4767b29327c7f7147efb584ea3e1dee68eafd982802b5b3375b6dddd8f3eb8e1aeb4ed444f9f8486422999eeb6f6b7f4bf94e8b051124d48c3d265867a05827

data/bin/searchlink

@@ -1,11 +1,12 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
-SILENT = ENV['SL_SILENT'] =~ /false/i ? false : true
-$LOAD_PATH.unshift File.join(__dir__, '..')
+SILENT = ENV.fetch("SL_SILENT", nil) =~ /false/i ? false : true
+NO_CONFIRM = ENV.fetch("SL_NO_CONFIRM", nil) =~ /true/i ? true : false
+$LOAD_PATH.unshift File.join(__dir__, "..")
 
 # import
-require 'lib/searchlink'
+require "lib/searchlink"
 
 if RUBY_VERSION.to_f > 1.9
   Encoding.default_external = Encoding::UTF_8
@@ -20,9 +21,19 @@ SL::Searches.load_custom
 # SL::Searches.load_searches
 
 overwrite = true
-backup = SL.config['backup']
+backup = SL.config["backup"]
 
-if !ARGV.empty?
+if ARGV.empty?
+  input = $stdin.read.scrubup
+  sl.parse(input)
+  output = SL.output&.join
+
+  if SL.clipboard
+    print input
+  else
+    print output
+  end
+else
   files = []
   ARGV.each do |arg|
     case arg
@@ -30,7 +41,7 @@ if !ARGV.empty?
       print SL.version_check
       puts
       sl.help_cli
-      $stdout.puts 'See https://github.com/ttscoff/searchlink/wiki for help'
+      $stdout.puts "See https://github.com/ttscoff/searchlink/wiki for help"
       Process.exit 0
     when /^(--?)?v(er(s(ion)?)?)?$/
       print SL.version_check
@@ -46,7 +57,7 @@ if !ARGV.empty?
 
   files.each do |file|
     if File.exist?(file) && `file -b "#{file}"|grep -c text`.to_i.positive?
-      input = IO.read(file).scrubup
+      input = File.read(file).scrubup
 
       backup_file = "#{file}.bak"
       backup_file = "#{file}.bak 1" if File.exist?(backup_file)
@@ -55,12 +66,12 @@ if !ARGV.empty?
       FileUtils.cp(file, backup_file) if backup && overwrite
 
       sl.parse(input)
-      output = SL.output&.join('')
+      output = SL.output&.join
 
       next unless output
 
       if overwrite
-        File.open(file, 'w') do |f|
+        File.open(file, "w") do |f|
           f.puts output
         end
       else
@@ -70,14 +81,4 @@ if !ARGV.empty?
       warn "Error reading #{file}"
     end
   end
-else
-  input = $stdin.read.scrubup
-  sl.parse(input)
-  output = SL.output&.join('')
-
-  if SL.clipboard
-    print input
-  else
-    print output
-  end
 end

data/lib/searchlink/config.rb

@@ -184,7 +184,7 @@ module SL
       # hash can override existing search triggers.
       config["custom_site_searches"] ||= {
         "bt" => "brettterpstra.com",
-        "imdb" => "imdb.com",
+        "imdb" => "imdb.com"
       }
 
       # confirm existence of links generated from custom search replacements

data/lib/searchlink/curl/html.rb

@@ -90,7 +90,7 @@ module Curl
           tag: tag,
           source: tag_source,
           attrs: attrs,
-          content: contents,
+          content: contents
         }
       end
 
@@ -147,7 +147,7 @@ module Curl
         output << {
           type: "opengraph",
           attrs: nil,
-          src: @meta[src],
+          src: @meta[src]
         }
       end
       images = tags(%w[img source])
@@ -162,21 +162,21 @@ module Curl
                 image, media = s.split(/ /)
                 srcset << {
                   src: image,
-                  media: media,
+                  media: media
                 }
               end
             end
             output << {
               type: "srcset",
               attrs: img[:attrs],
-              images: srcset,
+              images: srcset
             }
           end
         when /img/
           output << {
             type: "img",
             src: img[:attrs].filter { |a| a[:key] =~ /src/i }.first[:value],
-            attrs: img[:attrs],
+            attrs: img[:attrs]
           }
         end
       end
@@ -189,7 +189,7 @@ module Curl
       links = @links.nil? ? 0 : @links.count
       [
         %(<HTMLCurl: @code="#{@code}" @url="#{@url}" @title="#{@title}"),
-        %(@description=#{@description} @headers:#{headers} @meta:#{meta} @links:#{links}>),
+        %(@description=#{@description} @headers:#{headers} @meta:#{meta} @links:#{links}>)
       ].join(" ")
     end
 
@@ -202,11 +202,13 @@ module Curl
     ##
     def h(level = '\d')
       res = []
-      headlines = @body.to_enum(:scan, %r{<h(?<level>#{level})(?<tag> .*?)?>(?<text>.*?)</h#{level}>}i).map { Regexp.last_match }
+      headlines = @body.to_enum(:scan, %r{<h(?<level>#{level})(?<tag> .*?)?>(?<text>.*?)</h#{level}>}i).map do
+        Regexp.last_match
+      end
       headlines.each do |m|
         headline = { level: m["level"] }
         if m["tag"].nil?
-          attrs = nil
+          nil
         else
           attrs = m["tag"].to_enum(:scan, /(?<attr>\w+)=(?<quot>["'])(?<content>.*?)\k<quot>/).map { Regexp.last_match }
           attrs.each { |a| headline[a["attr"].to_sym] = a["content"] }
@@ -256,10 +258,10 @@ module Curl
 
           attrs.map! do |a|
             val = if a["key"] =~ /^(class|rel)$/
-                a["value"].nil? ? "" : a["value"].split(/ /)
-              else
-                a["value"]
-              end
+                    a["value"].nil? ? "" : a["value"].split(/ /)
+                  else
+                    a["value"]
+                  end
             { key: a["key"], value: val }
           end
         end
@@ -268,7 +270,7 @@ module Curl
           source: tag.to_s,
           attrs: attrs,
           content: tag["content"],
-          tags: content_tags(tag["content"]),
+          tags: content_tags(tag["content"])
         }
       end
     end
@@ -359,7 +361,7 @@ module Curl
           title: title,
           rel: rel,
           text: text,
-          class: link_class,
+          class: link_class
         }
         links << link
       end
@@ -402,9 +404,7 @@ module Curl
       headers = headers.nil? ? "" : headers.map { |h, v| %(-H "#{h}: #{v}") }.join(" ")
       compress = compressed ? "--compressed" : ""
       source = `#{@curl} -#{flags} #{compress} #{headers} '#{url}' 2>/dev/null`
-      if source.nil? || source.empty?
-        source = `#{@curl} -#{flags} #{compress} -A "#{agent}" #{headers} '#{url}' 2>/dev/null`
-      end
+      source = `#{@curl} -#{flags} #{compress} -A "#{agent}" #{headers} '#{url}' 2>/dev/null` if source.nil? || source.empty?
 
       return false if source.nil? || source.empty?
 
@@ -425,18 +425,21 @@ module Curl
       end
 
       if headers["content-type"] =~ /json/
-        return { url: url, code: code, headers: headers, meta: nil, links: nil, head: nil, body: source.strip, source: source.strip, body_links: nil, body_images: nil }
+        return { url: url, code: code, headers: headers, meta: nil, links: nil, head: nil, body: source.strip,
+                 source: source.strip, body_links: nil, body_images: nil }
       end
 
       head = source.match(%r{(?<=<head>)(.*?)(?=</head>)}mi)
 
       if head.nil?
-        { url: url, code: code, headers: headers, meta: nil, links: nil, head: nil, body: source.strip, source: source.strip, body_links: nil, body_images: nil }
+        { url: url, code: code, headers: headers, meta: nil, links: nil, head: nil, body: source.strip,
+          source: source.strip, body_links: nil, body_images: nil }
       else
         meta = meta_tags(head[1])
         links = link_tags(head[1])
         body = source.match(%r{<body.*?>(.*?)</body>}mi)[1]
-        { url: url, code: code, headers: headers, meta: meta, links: links, head: head[1], body: body, source: source.strip, body_links: body_links, body_images: body_images }
+        { url: url, code: code, headers: headers, meta: meta, links: links, head: head[1], body: body,
+          source: source.strip, body_links: body_links, body_images: body_images }
       end
     end
 

data/lib/searchlink/curl/json.rb

@@ -28,10 +28,10 @@ module Curl
       target = json
       parts.each do |part|
         target = if part =~ /(?<key>[^\[]+)\[(?<int>\d+)\]/
-            target[key][int.to_i]
-          else
-            target[part]
-          end
+                   target[key][int.to_i]
+                 else
+                   target[part]
+                 end
       end
 
       target
@@ -58,9 +58,7 @@ module Curl
       compress = compressed ? "--compressed" : ""
 
       source = `#{@curl} -#{flags} #{compress} #{headers} #{data} "#{url}" 2>/dev/null`
-      if source.nil? || source.empty?
-        source = `#{@curl} -#{flags} #{compress} -A "#{agent}" #{headers} '#{url}' 2>/dev/null`
-      end
+      source = `#{@curl} -#{flags} #{compress} -A "#{agent}" #{headers} '#{url}' 2>/dev/null` if source.nil? || source.empty?
 
       return false if source.nil? || source.empty?
 

data/lib/searchlink/help.rb

@@ -67,7 +67,9 @@ module SL
 
       if SL.config["custom_site_searches"]
         text += "\n-- [Custom Searches] ----------------------\n"
-        SL.config["custom_site_searches"].sort_by { |l, _s| l }.each { |label, site| text += "!#{label}#{label.spacer} #{site}\n" }
+        SL.config["custom_site_searches"].sort_by do |l, _s|
+          l
+        end.each { |label, site| text += "!#{label}#{label.spacer} #{site}\n" }
       end
       text
     end
@@ -80,7 +82,9 @@ module SL
       out << '<table id="custom">'
       out << "<thead><td>Shortcut</td><td>Search Type</td></thead>"
       out << "<tbody>"
-      SL.config["custom_site_searches"].each { |label, site| out << "<tr><td><code>!#{label}</code></td><td>#{site}</td></tr>" }
+      SL.config["custom_site_searches"].each do |label, site|
+        out << "<tr><td><code>!#{label}</code></td><td>#{site}</td></tr>"
+      end
       out << "</tbody>"
       out << "</table>"
       out.join("\n")

data/lib/searchlink/output.rb

@@ -248,10 +248,10 @@ module SL
 
       out = ""
       inline = if SL.originput.split(/\n/).length > 1
-          false
-        else
-          SL.config["inline"] || SL.originput.split(/\n/).length == 1
-        end
+                 false
+               else
+                 SL.config["inline"] || SL.originput.split(/\n/).length == 1
+               end
 
       SL.errors.each do |k, v|
         next if v.empty?
@@ -259,10 +259,10 @@ module SL
         v.each_with_index do |err, i|
           out += "(#{k}) #{err}"
           out += if inline
-              i == v.length - 1 ? " | " : ", "
-            else
-              "\n"
-            end
+                   i == v.length - 1 ? " | " : ", "
+                 else
+                   "\n"
+                 end
         end
       end
 

data/lib/searchlink/parse.rb

@@ -4,7 +4,7 @@ module SL
   class SearchLink
     # Confirm a URL with a popup if requested
     def confirmed?(url)
-      return true unless SL.config["confirm"]
+      return true if !SL.config["confirm"] || NO_CONFIRM
 
       SL::Shortener.confirm?(url)
     end
@@ -19,16 +19,14 @@ module SL
 
       parse_commands(input)
 
-      SL.config["inline"] = true if input.scan(/\]\(/).length == 1 && input.split(/\n/).length == 1
+      SL.config["inline"] = true if input.scan("](").length == 1 && input.split("\n").length == 1
       SL.errors = {}
       SL.report = []
       SL.shortener = :none
 
       # Check for new version
       latest_version = SL.new_version?
-      if latest_version
-        SL.add_output("<!-- v#{latest_version} available, run SearchLink on the word 'update' to install. -->")
-      end
+      SL.add_output("<!-- v#{latest_version} available, run SearchLink on the word 'update' to install. -->") if latest_version
 
       @links = {}
       SL.footer = []
@@ -41,14 +39,14 @@ module SL
       input.scan(/\[(.*?)\]:\s+(.*?)\n/).each { |match| @links[match[1].strip] = match[0] }
 
       @prefix = if SL.config["prefix_random"]
-          if input =~ /\[(\d{4}-)\d+\]: \S+/
-            Regexp.last_match(1)
-          else
-            format("%04d-", rand(9999))
-          end
-        else
-          ""
-        end
+                  if input =~ /\[(\d{4}-)\d+\]: \S+/
+                    Regexp.last_match(1)
+                  else
+                    format("%04d-", rand(9999))
+                  end
+                else
+                  ""
+                end
 
       @highest_marker = 0
       input.scan(/^\s{,3}\[(?:#{@prefix})?(\d+)\]: /).each do
@@ -65,7 +63,7 @@ module SL
       if SL.config["complete_bare"]
         rx = %r{(?ix-m)(?<!\(|:\s|<)(?:
                 (?:https?://)(?:[\da-z.-]+)\.(?:[a-z.]{2,6})
-                (?:[/\w\d.\-()_/+=?&%]*?(?=[\s\n]|$))
+                (?:[/\w\d.\-()_+=?&%]*?(?=[\s\n]|$))
               )}
         input.gsub!(rx) do
           url_match = Regexp.last_match
@@ -76,17 +74,17 @@ module SL
       if input =~ /\[\n(.*?\n)+\]\((.*?)?\)/
         input.gsub!(/\[\n(((\s*(?:[-+*]|\d+\.)?\s+)*(!\S+ +)?(.*?))\n)+\]\((!\S+.*?)?\)/) do
           m = Regexp.last_match
-          lines = m[0].split(/\n/)
+          lines = m[0].split("\n")
           lines = lines[1..-2]
           lines.map do |l|
             el_rx = /(\s*(?:[-+*]|\d+\.)?\s+)?(!\S+ )?(\w.*?)$/
             if l =~ el_rx
               els = l.match(el_rx)
               search = if els[2]
-                  els[2].strip
-                else
-                  m[6] || "!g"
-                end
+                         els[2].strip
+                       else
+                         m[6] || "!g"
+                       end
               "#{els[1]}[#{els[3].strip}](#{search})"
             else
               l
@@ -97,7 +95,7 @@ module SL
 
       # Handle links in the form of [text](url) or [text](url "title")
       if input =~ /\[(.*?)\]\((.*?)\)/
-        lines = input.split(/\n/)
+        lines = input.split("\n")
         out = []
 
         total_links = input.scan(/\[(.*?)\]\((.*?)\)/).length
@@ -146,9 +144,7 @@ module SL
             end
 
             counter_links += 1
-            unless SILENT
-              $stderr.print("\033[0K\rProcessed: #{counter_links} of #{total_links}, #{counter_errors} errors. ")
-            end
+            $stderr.print("\033[0K\rProcessed: #{counter_links} of #{total_links}, #{counter_errors} errors. ") unless SILENT
 
             @link_text = this_match[1] || ""
             link_info = parse_arguments(this_match[2].strip).strip || ""
@@ -209,10 +205,10 @@ module SL
                 m = Regexp.last_match
 
                 search_type = if m[1].nil?
-                    SL::GoogleSearch.api_key? ? "gg" : "g"
-                  else
-                    m[1]
-                  end
+                                SL::GoogleSearch.api_key? ? "gg" : "g"
+                              else
+                                m[1]
+                              end
 
                 search_type.extract_shortener!
 
@@ -228,9 +224,7 @@ module SL
                 search_terms = @link_text if search_terms == ""
 
                 # if the input starts with a +, append it to the link text as the search terms
-                if search_terms.strip =~ /^\+[^+]/
-                  search_terms = "#{@link_text} #{search_terms.strip.sub(/^\+\s*/, "")}"
-                end
+                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 =~ /(!!)?\^(!!)?$/
@@ -270,9 +264,7 @@ module SL
                 search_terms = false
               end
 
-              if search_type && !search_terms.empty?
-                search_type, search_terms = custom_search(search_type, search_terms)
-              end
+              search_type, search_terms = custom_search(search_type, search_terms) if search_type && !search_terms.empty?
 
               SL.add_query(query) if query
 
@@ -292,13 +284,11 @@ module SL
 
                 if @url
                   res = confirmed?(@url)
-                  if !res
-                    return match
-                  else
-                    @url = res if res.is_a?(String) && SL::URL.url?(res)
-                  end
+                  return match unless res
+
+                  @url = res if res.is_a?(String) && SL::URL.url?(res)
 
-                  title = SL::URL.title(@url) if SL.titleize && title == ""
+                  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
@@ -361,7 +351,7 @@ module SL
         elsif SL.footer.empty?
           SL.add_output input
         else
-          last_line = input.strip.split(/\n/)[-1]
+          last_line = input.strip.split("\n")[-1]
           case last_line
           when /^\[.*?\]: http/
             SL.add_output "#{input.rstrip}\n"
@@ -473,10 +463,10 @@ module SL
         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
+                     "m"
+                   else
+                     "t"
+                   end
           @link_text = input.sub(/^[tfilm]/, "")
           SL.add_query(query) if query
           @url, title = SL::SocialSearch.social_handle(type, @link_text)
@@ -492,7 +482,7 @@ module SL
           if res
             if res.is_a?(String) && SL::URL.url?(res)
               @url = res
-              title = SL::URL.title(@url) unless title == ""
+              title = SL::URL.title(@url) if SL.titleize && title == ""
             end
 
             if type =~ /sp(ell)?/
@@ -582,7 +572,8 @@ module SL
 
       input.parse_flags! unless skip_flags
 
-      options = %w[debug country_code inline prefix_random include_titles remove_seo validate_links complete_bare confirm]
+      options = %w[debug country_code inline prefix_random include_titles remove_seo validate_links complete_bare
+                   confirm]
       options.each do |o|
         if input =~ /^ *#{o}:\s+(\S+)$/
           val = Regexp.last_match(1).strip
@@ -648,10 +639,10 @@ module SL
         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
+                @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)
@@ -675,12 +666,16 @@ module SL
           search_type = "r"
           tokens = v.scan(/\$term\d+[ds]?/).sort.uniq
 
-          if !tokens.empty?
+          if tokens.empty?
+            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
+          else
             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
+              highest_token = Regexp.last_match(1).to_i if token =~ /(\d+)[ds]?$/ && Regexp.last_match(1).to_i > highest_token
             end
             terms_p = search_terms.split(/ +/)
             if terms_p.length > highest_token
@@ -706,12 +701,6 @@ module SL
               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"