searchlink 2.3.74 → 2.3.76

data/lib/searchlink/searches/wikipedia.rb

@@ -5,9 +5,9 @@ module SL
     class << self
       def settings
         {
-          trigger: 'wiki',
+          trigger: "wiki",
           searches: [
-            ['wiki', 'Wikipedia Search']
+            ["wiki", "Wikipedia Search"]
           ]
         }
       end
@@ -17,7 +17,7 @@ module SL
         body = `/usr/bin/curl -sSL 'https://en.wikipedia.org/wiki/Special:Search?search=#{search_terms.url_encode}&go=Go'`
         return false unless body
 
-        body = body.force_encoding('utf-8') if RUBY_VERSION.to_f > 1.9
+        body = body.force_encoding("utf-8") if RUBY_VERSION.to_f > 1.9
 
         begin
           title = body.match(/"wgTitle":"(.*?)"/)[1]
@@ -30,6 +30,6 @@ module SL
       end
     end
 
-    SL::Searches.register 'wikipedia', :search, self
+    SL::Searches.register "wikipedia", :search, self
   end
 end

data/lib/searchlink/searches/youtube.rb

@@ -8,10 +8,10 @@ module SL
     class << self
       def settings
         {
-          trigger: 'yte?',
+          trigger: "yte?",
           searches: [
-            ['yt', 'YouTube Search'],
-            ['yte', 'YouTube Embed']
+            ["yt", "YouTube Search"],
+            ["yte", "YouTube Embed"]
           ]
         }
       end
@@ -33,18 +33,18 @@ module SL
       def embed_for_url(url)
         return unless url =~ YOUTUBE_RX
 
-        id = Regexp.last_match('id')
+        id = Regexp.last_match("id")
         title = [
           %(<iframe width="560" height="315" src="https://www.youtube.com/embed/#{id}"),
           %(title="YouTube video player" frameborder="0"),
           %(allow="accelerometer; autoplay; clipboard-write; encrypted-media;),
           %(gyroscope; picture-in-picture; web-share"),
           %(allowfullscreen></iframe>)
-        ].join(' ')
-        ['embed', title]
+        ].join(" ")
+        ["embed", title]
       end
     end
 
-    SL::Searches.register 'youtube', :search, self
+    SL::Searches.register "youtube", :search, self
   end
 end

data/lib/searchlink/searches.rb

@@ -43,9 +43,9 @@ module SL
       #
       def available_searches_html
         searches = plugins[:search]
-          .flat_map { |_, plugin| plugin[:searches] }
-          .reject { |s| s[1].nil? }
-          .sort_by { |s| s[0].is_a?(Array) ? s[0][0] : s[0] }
+                   .flat_map { |_, plugin| plugin[:searches] }
+                   .reject { |s| s[1].nil? }
+                   .sort_by { |s| s[0].is_a?(Array) ? s[0][0] : s[0] }
         out = ['<table id="searches">',
                "<thead><td>Shortcut</td><td>Search Type</td></thead>",
                "<tbody>"]
@@ -53,7 +53,7 @@ module SL
         searches.each do |s|
           out << "<tr>
           <td>
-          <code>!#{s[0].is_a?(Array) ? "#{s[0][0]} (#{s[0][1..-1].join(",")})" : s[0]}
+          <code>!#{s[0].is_a?(Array) ? "#{s[0][0]} (#{s[0][1..-1].join(',')})" : s[0]}
           </code>
           </td><td>#{s[1]}</td></tr>"
         end
@@ -72,10 +72,10 @@ module SL
 
         searches.each do |s|
           shortcut = if s[0].is_a?(Array)
-              "#{s[0][0]} (#{s[0][1..-1].join(",")})"
-            else
-              s[0]
-            end
+                       "#{s[0][0]} (#{s[0][1..-1].join(',')})"
+                     else
+                       s[0]
+                     end
 
           out << "!#{shortcut}#{shortcut.spacer}#{s[1]}"
         end
@@ -95,7 +95,7 @@ module SL
 
       def did_you_mean(term)
         matches = best_search_match(term)
-        matches.empty? ? "" : ", did you mean #{matches.map { |m| "!#{m}" }.join(", ")}?"
+        matches.empty? ? "" : ", did you mean #{matches.map { |m| "!#{m}" }.join(', ')}?"
       end
 
       def valid_searches
@@ -123,7 +123,7 @@ module SL
         plugins[type][title] = {
           trigger: settings.fetch(:trigger, title).normalize_trigger,
           searches: settings[:searches],
-          class: klass,
+          class: klass
         }
       end
 
@@ -154,11 +154,11 @@ module SL
           config = IO.read(file)
 
           cfg = case ext
-            when /^y/i
-              YAML.safe_load(config)
-            else
-              JSON.parse(config)
-            end
+                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)
@@ -241,5 +241,5 @@ require_relative "searches/youtube"
 # import
 require_relative "searches/stackoverflow"
 
-#import
+# import
 require_relative "searches/linkding"

data/lib/searchlink/semver.rb

@@ -12,13 +12,13 @@ module SL
     ## @return     [SemVer] SemVer object
     ##
     def initialize(version_string)
-      raise VersionError.new("Invalid semantic version number: #{version_string}") unless version_string.valid_version?
+      raise VersionError, "Invalid semantic version number: #{version_string}" unless version_string.valid_version?
 
       @maj, @min, @patch = version_string.split(/\./)
       @pre = nil
       if @patch =~ /(-?[^0-9]+\d*)$/
-        @pre = Regexp.last_match(1).sub(/^-/, '')
-        @patch = @patch.sub(/(-?[^0-9]+\d*)$/, '')
+        @pre = Regexp.last_match(1).sub(/^-/, "")
+        @patch = @patch.sub(/(-?[^0-9]+\d*)$/, "")
       end
 
       @maj = @maj.to_i
@@ -135,7 +135,7 @@ module SL
     end
 
     def to_s
-      ver = [@maj, @min, @patch].join('.')
+      ver = [@maj, @min, @patch].join(".")
       @pre.nil? ? ver : "#{ver}-#{@pre}"
     end
   end

data/lib/searchlink/string.rb

@@ -5,7 +5,7 @@ module SL
   class ::String
     # Scrub invalid characters from string
     def scrubup
-      encode('utf-16', invalid: :replace).encode('utf-8').gsub(/\u00A0/, ' ')
+      encode("utf-16", invalid: :replace).encode("utf-8").gsub(/\u00A0/, " ")
     end
 
     # @see #scrub
@@ -32,7 +32,7 @@ module SL
     ## @return     [String] modified regular expression
     ##
     def normalize_trigger
-      gsub(/\((?!\?:)/, '(?:').gsub(/(^(\^|\\A)|(\$|\\Z)$)/, '').downcase
+      gsub(/\((?!\?:)/, "(?:").gsub(/(^(\^|\\A)|(\$|\\Z)$)/, "").downcase
     end
 
     ##
@@ -56,29 +56,29 @@ module SL
     def parse_flags
       gsub(/(\+\+|--)([dirtvs]+)\b/) do
         m = Regexp.last_match
-        bool = m[1] == '++' ? '' : 'no-'
-        output = ' '
-        m[2].split('').each do |arg|
+        bool = m[1] == "++" ? "" : "no-"
+        output = " "
+        m[2].split("").each do |arg|
           output += case arg
-                    when 'd'
+                    when "d"
                       "--#{bool}debug "
-                    when 'i'
+                    when "i"
                       "--#{bool}inline "
-                    when 'r'
+                    when "r"
                       "--#{bool}prefix_random "
-                    when 't'
+                    when "t"
                       "--#{bool}include_titles "
-                    when 'v'
+                    when "v"
                       "--#{bool}validate_links "
-                    when 's'
+                    when "s"
                       "--#{bool}remove_seo "
                     else
-                      ''
+                      ""
                     end
         end
 
         output
-      end.gsub(/ +/, ' ')
+      end.gsub(/ +/, " ")
     end
 
     def parse_flags!
@@ -91,7 +91,7 @@ module SL
     ## @return     { description_of_the_return_value }
     ##
     def fix_gist_file
-      sub(/^file-/, '').sub(/-([^\-]+)$/, '.\1')
+      sub(/^file-/, "").sub(/-([^\-]+)$/, '.\1')
     end
 
     # Turn a string into a slug, removing spaces and
@@ -100,7 +100,7 @@ module SL
     # @return     [String] slugified string
     #
     def slugify
-      downcase.gsub(/[^a-z0-9_]/i, '-').gsub(/-+/, '-').sub(/-?$/, '')
+      downcase.gsub(/[^a-z0-9_]/i, "-").gsub(/-+/, "-").sub(/-?$/, "")
     end
 
     # Destructive slugify
@@ -116,11 +116,11 @@ module SL
     ## @return     [String] cleaned URL/String
     ##
     def clean
-      gsub(/\n+/, ' ')
-        .gsub(/"/, '&quot')
-        .gsub(/\|/, '-')
+      gsub(/\n+/, " ")
+        .gsub(/"/, "&quot")
+        .gsub(/\|/, "-")
         .gsub(/([&?]utm_[scm].+=[^&\s!,.)\]]++?)+(&.*)/, '\2')
-        .sub(/\?&/, '').strip
+        .sub(/\?&/, "").strip
     end
 
     # convert itunes to apple music link
@@ -128,8 +128,8 @@ module SL
     # @return [String] apple music link
     def to_am
       input = dup
-      input.sub!(%r{/itunes\.apple\.com}, 'geo.itunes.apple.com')
-      append = input =~ %r{\?[^/]+=} ? '&app=music' : '?app=music'
+      input.sub!(%r{/itunes\.apple\.com}, "geo.itunes.apple.com")
+      append = input =~ %r{\?[^/]+=} ? "&app=music" : "?app=music"
       input + append
     end
 
@@ -139,7 +139,7 @@ module SL
     ## @return     [String] just hostname and path of URL
     ##
     def remove_protocol
-      sub(%r{^(https?|s?ftp|file)://}, '')
+      sub(%r{^(https?|s?ftp|file)://}, "")
     end
 
     ##
@@ -158,11 +158,11 @@ module SL
     def path_elements
       path = url_path
       # force trailing slash
-      path.sub!(%r{/?$}, '/')
+      path.sub!(%r{/?$}, "/")
       # remove last path element
-      path.sub!(%r{/[^/]+[.\-][^/]+/$}, '')
+      path.sub!(%r{/[^/]+[.\-][^/]+/$}, "")
       # remove starting/ending slashes
-      path.gsub!(%r{(^/|/$)}, '')
+      path.gsub!(%r{(^/|/$)}, "")
       # split at slashes, delete sections that are shorter
       # than 5 characters or only consist of numbers
       path.split(%r{/}).delete_if { |section| section =~ /^\d+$/ || section.length < 5 }
@@ -189,11 +189,11 @@ module SL
       words = split(/\s+/)
 
       punct_chars = {
-        '“' => '”',
-        '‘' => '’',
-        '[' => ']',
-        '(' => ')',
-        '<' => '>'
+        "“" => "”",
+        "‘" => "’",
+        "[" => "]",
+        "(" => ")",
+        "<" => ">"
       }
 
       left_punct = []
@@ -205,10 +205,10 @@ module SL
         end
       end
 
-      tail = ''
+      tail = ""
       left_punct.reverse.each { |c| tail += punct_chars[c] }
 
-      gsub(/[^a-z)\]’”.…]+$/i, '...').strip + tail
+      gsub(/[^a-z)\]’”.…]+$/i, "...").strip + tail
     end
 
     ##
@@ -235,9 +235,9 @@ module SL
       url = URI.parse(url)
       host = url.hostname
       unless host
-        return self unless SL.config['debug']
+        return self unless SL.config["debug"]
 
-        SL.add_error('Invalid URL', "Could not remove SEO for #{url}")
+        SL.add_error("Invalid URL", "Could not remove SEO for #{url}")
         return self
 
       end
@@ -245,12 +245,12 @@ module SL
       path = url.path
       root_page = path =~ %r{^/?$} ? true : false
 
-      title.gsub!(/\s*(&ndash;|&mdash;)\s*/, ' - ')
+      title.gsub!(/\s*(&ndash;|&mdash;)\s*/, " - ")
       title.gsub!(/&[lr]dquo;/, '"')
       title.gsub!(/&[lr]dquo;/, "'")
-      title.gsub!(/&#8211;/, ' — ')
+      title.gsub!(/&#8211;/, " — ")
       title = CGI.unescapeHTML(title)
-      title.gsub!(/ +/, ' ')
+      title.gsub!(/ +/, " ")
 
       seo_title_separators = %w[| » « — – - · :]
 
@@ -258,7 +258,7 @@ module SL
         re_parts = []
 
         host_parts = host.sub(/(?:www\.)?(.*?)\.[^.]+$/, '\1').split(/\./).delete_if { |p| p.length < 3 }
-        h_re = !host_parts.empty? ? host_parts.map { |seg| seg.downcase.split(//).join('.?') }.join('|') : ''
+        h_re = !host_parts.empty? ? host_parts.map { |seg| seg.downcase.split(//).join(".?") }.join("|") : ""
         re_parts.push(h_re) unless h_re.empty?
 
         # p_re = path.path_elements.map{|seg| seg.downcase.split(//).join('.?') }.join('|')
@@ -268,7 +268,7 @@ module SL
 
         dead_switch = 0
 
-        while title.downcase.gsub(/[^a-z]/i, '') =~ /#{site_re}/i
+        while title.downcase.gsub(/[^a-z]/i, "") =~ /#{site_re}/i
 
           break if dead_switch > 5
 
@@ -277,14 +277,14 @@ module SL
 
             next if parts.length == 1
 
-            remaining_separators = seo_title_separators[i..-1].map { |s| Regexp.escape(s) }.join('')
+            remaining_separators = seo_title_separators[i..-1].map { |s| Regexp.escape(s) }.join("")
             seps = Regexp.new("^[^#{remaining_separators}]+$")
 
             longest = parts.longest_element.strip
 
             unless parts.empty?
               parts.delete_if do |pt|
-                compressed = pt.strip.downcase.gsub(/[^a-z]/i, '')
+                compressed = pt.strip.downcase.gsub(/[^a-z]/i, "")
                 compressed =~ /#{site_re}/ && pt =~ seps ? !root_page : false
               end
             end
@@ -302,7 +302,7 @@ module SL
           dead_switch += 1
         end
       rescue StandardError => e
-        return self unless SL.config['debug']
+        return self unless SL.config["debug"]
 
         SL.add_error("Error SEO processing title for #{url}", e)
         return self
@@ -314,7 +314,7 @@ module SL
         title = seo_parts.longest_element.strip if seo_parts.length.positive?
       end
 
-      title && title.length > 5 ? title.gsub(/\s+/, ' ') : CGI.unescapeHTML(self)
+      title && title.length > 5 ? title.gsub(/\s+/, " ") : CGI.unescapeHTML(self)
     end
 
     ##
@@ -340,12 +340,12 @@ module SL
 
       words = split(/\s+/)
       words.each do |word|
-        break unless trunc_title.join(' ').length.close_punctuation + word.length <= max
+        break unless trunc_title.join(" ").length.close_punctuation + word.length <= max
 
         trunc_title << word
       end
 
-      trunc_title.empty? ? words[0] : trunc_title.join(' ')
+      trunc_title.empty? ? words[0] : trunc_title.join(" ")
     end
 
     ##
@@ -370,7 +370,7 @@ module SL
     ## @param      start_word  [Boolean] Require match to be
     ##                         at beginning of word
     ##
-    def matches_score(terms, separator: ' ', start_word: true)
+    def matches_score(terms, separator: " ", start_word: true)
       matched = 0
       regexes = terms.to_rx_array(separator: separator, start_word: start_word)
 
@@ -383,7 +383,7 @@ module SL
       ((matched / regexes.count.to_f) * 10).round(3)
     end
 
-    def matches_fuzzy(terms, separator: ' ', start_word: true, threshhold: 5)
+    def matches_fuzzy(terms, separator: " ", start_word: true, threshhold: 5)
       sources = split(/(#{separator})+/)
       words = terms.split(/(#{separator})+/)
       matches = 0
@@ -429,7 +429,7 @@ module SL
     ## @param      string [String] The string to match
     ##
     def matches_exact(string)
-      comp = gsub(/[^a-z0-9 ]/i, '')
+      comp = gsub(/[^a-z0-9 ]/i, "")
       comp =~ /\b#{string.gsub(/[^a-z0-9 ]/i, '').split(/ +/).map { |s| Regexp.escape(s) }.join(' +')}/i
     end
 
@@ -440,7 +440,7 @@ module SL
     ##
     def matches_none(terms)
       rx_terms = terms.is_a?(String) ? terms.to_rx_array : terms
-      rx_terms.each { |rx| return false if gsub(/[^a-z0-9 ]/i, '') =~ rx }
+      rx_terms.each { |rx| return false if gsub(/[^a-z0-9 ]/i, "") =~ rx }
       true
     end
 
@@ -451,7 +451,7 @@ module SL
     ##
     def matches_any(terms)
       rx_terms = terms.is_a?(String) ? terms.to_rx_array : terms
-      rx_terms.each { |rx| return true if gsub(/[^a-z0-9 ]/i, '') =~ rx }
+      rx_terms.each { |rx| return true if gsub(/[^a-z0-9 ]/i, "") =~ rx }
       false
     end
 
@@ -462,7 +462,7 @@ module SL
     ##
     def matches_all(terms)
       rx_terms = terms.is_a?(String) ? terms.to_rx_array : terms
-      rx_terms.each { |rx| return false unless gsub(/[^a-z0-9 ]/i, '') =~ rx }
+      rx_terms.each { |rx| return false unless gsub(/[^a-z0-9 ]/i, "") =~ rx }
       true
     end
 
@@ -475,8 +475,8 @@ module SL
     ##
     ## @return     [Array] array of regular expressions
     ##
-    def to_rx_array(separator: ' ', start_word: true)
-      bound = start_word ? '\b' : ''
+    def to_rx_array(separator: " ", start_word: true)
+      bound = start_word ? '\b' : ""
       str = gsub(/(#{separator})+/, separator)
       str.split(/#{separator}/).map { |arg| /#{bound}#{arg.gsub(/[^a-z0-9]/i, '.?')}/i }
     end
@@ -493,8 +493,8 @@ module SL
     ## Shorten path by adding ~ for home directory
     ##
     def shorten_path
-      home_directory = ENV['HOME']
-      sub(home_directory, '~')
+      home_directory = ENV["HOME"]
+      sub(home_directory, "~")
     end
   end
 end

data/lib/searchlink/url.rb

@@ -9,39 +9,39 @@ module SL
       def valid_link?(uri_str, limit = 5)
         return false unless uri_str
 
-        SL.notify('Validating', uri_str)
+        SL.notify("Validating", uri_str)
         return false if limit.zero?
 
         url = URI(uri_str)
         return true unless url.scheme
 
-        url.path = '/' if url.path == ''
+        url.path = "/" if url.path == ""
         # response = Net::HTTP.get_response(URI(uri_str))
         response = false
 
-        Net::HTTP.start(url.host, url.port, use_ssl: url.scheme == 'https') do |http|
+        Net::HTTP.start(url.host, url.port, use_ssl: url.scheme == "https") do |http|
           response = http.request_head(url.path)
         end
 
         case response
         when Net::HTTPMethodNotAllowed, Net::HTTPServiceUnavailable
           unless /amazon\.com/ =~ url.host
-            SL.add_error('link validation', "Validation blocked: #{uri_str} (#{e})")
+            SL.add_error("link validation", "Validation blocked: #{uri_str} (#{e})")
           end
-          SL.notify('Error validating', uri_str)
+          SL.notify("Error validating", uri_str)
           true
         when Net::HTTPSuccess
           true
         when Net::HTTPRedirection
-          location = response['location']
+          location = response["location"]
           valid_link?(location, limit - 1)
         else
-          SL.notify('Error validating', uri_str)
+          SL.notify("Error validating", uri_str)
           false
         end
       rescue StandardError => e
-        SL.notify('Error validating', uri_str)
-        SL.add_error('link validation', "Possibly invalid => #{uri_str} (#{e})")
+        SL.notify("Error validating", uri_str)
+        SL.add_error("link validation", "Possibly invalid => #{uri_str} (#{e})")
         true
       end
 
@@ -58,14 +58,14 @@ module SL
 
         parts = url.hostname.split(/\./)
         domain = if parts.count > 1
-                   parts.slice(-2, 1).join('')
-                 else
-                   parts.join('')
-                 end
+            parts.slice(-2, 1).join("")
+          else
+            parts.join("")
+          end
 
         path = url.path.split(%r{/}).last
         if path
-          path.gsub!(/-/, ' ').gsub!(/\.\w{2-4}$/, '')
+          path.gsub!(/-/, " ").gsub!(/\.\w{2-4}$/, "")
         else
           path = domain
         end
@@ -81,10 +81,10 @@ module SL
           url = URI.parse(input.downcase)
 
           title = if type == :ref_title
-                    ref_title_for_url(url)
-                  else
-                    title(url.to_s) || input.sub(%r{^https?://}, '')
-                  end
+              ref_title_for_url(url)
+            else
+              title(url.to_s) || input.sub(%r{^https?://}, "")
+            end
 
           return [url.to_s, title] if url.hostname
         end
@@ -94,15 +94,13 @@ module SL
       def amazon_affiliatize(url, amazon_partner)
         return url if amazon_partner.nil? || amazon_partner.empty?
 
-        unless url =~ %r{https?://(?<subdomain>.*?)amazon.com/(?:(?<title>.*?)/)?(?<type>[dg])p/(?<id>[^?]+)}
-          return [url, '']
-        end
+        return [url, ""] unless url =~ %r{https?://(?<subdomain>.*?)amazon.com/(?:(?<title>.*?)/)?(?<type>[dg])p/(?<id>[^?]+)}
 
         m = Regexp.last_match
-        sd = m['subdomain']
-        title = m['title'].gsub(/-/, ' ')
-        t = m['type']
-        id = m['id']
+        sd = m["subdomain"]
+        title = m["title"].gsub(/-/, " ")
+        t = m["type"]
+        id = m["id"]
         ["https://#{sd}amazon.com/#{t}p/#{id}/?ref=as_li_ss_tl&ie=UTF8&linkCode=sl1&tag=#{amazon_partner}", title]
       end
 
@@ -137,17 +135,17 @@ module SL
           title = page.title || nil
 
           if title.nil? || title =~ /^\s*$/
-            SL.add_error('Title not found', "Warning: missing title for #{url.strip}")
-            title = url.gsub(%r{(^https?://|/.*$)}, '').gsub(/-/, ' ').strip
+            SL.add_error("Title not found", "Warning: missing title for #{url.strip}")
+            title = url.gsub(%r{(^https?://|/.*$)}, "").gsub(/-/, " ").strip
           else
-            title = title.gsub(/\n/, ' ').gsub(/\s+/, ' ').strip # .sub(/[^a-z]*$/i,'')
-            title.remove_seo!(url) if SL.config['remove_seo']
+            title = title.gsub(/\n/, " ").gsub(/\s+/, " ").strip # .sub(/[^a-z]*$/i,'')
+            title.remove_seo!(url) if SL.config["remove_seo"]
           end
-          title.gsub!(/\|/, '—')
-          title.remove_seo!(url.strip) if SL.config['remove_seo']
+          title.gsub!(/\|/, "—")
+          title.remove_seo!(url.strip) if SL.config["remove_seo"]
           title.remove_protocol
         rescue StandardError
-          SL.add_error('Error retrieving title', "Error determining title for #{url.strip}")
+          SL.add_error("Error retrieving title", "Error determining title for #{url.strip}")
           warn "Error retrieving title for #{url.strip}"
           url.remove_protocol
         end

data/lib/searchlink/util.rb

@@ -65,7 +65,7 @@ module SL
             url, title, link_text = search.call
           end
         rescue Timeout::Error
-          SL.add_error('Timeout', 'Search timed out')
+          SL.add_error("Timeout", "Search timed out")
           url, title, link_text = false
         end
 
@@ -81,9 +81,9 @@ module SL
       ## @return     [String] path to new cache file
       ##
       def cache_file_for(filename)
-        cache_folder = File.expand_path('~/.config/searchlink/cache')
+        cache_folder = File.expand_path("~/.config/searchlink/cache")
         FileUtils.mkdir_p(cache_folder) unless File.directory?(cache_folder)
-        File.join(cache_folder, filename.sub(/(\.cache)?$/, '.cache'))
+        File.join(cache_folder, filename.sub(/(\.cache)?$/, ".cache"))
       end
     end
   end