searchlink 2.3.86 → 2.3.88

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c00e022d8b8155db4e6fd3acd6ccaa69be955a316774be41747cce0e476f0df6
-  data.tar.gz: 8487fcec9ab7d7830c467e5bfa2ed4008104a2363cb776b18864848891a7d98b
+  metadata.gz: 1d1e0567872f0b80b0d51b37a4522c91cd70f3af268b07ee9d2ed35e56ee3288
+  data.tar.gz: a5327a1f2e2d355b3f1ba7c5818f9b51c640207e3e0e48374527038e4e2d049e
 SHA512:
-  metadata.gz: 66ee6b30d332f4047f4f1528a8f39b6eb51cbb0b6ef0f3abd5b546ea3dd4433ec212c4b72c9d46a680c65e69078afc617caf8d5d7da757181281bb5c16518ad8
-  data.tar.gz: 7b29d19cdddbc9c6ecbe07ecaf7cc23e685da82fd03fe16645a4775ee0aa15ca96bc859da6bc38725fdd074642fa986a396bd745e4af87379bfbfd17f60e83b2
+  metadata.gz: 6bbf35b751bbdfc03e990ef90de99b62117183759640c0ffc102d606be0aed4e8982bec6d1bfaec7ffc67e0dd4670252174307ef2d8953752402f6789e388953
+  data.tar.gz: 1f2e05c2e4220b8f38a6bebe99c1ca019474d8dde50e2c61ecf57e557c265ad2536d317a5d7e47ad5583dc065ae983fa475f215650e1ceeb24c24b1e07440618

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
 
@@ -142,12 +142,12 @@ 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",
           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

@@ -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
@@ -248,10 +260,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 +271,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