searchlink 2.3.85 → 2.3.86

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02b111da9ce13f8646d7357ae5560a1c6b84bb45fd506dca8fafe96e1c844bea
-  data.tar.gz: 02fd69545df789fdf1105dea4971b53f02bfc33ac0da20a3f25454c11f9a9ae7
+  metadata.gz: c00e022d8b8155db4e6fd3acd6ccaa69be955a316774be41747cce0e476f0df6
+  data.tar.gz: 8487fcec9ab7d7830c467e5bfa2ed4008104a2363cb776b18864848891a7d98b
 SHA512:
-  metadata.gz: 7af24cad60ca01ead8ab4a76f82c6d6fa9be6aa30752f088c23cfe387d9a3adf8f076e5e4d1f1dc25d9eeda8879d1ae7e83bbee3bcea250de6914dc67d35cf0c
-  data.tar.gz: '089fb329c4c7be4cf30bf929b8c4309374a0b8055f42eb2adeb2c62d29f7a9ef84d9e45527a5c0a13c7e0061345ee814cfd431bc6f33614ad034f8d8c970250a'
+  metadata.gz: 66ee6b30d332f4047f4f1528a8f39b6eb51cbb0b6ef0f3abd5b546ea3dd4433ec212c4b72c9d46a680c65e69078afc617caf8d5d7da757181281bb5c16518ad8
+  data.tar.gz: 7b29d19cdddbc9c6ecbe07ecaf7cc23e685da82fd03fe16645a4775ee0aa15ca96bc859da6bc38725fdd074642fa986a396bd745e4af87379bfbfd17f60e83b2

data/lib/searchlink/config.rb

@@ -82,6 +82,11 @@ module SL
           # E.g. [](!g Search Text)
           empty_uses_page_title: false
 
+          # If confirm is true, then a popup dialog will be displayed
+          # showing the destination of each found link. Hitting cancel
+          # will leave the link unchanged.
+          confirm: false
+
           # To create custom abbreviations for Google Site Searches,
           # add to (or replace) the hash below.
           # "abbreviation" => "site.url",
@@ -168,6 +173,9 @@ module SL
       #    amazon_partner: "bretttercom-20"
       config["amazon_partner"] ||= ""
 
+      # display a popup dialog confirmation
+      config["confirm"] ||= false
+
       # To create custom abbreviations for Google Site Searches,
       # add to (or replace) the hash below.
       # "abbreviation" => "site.url",
@@ -176,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
 
@@ -253,14 +253,22 @@ module Curl
           attrs = tag["attrs"].strip.to_enum(:scan, /(?ix)
                                              (?<key>[@a-z0-9-]+)(?:=(?<quot>["'])
                                              (?<value>[^"']+)\k<quot>|[ >])?/i).map { Regexp.last_match }
-          attrs.map! { |a| { key: a["key"], value: a["key"] =~ /^(class|rel)$/ ? a["value"].split(/ /) : a["value"] } }
+
+          attrs.map! do |a|
+            val = if a["key"] =~ /^(class|rel)$/
+                a["value"].nil? ? "" : a["value"].split(/ /)
+              else
+                a["value"]
+              end
+            { key: a["key"], value: val }
+          end
         end
         {
           tag: tag["tag"],
           source: tag.to_s,
           attrs: attrs,
           content: tag["content"],
-          tags: content_tags(tag["content"])
+          tags: content_tags(tag["content"]),
         }
       end
     end
@@ -351,7 +359,7 @@ module Curl
           title: title,
           rel: rel,
           text: text,
-          class: link_class
+          class: link_class,
         }
         links << link
       end

data/lib/searchlink/output.rb

@@ -115,16 +115,7 @@ module SL
 
       url.add_query_string!
 
-      url = case SL.shortener
-            when :isgd
-              SL::IsgdSearch.shorten(url)
-            when :tinyurl
-              SL::TinyurlSearch.shorten(url)
-            when :bitly
-              SL::BitlySearch.shorten(url)
-            else
-              url
-            end
+      url = SL::Shortener.shorten(url, SL.shortener)
 
       case type.to_sym
       when :ref_title
@@ -257,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?
@@ -268,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

@@ -2,6 +2,14 @@
 
 module SL
   class SearchLink
+    # Confirm a URL with a popup if requested
+    def confirmed?(url)
+      return true unless SL.config["confirm"]
+
+      SL::Shortener.confirm?(url)
+    end
+
+    # Parse the input string and perform searches
     def parse(input)
       SL.output = []
       return false if input.empty?
@@ -283,6 +291,13 @@ module SL
                 end
 
                 if @url
+                  res = confirmed?(@url)
+                  if !res
+                    return match
+                  else
+                    @url = res if res.is_a?(String) && SL::URL.url?(res)
+                  end
+
                   title = SL::URL.title(@url) if SL.titleize && title == ""
 
                   @link_text = title if @link_text == "" && title
@@ -473,16 +488,28 @@ module SL
         end
 
         if @url
-          if type =~ /sp(ell)?/
-            SL.add_output(@url)
-          elsif link_only
-            SL.add_output(@url)
-          elsif @url == "embed"
-            SL.add_output(title)
-          else
-            type = reference_link ? :ref_title : :inline
+          res = confirmed?(@url)
+          if res
+            if res.is_a?(String) && SL::URL.url?(res)
+              @url = res
+              title = SL::URL.title(@url) unless title == ""
+            end
+
+            if type =~ /sp(ell)?/
+              SL.add_output(@url)
+            elsif link_only
+              SL.add_output(@url)
+            elsif @url == "embed"
+              SL.add_output(title)
+            else
+              type = reference_link ? :ref_title : :inline
 
-            SL.add_output SL.make_link(type, @link_text, @url, title: title, force_title: false)
+              SL.add_output SL.make_link(type, @link_text, @url, title: title, force_title: false)
+              SL.print_errors
+            end
+          else
+            SL.add_error("Canceled", "User canceled result #{@url}")
+            SL.add_output SL.originput.chomp
             SL.print_errors
           end
         else
@@ -555,7 +582,7 @@ module SL
 
       input.parse_flags! unless skip_flags
 
-      options = %w[debug country_code inline prefix_random include_titles remove_seo validate_links complete_bare]
+      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

data/lib/searchlink/searches/popup.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+module SL
+  class PopupSearch
+    class << self
+      def settings
+        {
+          trigger: "pop(up)?[gaw]?",
+          searches: [
+            ["pop", "Popup DuckDuckGo Search"],
+            ["popa", "Popup Amazon Search"],
+            ["popg", "Popup Google Search"],
+            ["popw", "Popup Wikipedia Search"]
+          ],
+        }
+      end
+
+      def search(type, search_terms, link_text)
+        return [false, false, link_text] unless workflow_exist?
+
+        term = search_terms.url_encode
+        url = case type
+          when /g$/
+            "https://www.google.com/search?hl=en&q=#{term}"
+          when /a$/
+            "https://www.amazon.com/s?k=#{term}"
+          when /b$/
+            "https://www.bing.com/search?q=#{term}"
+          when /w$/
+            "https://en.wikipedia.org/w/index.php?search=#{term}&title=Special%3ASearch&ns0=1"
+          else
+            "https://duckduckgo.com/?q=#{term}&ia=web"
+          end
+
+        path = File.expand_path("~/Library/Services/Preview URL.workflow")
+        res = `automator -i "#{url}" "#{path}"`.strip
+
+        begin
+          if res.empty?
+            SL.add_error("Canceled", "Popup Search Cancelled")
+            return [false, false, link_text]
+          end
+
+          title = SL::URL.title(res)
+
+          link_text = title if link_text == "" && !SL.titleize
+
+          [res, title, link_text]
+        rescue StandardError
+          false
+        end
+      end
+
+      private
+
+      def workflow_exist?
+        unless File.exist?(File.expand_path("~/Library/Services/Preview URL.workflow"))
+          SL.add_error("Missing Service", "Preview URL Service not installed")
+          return false
+        end
+
+        true
+      end
+    end
+
+    SL::Searches.register "popup", :search, self
+  end
+end

data/lib/searchlink/searches/shortener.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+# import
+require_relative "shorteners/bitly"
+
+# import
+require_relative "shorteners/isgd"
+
+# import
+require_relative "shorteners/tinyurl"
+
+module SL
+  class Shortener
+    class << self
+      # Displays an AppleScript dialog to confirm shortening a URL.
+      #
+      # @param url [String] The URL to confirm shortening for.
+      # @return [Boolean] True if the user confirms, false otherwise.
+      #
+      def confirm?(url, title: "Confirm URL?")
+        if File.exist?(File.expand_path("~/Library/Services/Preview URL.workflow"))
+          cmd = %(osascript -e "display dialog \\"#{url}\\" with title \\"#{title}\\" buttons {\\"Cancel\\", \\"Confirm\\", \\"Preview\\"}")
+
+          res = `#{cmd}`.strip
+
+          if res =~ /Preview/
+            path = File.expand_path("~/Library/Services/Preview URL.workflow")
+            res = `automator -i "#{url}" "#{path}"`.strip
+
+            return res.empty? ? false : res
+          else
+            return res =~ /Confirm/
+          end
+        end
+
+        res = system(%(osascript -e "display dialog \"#{url}\" with title \"#{title}\" buttons {\"Cancel\", \"Confirm\"}"))
+
+        res == 0
+      end
+
+      # Shortens a URL using the specified shortener.
+      #
+      # @param url [String] The URL to shorten.
+      # @param shortener [Symbol] The shortener to use (:tinyurl, :bitly, :isgd).
+      # @return [String] The shortened URL.
+      # @raise [ArgumentError] If the shortener is unknown.
+      #
+      # @example
+      #   SL::Shortener.shorten('http://example.com', :tinyurl)
+      #
+      def shorten(url, shortener)
+        # Check if the URL is already shortened
+        return url unless SL::URL.url?(url)
+
+        known_shorteners = %i[tinyurl bitly isgd]
+        return url unless known_shorteners.include?(shortener)
+
+        # Confirm shortening the URL
+        res = SL::Shortener.confirm?(url)
+
+        return url unless res
+
+        url = res if res.is_a?(String)
+
+        return url unless SL::URL.url?(url)
+
+        # Use the shortener to shorten the URL
+        case shortener
+        when :tinyurl
+          SL::TinyurlSearch.shorten(url)
+        when :bitly
+          SL::BitlySearch.shorten(url)
+        when :isgd
+          SL::IsgdSearch.shorten(url)
+        else
+          raise ArgumentError, "Unknown shortener"
+        end
+      end
+    end
+  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..].join(',')})" : s[0]}
+          <code>!#{s[0].is_a?(Array) ? "#{s[0][0]} (#{s[0][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..].join(',')})"
-                     else
-                       s[0]
-                     end
+              "#{s[0][0]} (#{s[0][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
@@ -106,7 +106,7 @@ module SL
 
       def valid_search?(term)
         valid = false
-        valid = true if term =~ /^(#{valid_searches.join('|')})$/
+        valid = true if term =~ /^(#{valid_searches.join("|")})$/
         valid = true if SL.config["custom_site_searches"].keys.include? term
         # SL.notify("Invalid search#{did_you_mean(term)}", term) unless valid
         valid
@@ -124,7 +124,7 @@ module SL
           trigger: settings.fetch(:trigger, title).normalize_trigger,
           searches: settings[:searches],
           config: settings[:config],
-          class: klass
+          class: klass,
         }
       end
 
@@ -155,11 +155,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)
@@ -169,10 +169,12 @@ module SL
       def do_search(search_type, search_terms, link_text, timeout: SL.config["timeout"])
         plugins[:search].each_value do |plugin|
           trigger = plugin[:trigger].gsub(/(^\^|\$$)/, "")
-          if search_type =~ /^#{trigger}$/
-            search = proc { plugin[:class].search(search_type, search_terms, link_text) }
-            return SL::Util.search_with_timeout(search, timeout)
-          end
+          next unless search_type =~ /^#{trigger}$/
+
+          search = proc { plugin[:class].search(search_type, search_terms, link_text) }
+          SL.config["skip_timeout"] = true if trigger =~ /^pop/
+
+          return SL::Util.search_with_timeout(search, timeout)
         end
       end
     end
@@ -188,8 +190,8 @@ require_relative "searches/itunes"
 # import
 require_relative "searches/amazon"
 
-# import
-require_relative "searches/bitly"
+#import
+require_relative "searches/shortener"
 
 # import
 require_relative "searches/definition"
@@ -209,15 +211,15 @@ require_relative "searches/history"
 # import
 require_relative "searches/hook"
 
-# import
-require_relative "searches/isgd"
-
 # import
 require_relative "searches/lastfm"
 
 # import
 require_relative "searches/pinboard"
 
+# import
+require_relative "searches/popup"
+
 # import
 require_relative "searches/setapp"
 
@@ -248,8 +250,5 @@ require_relative "searches/youtube"
 # import
 require_relative "searches/stackoverflow"
 
-# import
-require_relative "searches/tinyurl"
-
 # import
 require_relative "searches/linkding"

data/lib/searchlink/string.rb

@@ -59,15 +59,15 @@ module SL
 
       shortener = split(/_/).last
       SL.shortener = case shortener
-                     when /i/i
-                       :isgd
-                     when /b/i
-                       :bitly
-                     when /t/i
-                       :tinyurl
-                     else
-                       :none
-                     end
+        when /i/i
+          :isgd
+        when /b/i
+          :bitly
+        when /t/i
+          :tinyurl
+        else
+          :none
+        end
 
       sub(/_[ibt]$/i, "")
     end
@@ -89,10 +89,10 @@ module SL
       query = SL.query.map { |k, v| "#{k}=#{v}" }.join("&")
 
       query = if self =~ /\?[^= ]+=\S+/
-                "&#{query}"
-              else
-                "?#{query}"
-              end
+          "&#{query}"
+        else
+          "?#{query}"
+        end
 
       "#{self}#{query}"
     end
@@ -145,27 +145,29 @@ module SL
 
     # parse command line flags into long options
     def parse_flags
-      gsub(/(\+\+|--)([dirtvs]+)\b/) do
+      gsub(/(\+\+|--)([dirtvsc]+)\b/) do
         m = Regexp.last_match
         bool = m[1] == "++" ? "" : "no-"
         output = " "
         m[2].split("").each do |arg|
           output += case arg
-                    when "d"
-                      "--#{bool}debug "
-                    when "i"
-                      "--#{bool}inline "
-                    when "r"
-                      "--#{bool}prefix_random "
-                    when "t"
-                      "--#{bool}include_titles "
-                    when "v"
-                      "--#{bool}validate_links "
-                    when "s"
-                      "--#{bool}remove_seo "
-                    else
-                      ""
-                    end
+            when "c"
+              "--#{bool}confirm"
+            when "d"
+              "--#{bool}debug "
+            when "i"
+              "--#{bool}inline "
+            when "r"
+              "--#{bool}prefix_random "
+            when "t"
+              "--#{bool}include_titles "
+            when "v"
+              "--#{bool}validate_links "
+            when "s"
+              "--#{bool}remove_seo "
+            else
+              ""
+            end
         end
 
         output
@@ -308,7 +310,7 @@ module SL
         "‘" => "’",
         "[" => "]",
         "(" => ")",
-        "<" => ">"
+        "<" => ">",
       }
 
       left_punct = []
@@ -378,7 +380,7 @@ module SL
         # p_re = path.path_elements.map{|seg| seg.downcase.split(//).join('.?') }.join('|')
         # re_parts.push(p_re) if p_re.length > 0
 
-        site_re = "(#{re_parts.join('|')})"
+        site_re = "(#{re_parts.join("|")})"
 
         dead_switch = 0
 
@@ -403,14 +405,14 @@ module SL
             end
 
             title = if parts.empty?
-                      longest
-                    elsif parts.length < 2
-                      parts.join(sep)
-                    elsif parts.length > 2
-                      parts.longest_element.strip
-                    else
-                      parts.join(sep)
-                    end
+                longest
+              elsif parts.length < 2
+                parts.join(sep)
+              elsif parts.length > 2
+                parts.longest_element.strip
+              else
+                parts.join(sep)
+              end
           end
           dead_switch += 1
         end
@@ -421,7 +423,7 @@ module SL
         return self
       end
 
-      seps = Regexp.new(" *[#{seo_title_separators.map { |s| Regexp.escape(s) }.join('')}] +")
+      seps = Regexp.new(" *[#{seo_title_separators.map { |s| Regexp.escape(s) }.join("")}] +")
       if title =~ seps
         seo_parts = title.split(seps)
         title = seo_parts.longest_element.strip if seo_parts.length.positive?
@@ -524,13 +526,13 @@ module SL
       (1..n).each do |j|
         (1..m).each do |i|
           d[i][j] = if s[i - 1] == t[j - 1] # adjust index into string
-                      d[i - 1][j - 1] # no operation required
-                    else
-                      [d[i - 1][j] + 1, # deletion
-                       d[i][j - 1] + 1, # insertion
-                       d[i - 1][j - 1] + 1 # substitution
-        ].min
-                    end
+              d[i - 1][j - 1] # no operation required
+            else
+              [d[i - 1][j] + 1, # deletion
+               d[i][j - 1] + 1, # insertion
+               d[i - 1][j - 1] + 1 # substitution
+].min
+            end
         end
       end
       d[m][n]
@@ -543,7 +545,7 @@ module SL
     ##
     def matches_exact(string)
       comp = gsub(/[^a-z0-9 ]/i, "")
-      comp =~ /\b#{string.gsub(/[^a-z0-9 ]/i, '').split(/ +/).map { |s| Regexp.escape(s) }.join(' +')}/i
+      comp =~ /\b#{string.gsub(/[^a-z0-9 ]/i, "").split(/ +/).map { |s| Regexp.escape(s) }.join(" +")}/i
     end
 
     ##
@@ -591,7 +593,7 @@ module SL
     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 }
+      str.split(/#{separator}/).map { |arg| /#{bound}#{arg.gsub(/[^a-z0-9]/i, ".?")}/i }
     end
 
     ##

data/lib/searchlink/url.rb

@@ -146,6 +146,8 @@ module SL
         # end
 
         begin
+          return File.basename(url) if url =~ /\.(gif|jpe?g|png|web[mp]|bmp|svg|tiff?|pdf|avif)$/i
+
           if url =~ %r{https://(amzn.to|(www\.)?amazon\.com)/}
             final_url = follow_redirects(url)
             m = final_url.match(%r{https://www.amazon.com/(.*?)/dp/})

data/lib/searchlink/util.rb

@@ -56,9 +56,10 @@ module SL
       ## @return     [Array] url, title, link_text
       ##
       def search_with_timeout(search, timeout)
-        url = nil
-        title = nil
-        link_text = nil
+        if SL.config["skip_timeout"] || SL.config["confirm"]
+          url, title, link_text = search.call
+          return [url, title, link_text]
+        end
 
         begin
           Timeout.timeout(timeout) do

data/lib/searchlink/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SL
-  VERSION = "2.3.85"
+  VERSION = '2.3.86'
 end
 
 # Main module

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: searchlink
 version: !ruby/object:Gem::Version
-  version: 2.3.85
+  version: 2.3.86
 platform: ruby
 authors:
 - Brett Terpstra
 bindir: bin
 cert_chain: []
-date: 2025-03-30 00:00:00.000000000 Z
+date: 2025-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -287,7 +287,6 @@ files:
 - lib/searchlink/searches.rb
 - lib/searchlink/searches/amazon.rb
 - lib/searchlink/searches/applemusic.rb
-- lib/searchlink/searches/bitly.rb
 - lib/searchlink/searches/definition.rb
 - lib/searchlink/searches/duckduckgo.rb
 - lib/searchlink/searches/github.rb
@@ -297,19 +296,22 @@ files:
 - lib/searchlink/searches/helpers/safari.rb
 - lib/searchlink/searches/history.rb
 - lib/searchlink/searches/hook.rb
-- lib/searchlink/searches/isgd.rb
 - lib/searchlink/searches/itunes.rb
 - lib/searchlink/searches/lastfm.rb
 - lib/searchlink/searches/linkding.rb
 - lib/searchlink/searches/lyrics.rb
 - lib/searchlink/searches/pinboard.rb
+- lib/searchlink/searches/popup.rb
 - lib/searchlink/searches/setapp.rb
+- lib/searchlink/searches/shortener.rb
+- lib/searchlink/searches/shorteners/bitly.rb
+- lib/searchlink/searches/shorteners/isgd.rb
+- lib/searchlink/searches/shorteners/tinyurl.rb
 - lib/searchlink/searches/social.rb
 - lib/searchlink/searches/software.rb
 - lib/searchlink/searches/spelling.rb
 - lib/searchlink/searches/spotlight.rb
 - lib/searchlink/searches/stackoverflow.rb
-- lib/searchlink/searches/tinyurl.rb
 - lib/searchlink/searches/tmdb.rb
 - lib/searchlink/searches/twitter.rb
 - lib/searchlink/searches/wikipedia.rb