searchlink 2.3.74 → 2.3.76

data/lib/searchlink/searches/helpers/safari.rb

@@ -9,9 +9,9 @@ module SL
       #
       def search_safari_history(term)
         # Safari
-        src = File.expand_path('~/Library/Safari/History.db')
+        src = File.expand_path("~/Library/Safari/History.db")
         if File.exist?(src)
-          SL.notify('Searching Safari History', term)
+          SL.notify("Searching Safari History", term)
 
           exact_match = false
           match_phrases = []
@@ -19,10 +19,10 @@ module SL
           # If search terms start with ''term, only search for exact string matches
           if term =~ /^ *'/
             exact_match = true
-            term.gsub!(/(^ *'+|'+ *$)/, '')
+            term.gsub!(/(^ *'+|'+ *$)/, "")
           elsif term =~ /%22(.*?)%22/
             match_phrases = term.scan(/%22(\S.*?\S)%22/)
-            term.gsub!(/%22(\S.*?\S)%22/, '')
+            term.gsub!(/%22(\S.*?\S)%22/, "")
           end
 
           terms = []
@@ -41,7 +41,7 @@ module SL
             end)
           end
 
-          query = terms.join(' AND ')
+          query = terms.join(" AND ")
 
           cmd = %(sqlite3 -json '#{src}' "select title, url,
           datetime(visit_time/1000000, 'unixepoch', 'localtime') as datum
@@ -53,8 +53,8 @@ module SL
           return false if most_recent.strip.empty?
 
           bm = JSON.parse(most_recent)[0]
-          date = Time.parse(bm['datum'])
-          [bm['url'], bm['title'], date]
+          date = Time.parse(bm["datum"])
+          [bm["url"], bm["title"], date]
         else
           false
         end
@@ -114,19 +114,19 @@ module SL
         if parent.is_a?(Array)
           parent.each do |c|
             if c.is_a?(Hash)
-              if c.key?('Children')
-                results.concat(get_safari_bookmarks(c['Children'], terms))
-              elsif c.key?('URIDictionary')
-                title = c['URIDictionary']['title']
-                url = c['URLString']
+              if c.key?("Children")
+                results.concat(get_safari_bookmarks(c["Children"], terms))
+              elsif c.key?("URIDictionary")
+                title = c["URIDictionary"]["title"]
+                url = c["URLString"]
                 scored = score_bookmark({ url: url, title: title }, terms)
 
                 results.push(scored) if scored[:score] > 7
               end
             end
           end
-        elsif parent&.key?('Children')
-          results.concat(get_safari_bookmarks(parent['Children'], terms))
+        elsif parent&.key?("Children")
+          results.concat(get_safari_bookmarks(parent["Children"], terms))
         end
 
         results.sort_by { |h| [h[:score], h[:title].length * -1] }.reverse

data/lib/searchlink/searches/history.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 # import
-require_relative 'helpers/chromium'
+require_relative "helpers/chromium"
 
 # import
-require_relative 'helpers/firefox'
+require_relative "helpers/firefox"
 
 # import
-require_relative 'helpers/safari'
+require_relative "helpers/safari"
 
 module SL
   # Browser history/bookmark search
@@ -15,33 +15,33 @@ module SL
     class << self
       def settings
         {
-          trigger: 'h(([scfabe])([hb])?)*',
+          trigger: "h(([scfabe])([hb])?)*",
           searches: [
-            ['h', 'Browser History/Bookmark Search'],
-            ['hsh', 'Safari History Search'],
-            ['hsb', 'Safari Bookmark Search'],
-            ['hshb', nil],
-            ['hsbh', nil],
-            ['hch', 'Chrome History Search'],
-            ['hcb', 'Chrome Bookmark Search'],
-            ['hchb', nil],
-            ['hcbh', nil],
-            ['hfh', 'Firefox History Search'],
-            ['hfb', 'Firefox Bookmark Search'],
-            ['hfhb', nil],
-            ['hfbh', nil],
-            ['hah', 'Arc History Search'],
-            ['hab', 'Arc Bookmark Search'],
-            ['hahb', nil],
-            ['habh', nil],
-            ['hbh', 'Brave History Search'],
-            ['hbb', 'Brave Bookmark Search'],
-            ['hbhb', nil],
-            ['hbbh', nil],
-            ['heh', 'Edge History Search'],
-            ['heb', 'Edge Bookmark Search'],
-            ['hehb', nil],
-            ['hebh', nil]
+            ["h", "Browser History/Bookmark Search"],
+            ["hsh", "Safari History Search"],
+            ["hsb", "Safari Bookmark Search"],
+            ["hshb", nil],
+            ["hsbh", nil],
+            ["hch", "Chrome History Search"],
+            ["hcb", "Chrome Bookmark Search"],
+            ["hchb", nil],
+            ["hcbh", nil],
+            ["hfh", "Firefox History Search"],
+            ["hfb", "Firefox Bookmark Search"],
+            ["hfhb", nil],
+            ["hfbh", nil],
+            ["hah", "Arc History Search"],
+            ["hab", "Arc Bookmark Search"],
+            ["hahb", nil],
+            ["habh", nil],
+            ["hbh", "Brave History Search"],
+            ["hbb", "Brave Bookmark Search"],
+            ["hbhb", nil],
+            ["hbbh", nil],
+            ["heh", "Edge History Search"],
+            ["heb", "Edge Bookmark Search"],
+            ["hehb", nil],
+            ["hebh", nil]
           ]
         }
       end
@@ -54,92 +54,92 @@ module SL
           if str =~ /^s([hb]*)/
             t = Regexp.last_match(1)
             if t.length > 1 || t.empty?
-              types.push('safari_history')
-              types.push('safari_bookmarks')
-            elsif t == 'h'
-              types.push('safari_history')
-            elsif t == 'b'
-              types.push('safari_bookmarks')
+              types.push("safari_history")
+              types.push("safari_bookmarks")
+            elsif t == "h"
+              types.push("safari_history")
+            elsif t == "b"
+              types.push("safari_bookmarks")
             end
-            str.sub!(/^s([hb]*)/, '')
+            str.sub!(/^s([hb]*)/, "")
           end
 
           if str =~ /^c([hb]*)/
             t = Regexp.last_match(1)
             if t.length > 1 || t.empty?
-              types.push('chrome_bookmarks')
-              types.push('chrome_history')
-            elsif t == 'h'
-              types.push('chrome_history')
-            elsif t == 'b'
-              types.push('chrome_bookmarks')
+              types.push("chrome_bookmarks")
+              types.push("chrome_history")
+            elsif t == "h"
+              types.push("chrome_history")
+            elsif t == "b"
+              types.push("chrome_bookmarks")
             end
-            str.sub!(/^c([hb]*)/, '')
+            str.sub!(/^c([hb]*)/, "")
           end
 
           if str =~ /^f([hb]*)$/
             t = Regexp.last_match(1)
             if t.length > 1 || t.empty?
-              types.push('firefox_bookmarks')
-              types.push('firefox_history')
-            elsif t == 'h'
-              types.push('firefox_history')
-            elsif t == 'b'
-              types.push('firefox_bookmarks')
+              types.push("firefox_bookmarks")
+              types.push("firefox_history")
+            elsif t == "h"
+              types.push("firefox_history")
+            elsif t == "b"
+              types.push("firefox_bookmarks")
             end
-            str.sub!(/^f([hb]*)/, '')
+            str.sub!(/^f([hb]*)/, "")
           end
 
           if str =~ /^e([hb]*)$/
             t = Regexp.last_match(1)
             if t.length > 1 || t.empty?
-              types.push('edge_bookmarks')
-              types.push('edge_history')
-            elsif t == 'h'
-              types.push('edge_history')
-            elsif t == 'b'
-              types.push('edge_bookmarks')
+              types.push("edge_bookmarks")
+              types.push("edge_history")
+            elsif t == "h"
+              types.push("edge_history")
+            elsif t == "b"
+              types.push("edge_bookmarks")
             end
-            str.sub!(/^e([hb]*)/, '')
+            str.sub!(/^e([hb]*)/, "")
           end
 
           if str =~ /^b([hb]*)$/
             t = Regexp.last_match(1)
             if t.length > 1 || t.empty?
-              types.push('brave_bookmarks')
-              types.push('brave_history')
-            elsif t == 'h'
-              types.push('brave_history')
-            elsif t == 'b'
-              types.push('brave_bookmarks')
+              types.push("brave_bookmarks")
+              types.push("brave_history")
+            elsif t == "h"
+              types.push("brave_history")
+            elsif t == "b"
+              types.push("brave_bookmarks")
             end
-            str.sub!(/^b([hb]*)/, '')
+            str.sub!(/^b([hb]*)/, "")
           end
 
           next unless str =~ /^a([hb]*)$/
 
           t = Regexp.last_match(1)
           if t.length > 1 || t.empty?
-            types.push('arc_bookmarks')
-            types.push('arc_history')
-          elsif t == 'h'
-            types.push('arc_history')
-          elsif t == 'b'
-            types.push('arc_bookmarks')
+            types.push("arc_bookmarks")
+            types.push("arc_history")
+          elsif t == "h"
+            types.push("arc_history")
+          elsif t == "b"
+            types.push("arc_bookmarks")
           end
-          str.sub!(/^a([hb]*)/, '')
+          str.sub!(/^a([hb]*)/, "")
         end
 
         url, title = search_history(search_terms, types)
-        link_text = title if link_text == '' || link_text == search_terms
+        link_text = title if link_text == "" || link_text == search_terms
         [url, title, link_text]
       end
 
       def search_history(term, types = [])
         if types.empty?
-          return false unless SL.config['history_types']
+          return false unless SL.config["history_types"]
 
-          types = SL.config['history_types']
+          types = SL.config["history_types"]
         end
 
         results = []
@@ -148,14 +148,14 @@ module SL
           types.each do |type|
             url, title, date = send("search_#{type}", term)
 
-            results << { 'url' => url, 'title' => title, 'date' => date } if url
+            results << { "url" => url, "title" => title, "date" => date } if url
           end
 
           if results.empty?
             false
           else
-            out = results.sort_by! { |r| r['date'] }.last
-            [out['url'], out['title']]
+            out = results.sort_by! { |r| r["date"] }.last
+            [out["url"], out["title"]]
           end
         else
           false
@@ -163,6 +163,6 @@ module SL
       end
     end
 
-    SL::Searches.register 'history', :search, self
+    SL::Searches.register "history", :search, self
   end
 end

data/lib/searchlink/searches/hook.rb

@@ -26,9 +26,9 @@ module SL
     class << self
       def settings
         {
-          trigger: 'hook',
+          trigger: "hook",
           searches: [
-            ['hook', 'Hookmark Bookmark Search']
+            ["hook", "Hookmark Bookmark Search"]
           ]
         }
       end
@@ -63,8 +63,8 @@ module SL
       # Search bookmark paths and addresses. Return array of bookmark hashes.
       def search_hook(search)
         types = %w[name path address]
-        query = search.strip.split(' ').map { |s| types.map { |t| %(#{t} contains "#{s}") }.join(' or ') }
-        query = query.map { |q| "(#{q})" }.join(' and ')
+        query = search.strip.split(" ").map { |s| types.map { |t| %(#{t} contains "#{s}") }.join(" or ") }
+        query = query.map { |q| "(#{q})" }.join(" and ")
         path_matches = run_query(query)
 
         top_match = path_matches.uniq.first
@@ -74,6 +74,6 @@ module SL
       end
     end
 
-    SL::Searches.register 'hook', :search, self
+    SL::Searches.register "hook", :search, self
   end
 end

data/lib/searchlink/searches/itunes.rb

@@ -7,16 +7,16 @@ module SL
     class << self
       def settings
         {
-          trigger: '(i(pod|art|alb|song|tud?)|masd?)',
+          trigger: "(i(pod|art|alb|song|tud?)|masd?)",
           searches: [
-            ['ipod', 'iTunes podcast'],
-            ['iart', 'iTunes artist'],
-            ['ialb', 'iTunes album'],
-            ['isong', 'iTunes song'],
-            ['itu', 'iOS App Store Search'],
-            ['itud', 'iOS App Store Developer Link'],
-            ['mas', 'Mac App Store Search'],
-            ['masd', 'Mac App Store Developer Link']
+            ["ipod", "iTunes podcast"],
+            ["iart", "iTunes artist"],
+            ["ialb", "iTunes album"],
+            ["isong", "iTunes song"],
+            ["itu", "iOS App Store Search"],
+            ["itud", "iOS App Store Developer Link"],
+            ["mas", "Mac App Store Search"],
+            ["masd", "Mac App Store Developer Link"]
           ]
         }
       end
@@ -24,67 +24,67 @@ module SL
       def search(search_type, search_terms, link_text)
         case search_type
         when /^ialb$/ # iTunes Album Search
-          url, title = search_itunes('album', search_terms, false)
+          url, title = search_itunes("album", search_terms, false)
         when /^iart$/ # iTunes Artist Search
-          url, title = search_itunes('musicArtist', search_terms, false)
+          url, title = search_itunes("musicArtist", search_terms, false)
         when /^imov?$/ # iTunes movie search
           dev = false
-          url, title = search_itunes('movie', search_terms, dev, SL.config['itunes_affiliate'])
+          url, title = search_itunes("movie", search_terms, dev, SL.config["itunes_affiliate"])
         when /^ipod$/
-          url, title = search_itunes('podcast', search_terms, false)
+          url, title = search_itunes("podcast", search_terms, false)
         when /^isong$/ # iTunes Song Search
-          url, title = search_itunes('song', search_terms, false)
+          url, title = search_itunes("song", search_terms, false)
         when /^itud?$/ # iTunes app search
           dev = search_type =~ /d$/
-          url, title = search_itunes('iPadSoftware', search_terms, dev, SL.config['itunes_affiliate'])
+          url, title = search_itunes("iPadSoftware", search_terms, dev, SL.config["itunes_affiliate"])
         when /^masd?$/ # Mac App Store search (mas = itunes link, masd = developer link)
           dev = search_type =~ /d$/
-          url, title = search_itunes('macSoftware', search_terms, dev, SL.config['itunes_affiliate'])
+          url, title = search_itunes("macSoftware", search_terms, dev, SL.config["itunes_affiliate"])
         end
 
         [url, title, link_text]
       end
 
       def search_itunes(entity, terms, dev, aff = nil)
-        aff ||= SL.config['itunes_affiliate']
-
-        url = "http://itunes.apple.com/search?term=#{terms.url_encode}&country=#{SL.config['country_code']}&entity=#{entity}&limit=1"
+        aff ||= SL.config["itunes_affiliate"]
 
+        url = "https://itunes.apple.com/search?term=#{terms.url_encode}&country=#{SL.config['country_code']}&entity=#{entity}&limit=1"
+        puts url
         begin
           page = Curl::Json.new(url, compressed: true)
           json = page.json
         rescue StandardError => e
-          SL.add_error('Invalid response', "Search for #{terms}: (#{e})")
+          SL.add_error("Invalid response", "Search for #{terms}: (#{e})")
           return false
         end
         return false unless json
 
-        return false unless json['resultCount']&.positive?
+        return false unless json["resultCount"]&.positive?
 
-        result = json['results'][0]
+        result = json["results"][0]
         case entity
         when /movie/
           # dev parameter probably not necessary in this case
-          output_url = result['trackViewUrl']
-          output_title = result['trackName']
+          output_url = result["trackViewUrl"]
+          output_title = result["trackName"]
         when /(mac|iPad)Software/
-          output_url = dev && result['sellerUrl'] ? result['sellerUrl'] : result['trackViewUrl']
-          output_title = result['trackName']
+          output_url = dev && result["sellerUrl"] ? result["sellerUrl"] : result["trackViewUrl"]
+          output_title = result["trackName"]
         when /(musicArtist|song|album)/
-          case result['wrapperType']
-          when 'track'
-            output_url = result['trackViewUrl']
+          case result["wrapperType"]
+          when "track"
+            output_url = result["trackViewUrl"]
             output_title = "#{result['trackName']} by #{result['artistName']}"
-          when 'collection'
-            output_url = result['collectionViewUrl']
+          when "collection"
+            output_url = result["collectionViewUrl"]
             output_title = "#{result['collectionName']} by #{result['artistName']}"
-          when 'artist'
-            output_url = result['artistLinkUrl']
-            output_title = result['artistName']
+          when "artist"
+            output_url = result["artistLinkUrl"]
+            output_title = result["artistName"]
           end
         when /podcast/
-          output_url = result['collectionViewUrl']
-          output_title = result['collectionName']
+          output_url = result["collectionViewUrl"]
+          output_title = result["collectionName"]
         end
         return false unless output_url && output_title
 
@@ -94,6 +94,6 @@ module SL
       end
     end
 
-    SL::Searches.register 'itunes', :search, self
+    SL::Searches.register "itunes", :search, self
   end
 end

data/lib/searchlink/searches/lastfm.rb

@@ -5,31 +5,31 @@ module SL
     class << self
       def settings
         {
-          trigger: 'l(art|song)',
+          trigger: "l(art|song)",
           searches: [
-            ['lart', 'Last.fm Artist Search'],
-            ['lsong', 'Last.fm Song Search']
+            ["lart", "Last.fm Artist Search"],
+            ["lsong", "Last.fm Song Search"]
           ]
         }
       end
 
       def search(search_type, search_terms, link_text)
-        type = search_type =~ /art$/ ? 'artist' : 'track'
+        type = search_type =~ /art$/ ? "artist" : "track"
 
         url = "http://ws.audioscrobbler.com/2.0/?method=#{type}.search&#{type}=#{search_terms.url_encode}&api_key=2f3407ec29601f97ca8a18ff580477de&format=json"
         json = Curl::Json.new(url).json
-        return false unless json['results']
+        return false unless json["results"]
 
         begin
           case type
-          when 'track'
-            result = json['results']['trackmatches']['track'][0]
-            url = result['url']
+          when "track"
+            result = json["results"]["trackmatches"]["track"][0]
+            url = result["url"]
             title = "#{result['name']} by #{result['artist']}"
-          when 'artist'
-            result = json['results']['artistmatches']['artist'][0]
-            url = result['url']
-            title = result['name']
+          when "artist"
+            result = json["results"]["artistmatches"]["artist"][0]
+            url = result["url"]
+            title = result["name"]
           end
           [url, title, link_text]
         rescue StandardError
@@ -38,6 +38,6 @@ module SL
       end
     end
 
-    SL::Searches.register 'lastfm', :search, self
+    SL::Searches.register "lastfm", :search, self
   end
 end

data/lib/searchlink/searches/linkding.rb

@@ -9,8 +9,8 @@ module SL
         {
           trigger: "(ld|ding)",
           searches: [
-            [["ld", "ding"], "Linkding Bookmark Search"],
-          ],
+            [%w[ld ding], "Linkding Bookmark Search"]
+          ]
         }
       end
 
@@ -21,9 +21,9 @@ module SL
         bookmarks = bookmarks.force_encoding("utf-8")
         bookmarks.gsub!(/[^[:ascii:]]/) do |non_ascii|
           non_ascii.force_encoding("utf-8")
-            .encode("utf-16be")
-            .unpack("H*")[0]
-            .gsub(/(....)/, '\u\1')
+                   .encode("utf-16be")
+                   .unpack1("H*")
+                   .gsub(/(....)/, '\u\1')
         end
 
         bookmarks.gsub!(/[\u{1F600}-\u{1F6FF}]/, "")
@@ -177,14 +177,14 @@ module SL
           full_text = [bm["title"], bm["description"], bm["tag_names"].join(" ")].join(" ")
 
           score = if title_tags.matches_exact(search_terms)
-              14.0
-            elsif full_text.matches_exact(search_terms)
-              13.0
-            elsif full_text.matches_any(search_terms)
-              full_text.matches_score(search_terms)
-            else
-              0
-            end
+                    14.0
+                  elsif full_text.matches_exact(search_terms)
+                    13.0
+                  elsif full_text.matches_any(search_terms)
+                    full_text.matches_score(search_terms)
+                  else
+                    0
+                  end
 
           return [bm["url"], bm["title"]] if score == 14
 
@@ -194,7 +194,7 @@ module SL
                          score: score,
                          href: bm["url"],
                          title: bm["title"],
-                         date: bm["date_added"],
+                         date: bm["date_added"]
                        })
         end