searchlink 2.3.73 → 2.3.76

data/lib/searchlink/script_plugin.rb

@@ -6,17 +6,17 @@ module SL
   # Script Search
   class ScriptSearch
     def initialize(config)
-      @filename = config['filename']
-      @path = config['path']
+      @filename = config["filename"]
+      @path = config["path"]
 
       %w[trigger searches name script].each do |key|
         raise PluginError.new(%(configuration missing key "#{key}"), plugin: @filename) unless config.key?(key)
       end
 
-      @trigger = config['trigger']
-      @searches = config['searches']
-      @name = config['name']
-      @script = find_script(config['script'])
+      @trigger = config["trigger"]
+      @searches = config["searches"]
+      @name = config["name"]
+      @script = find_script(config["script"])
 
       unless File.executable?(@script)
         raise PluginError.new(%(script "#{File.basename(@script)}" not executable\nrun `chmod a+x #{@script.shorten_path}` to correct),
@@ -36,7 +36,7 @@ module SL
           terms = Shellwords.escape(search_terms)
           text = Shellwords.escape(link_text)
 
-          stdout = `#{[@script, type, terms, text].join(' ')} 2>&1`
+          stdout = `#{[@script, type, terms, text].join(" ")} 2>&1`
 
           unless $CHILD_STATUS.success?
             raise PluginError.new(%("#{File.basename(@script)}" returned error #{$CHILD_STATUS.exitstatus}\n#{stdout}),
@@ -60,7 +60,7 @@ module SL
             end
           end
 
-          [res['url'], res['title'], res['link_text']]
+          [res["url"], res["title"], res["link_text"]]
         end
       end
 
@@ -70,11 +70,11 @@ module SL
     def find_script(script)
       return File.expand_path(script) if File.exist?(File.expand_path(script))
 
-      base = File.expand_path('~/.config/searchlink/plugins')
+      base = File.expand_path("~/.config/searchlink/plugins")
       first = File.join(base, script)
       return first if File.exist?(first)
 
-      base = File.expand_path('~/.config/searchlink')
+      base = File.expand_path("~/.config/searchlink")
       second = File.join(base, script)
       return second if File.exist?(second)
 

data/lib/searchlink/search.rb

@@ -21,9 +21,9 @@ module SL
     #
     # @return [Array] [Url, link, text]
     #
-    def do_search(search_type, search_terms, link_text = '', search_count = 0)
+    def do_search(search_type, search_terms, link_text = "", search_count = 0)
       if (search_count % 5).zero?
-        SL.notify('Throttling for 5s')
+        SL.notify("Throttling for 5s")
         sleep 5
       end
 
@@ -37,13 +37,13 @@ module SL
       else
         case search_type
         when /^r$/ # simple replacement
-          if SL.config['validate_links'] && !SL::URL.valid_link?(search_terms)
+          if SL.config["validate_links"] && !SL::URL.valid_link?(search_terms)
             return [false, "Link not valid: #{search_terms}", link_text]
           end
 
           title = SL::URL.title(search_terms) || search_terms
 
-          link_text = title if link_text == ''
+          link_text = title if link_text == ""
           return [search_terms, title, link_text]
         else
           if search_terms
@@ -56,11 +56,11 @@ module SL
         end
       end
 
-      if link_text == ''
+      if link_text == ""
         link_text = SL.titleize ? title : search_terms
       end
 
-      if url && SL.config['validate_links'] && !SL::URL.valid_link?(url) && search_type !~ /^sp(ell)?/
+      if url && SL.config["validate_links"] && !SL::URL.valid_link?(url) && search_type !~ /^sp(ell)?/
         [false, "Not found: #{url}", link_text]
       elsif !url
         [false, "No results: #{url}", link_text]

data/lib/searchlink/searches/amazon.rb

@@ -6,22 +6,22 @@ module SL
     class << self
       def settings
         {
-          trigger: 'a',
+          trigger: "a",
           searches: [
-            ['a', 'Amazon Search']
+            ["a", "Amazon Search"]
           ]
         }
       end
 
       def search(_, search_terms, link_text)
         az_url, = SL.ddg("site:amazon.com #{search_terms}", link_text)
-        url, title = SL::URL.amazon_affiliatize(az_url, SL.config['amazon_partner'])
+        url, title = SL::URL.amazon_affiliatize(az_url, SL.config["amazon_partner"])
         title ||= search_terms
 
         [url, title, link_text]
       end
     end
 
-    SL::Searches.register 'amazon', :search, self
+    SL::Searches.register "amazon", :search, self
   end
 end

data/lib/searchlink/searches/applemusic.rb

@@ -8,35 +8,35 @@ module SL
     class << self
       def settings
         {
-          trigger: 'am(pod|art|alb|song)?e?',
+          trigger: "am(pod|art|alb|song)?e?",
           searches: [
-            ['am', 'Apple Music'],
-            ['ampod', 'Apple Music Podcast'],
-            ['amart', 'Apple Music Artist'],
-            ['amalb', 'Apple Music Album'],
-            ['amsong', 'Apple Music Song'],
-            ['amalbe', 'Apple Music Album Embed'],
-            ['amsong', 'Apple Music Song Embed']
+            ["am", "Apple Music"],
+            ["ampod", "Apple Music Podcast"],
+            ["amart", "Apple Music Artist"],
+            ["amalb", "Apple Music Album"],
+            ["amsong", "Apple Music Song"],
+            ["amalbe", "Apple Music Album Embed"],
+            ["amsong", "Apple Music Song Embed"]
           ]
         }
       end
 
       def search(search_type, search_terms, link_text)
-        stype = search_type.downcase.sub(/^am/, '')
+        stype = search_type.downcase.sub(/^am/, "")
         otype = :link
         if stype =~ /e$/
           otype = :embed
-          stype.sub!(/e$/, '')
+          stype.sub!(/e$/, "")
         end
         result = case stype
                  when /^pod$/
-                   applemusic(search_terms, 'podcast')
+                   applemusic(search_terms, "podcast")
                  when /^art$/
-                   applemusic(search_terms, 'music', 'musicArtist')
+                   applemusic(search_terms, "music", "musicArtist")
                  when /^alb$/
-                   applemusic(search_terms, 'music', 'album')
+                   applemusic(search_terms, "music", "album")
                  when /^song$/
-                   applemusic(search_terms, 'music', 'musicTrack')
+                   applemusic(search_terms, "music", "musicTrack")
                  else
                    applemusic(search_terms)
                  end
@@ -45,7 +45,7 @@ module SL
 
         # {:type=>,:id=>,:url=>,:title=>}
         if otype == :embed && result[:type] =~ /(album|song)/
-          url = 'embed'
+          url = "embed"
           if result[:type] =~ /song/
             link = %(https://embed.music.apple.com/#{SL.config['country_code'].downcase}/album/#{result[:album]}?i=#{result[:id]}&app=music#{SL.config['itunes_affiliate']})
             height = 150
@@ -60,7 +60,7 @@ module SL
             %(style="width:100%;max-width:660px;overflow:hidden;background:transparent;"),
             %(sandbox="allow-forms allow-popups allow-same-origin),
             %(allow-scripts allow-top-navigation-by-user-activation"></iframe>)
-          ].join(' ')
+          ].join(" ")
         else
           url = result[:url]
           title = result[:title]
@@ -73,8 +73,8 @@ module SL
       # media => music, podcast
       # entity => optional: artist, song, album, podcast
       # returns {:type=>,:id=>,:url=>,:title}
-      def applemusic(terms, media = 'music', entity = '')
-        url = "http://itunes.apple.com/search?term=#{terms.url_encode}&country=#{SL.config['country_code']}&media=#{media}&entity=#{entity}"
+      def applemusic(terms, media = "music", entity = "")
+        url = "https://itunes.apple.com/search?term=#{terms.url_encode}&country=#{SL.config['country_code']}&media=#{media}&entity=#{entity}"
         page = Curl::Json.new(url, compressed: true, symbolize_names: true)
         json = page.json
         return false unless json[:resultCount]&.positive?
@@ -88,29 +88,29 @@ module SL
 
       def process_result(result)
         output = {}
-        aff = SL.config['itunes_affiliate']
+        aff = SL.config["itunes_affiliate"]
 
         case result[:wrapperType]
-        when 'track'
-          if result[:kind] == 'podcast'
-            output[:type] = 'podcast'
+        when "track"
+          if result[:kind] == "podcast"
+            output[:type] = "podcast"
             output[:id] = result[:collectionId]
             output[:url] = result[:collectionViewUrl].to_am + aff
             output[:title] = result[:collectionName]
           else
-            output[:type] = 'song'
+            output[:type] = "song"
             output[:album] = result[:collectionId]
             output[:id] = result[:trackId]
             output[:url] = result[:trackViewUrl].to_am + aff
             output[:title] = "#{result[:trackName]} by #{result[:artistName]}"
           end
-        when 'collection'
-          output[:type] = 'album'
+        when "collection"
+          output[:type] = "album"
           output[:id] = result[:collectionId]
           output[:url] = result[:collectionViewUrl].to_am + aff
           output[:title] = "#{result[:collectionName]} by #{result[:artistName]}"
-        when 'artist'
-          output[:type] = 'artist'
+        when "artist"
+          output[:type] = "artist"
           output[:id] = result[:artistId]
           output[:url] = result[:artistLinkUrl].to_am + aff
           output[:title] = result[:artistName]
@@ -120,6 +120,6 @@ module SL
       end
     end
 
-    SL::Searches.register 'applemusic', :search, self
+    SL::Searches.register "applemusic", :search, self
   end
 end

data/lib/searchlink/searches/bitly.rb

@@ -6,10 +6,10 @@ module SL
     class << self
       def settings
         {
-          trigger: 'b(l|itly)',
+          trigger: "b(l|itly)",
           searches: [
-            ['bl', 'bit.ly Shorten'],
-            ['bitly', 'bit.ly shorten']
+            ["bl", "bit.ly Shorten"],
+            ["bitly", "bit.ly shorten"]
           ]
         }
       end
@@ -27,26 +27,26 @@ module SL
       end
 
       def bitly_shorten(url, title = nil)
-        unless SL.config.key?('bitly_access_token') && !SL.config['bitly_access_token'].empty?
-          SL.add_error('Bit.ly not configured', 'Missing access token')
+        unless SL.config.key?("bitly_access_token") && !SL.config["bitly_access_token"].empty?
+          SL.add_error("Bit.ly not configured", "Missing access token")
           return [false, title]
         end
 
-        domain = SL.config.key?('bitly_domain') ? SL.config['bitly_domain'] : 'bit.ly'
+        domain = SL.config.key?("bitly_domain") ? SL.config["bitly_domain"] : "bit.ly"
         long_url = url.dup
-        curl = TTY::Which.which('curl')
+        curl = TTY::Which.which("curl")
         cmd = [
           %(#{curl} -SsL -H 'Authorization: Bearer #{SL.config['bitly_access_token']}'),
           %(-H 'Content-Type: application/json'),
-          '-X POST', %(-d '{ "long_url": "#{url}", "domain": "#{domain}" }'), 'https://api-ssl.bitly.com/v4/shorten'
+          "-X POST", %(-d '{ "long_url": "#{url}", "domain": "#{domain}" }'), "https://api-ssl.bitly.com/v4/shorten"
         ]
-        data = JSON.parse(`#{cmd.join(' ')}`.strip)
-        link = data['link']
+        data = JSON.parse(`#{cmd.join(" ")}`.strip)
+        link = data["link"]
         title ||= SL::URL.title(long_url)
         [link, title]
       end
     end
 
-    SL::Searches.register 'bitly', :search, self
+    SL::Searches.register "bitly", :search, self
   end
 end

data/lib/searchlink/searches/definition.rb

@@ -10,10 +10,10 @@ module SL
       #
       def settings
         {
-          trigger: 'def(?:ine)?',
+          trigger: "def(?:ine)?",
           searches: [
-            ['def', 'Dictionary Definition'],
-            ['define', nil]
+            ["def", "Dictionary Definition"],
+            ["define", nil]
           ]
         }
       end
@@ -32,7 +32,7 @@ module SL
         fix = SL.spell(search_terms)
 
         if fix && search_terms.downcase != fix.downcase
-          SL.add_error('Spelling', "Spelling altered for '#{search_terms}' to '#{fix}'")
+          SL.add_error("Spelling", "Spelling altered for '#{search_terms}' to '#{fix}'")
           search_terms = fix
           link_text = fix
         end
@@ -49,12 +49,12 @@ module SL
       #
       def define(terms)
         def_url = "https://www.wordnik.com/words/#{terms.url_encode}"
-        curl = TTY::Which.which('curl')
+        curl = TTY::Which.which("curl")
         body = `#{curl} -sSL '#{def_url}'`
         if body =~ /id="define"/
           first_definition = body.match(%r{(?mi)(?:id="define"[\s\S]*?<li>)([\s\S]*?)</li>})[1]
           parts = first_definition.match(%r{<abbr title="partOfSpeech">(.*?)</abbr> (.*?)$})
-          return [def_url, "(#{parts[1]}) #{parts[2]}".gsub(%r{</?.*?>}, '').strip]
+          return [def_url, "(#{parts[1]}) #{parts[2]}".gsub(%r{</?.*?>}, "").strip]
         end
 
         false
@@ -64,6 +64,6 @@ module SL
     end
 
     # Registers the search with the SL::Searches module
-    SL::Searches.register 'definition', :search, self
+    SL::Searches.register "definition", :search, self
   end
 end

data/lib/searchlink/searches/duckduckgo.rb

@@ -12,12 +12,12 @@ module SL
       #
       def settings
         {
-          trigger: '(?:g|ddg|z|ddgimg)',
+          trigger: "(?:g|ddg|z|ddgimg)",
           searches: [
-            ['g', 'Google/DuckDuckGo Search'],
-            ['ddg', 'DuckDuckGo Search'],
-            ['z', 'DDG Zero Click Search'],
-            ['ddgimg', 'Return the first image from the destination page']
+            ["g", "Google/DuckDuckGo Search"],
+            ["ddg", "DuckDuckGo Search"],
+            ["z", "DDG Zero Click Search"],
+            ["ddgimg", "Return the first image from the destination page"]
           ]
         }
       end
@@ -41,13 +41,13 @@ module SL
         terms = "%5C#{search_terms.url_encode}"
         page = Curl::Html.new("https://duckduckgo.com/?q=#{terms}", compressed: true)
 
-        locs = page.meta['refresh'].match(%r{/l/\?uddg=(.*?)$})
+        locs = page.meta["refresh"].match(%r{/l/\?uddg=(.*?)$})
         locs = page.body.match(%r{/l/\?uddg=(.*?)'}) if locs.nil?
         locs = page.body.match(/url=(.*?)'/) if locs.nil?
 
         return false if locs.nil?
 
-        url = locs[1].url_decode.sub(/&rut=\w+/, '')
+        url = locs[1].url_decode.sub(/&rut=\w+/, "")
 
         result = url.strip.url_decode || false
         return false unless result
@@ -57,10 +57,10 @@ module SL
         # output_url = CGI.unescape(result)
         output_url = result
 
-        output_title = if SL.config['include_titles'] || SL.titleize
-                         SL::URL.title(output_url) || ''
+        output_title = if SL.config["include_titles"] || SL.titleize
+                         SL::URL.title(output_url) || ""
                        else
-                         ''
+                         ""
                        end
 
         output_url = SL.first_image(output_url) if search_type =~ /img$/
@@ -83,11 +83,15 @@ module SL
       #
       def zero_click(search_terms, link_text, disambiguate: false)
         search_terms.gsub!(/%22/, '"')
-        d = disambiguate ? '0' : '1'
-        url = "http://api.duckduckgo.com/?q=#{search_terms.url_encode}&format=json&no_redirect=1&no_html=1&skip_disambig=#{d}"
-        result = Curl::Json.new(url, symbolize_names: true).json
-        return SL.ddg(terms, link_text) unless result
-
+        d = disambiguate ? "0" : "1"
+        url = "https://api.duckduckgo.com/?q=#{search_terms.url_encode}&format=json&no_redirect=1&no_html=1&skip_disambig=#{d}"
+        begin
+          result = Curl::Json.new(url, symbolize_names: true).json
+          return SL.ddg(terms, link_text) unless result
+        rescue StandardError => e
+          SL.add_error("Invalid response", "Search for #{terms}: (#{e})")
+          return false
+        end
         wiki_link = result[:AbstractURL] || result[:Redirect]
         title = result[:Heading] || false
 
@@ -107,7 +111,7 @@ module SL
     # @param      type   [Symbol] the type of search to
     #                    perform
     # @param      klass  [Class] the class to register
-    SL::Searches.register 'duckduckgo', :search, self
+    SL::Searches.register "duckduckgo", :search, self
   end
 end
 
@@ -121,13 +125,13 @@ module SL
     # @param      link_text     [String] The link text
     # @param      timeout       [Integer] The timeout
     #
-    def google(search_terms, link_text = nil, timeout: SL.config['timeout'], image: false)
+    def google(search_terms, link_text = nil, timeout: SL.config["timeout"], image: false)
       if SL::GoogleSearch.api_key?
-        s_class = 'google'
-        s_type = image ? 'img' : 'gg'
+        s_class = "google"
+        s_type = image ? "img" : "gg"
       else
-        s_class = 'duckduckgo'
-        s_type = image ? 'ddgimg' : 'g'
+        s_class = "duckduckgo"
+        s_type = image ? "ddgimg" : "g"
       end
       search = proc { SL::Searches.plugins[:search][s_class][:class].search(s_type, search_terms, link_text) }
       SL::Util.search_with_timeout(search, timeout)
@@ -144,13 +148,13 @@ module SL
     # @param      image         [Boolean] Image search
     # @return     [SL::Searches::Result] The search result
     #
-    def ddg(search_terms, link_text = nil, timeout: SL.config['timeout'], google: true, image: false)
+    def ddg(search_terms, link_text = nil, timeout: SL.config["timeout"], google: true, image: false)
       if google && SL::GoogleSearch.api_key?
-        s_class = 'google'
-        s_type = image ? 'img' : 'gg'
+        s_class = "google"
+        s_type = image ? "img" : "gg"
       else
-        s_class = 'duckduckgo'
-        s_type = image ? 'ddgimg' : 'g'
+        s_class = "duckduckgo"
+        s_type = image ? "ddgimg" : "g"
       end
 
       search = proc { SL::Searches.plugins[:search][s_class][:class].search(s_type, search_terms, link_text) }
@@ -170,7 +174,7 @@ 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" }.first[:src]
     end
   end
 end