searchlink 2.3.84 → 2.3.86

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/{bitly.rb → shorteners/bitly.rb}

@@ -49,7 +49,6 @@ module SL
         return false unless bitly_config?
 
         domain = SL.config.key?("bitly_domain") ? SL.config["bitly_domain"] : "bit.ly"
-        url.dup
 
         headers = {
           "Content-Type" => "application/json",

data/lib/searchlink/searches/shorteners/tinyurl.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module SL
+  # is.gd link shortening
+  class TinyurlSearch
+    class << self
+      def settings
+        {
+          trigger: "tiny",
+          searches: [
+            ["tiny", "TinyURL Shorten"]
+          ],
+          config: [
+            {
+              key: "tinyurl_access_token",
+              value: "",
+              required: true,
+              description: "Generate a tinyurl API key at https://tinyurl.ph/developers (login required)"
+            }
+          ]
+        }
+      end
+
+      def search(_, search_terms, link_text)
+        if SL::URL.url?(search_terms)
+          link = search_terms
+        else
+          link, title, link_text = SL.ddg(search_terms, link_text)
+        end
+
+        url = shorten(link)
+        title = SL::URL.title(link) if title.nil? || title.empty?
+        link_text = title if (link_text.nil? || link_text.empty?) && !SL.titleize
+        format_response(url, link, link_text)
+      end
+
+      def shorten(url)
+        return false unless tinyurl_config?
+
+        headers = {
+          "Content-Type" => "application/json",
+          "Authorization" => "Bearer #{SL.config['tinyurl_access_token']}"
+        }
+        data_obj = {
+          "url" => url
+        }
+        data = Curl::Json.new("https://tinyurl.ph/api/url/add", data: data_obj.to_json, headers: headers, symbolize_names: true)
+
+        if data.json[:error].positive?
+          SL.add_error("Error creating tinyurl", data.json[:error])
+          return false
+        end
+
+        data.json[:shorturl]
+      end
+
+      def tinyurl_config?
+        return true if SL.config["tinyurl_access_token"] && !SL.config["tinyurl_access_token"].empty?
+
+        SL.add_error("TinyURL not configured", "Missing access token")
+        false
+      end
+
+      def format_response(link, original_url, link_text)
+        rtitle = SL::URL.title(original_url)
+        [link, rtitle, link_text == "" && !SL.titleize ? rtitle : link_text]
+      end
+    end
+
+    SL::Searches.register "tiny", :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..].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"
 

data/lib/searchlink/string.rb

@@ -37,6 +37,73 @@ module SL
       replace scrub
     end
 
+    # Extract query string from search string
+    def extract_query(known_queries = {})
+      string = gsub(/\?((\S+?)=(\S+?)(?=&|$|\s))+/) do |mtch|
+        tokens = mtch.sub(/^\?/, "").split("&")
+        tokens.each do |token|
+          key, value = token.split("=")
+
+          known_queries[key] = value
+        end
+
+        ""
+      end.gsub(/ +/, " ").strip
+
+      [known_queries, string]
+    end
+
+    # Extract a shortner from a string
+    def extract_shortener
+      return self unless self =~ /_[ibt]$/i
+
+      shortener = split(/_/).last
+      SL.shortener = case shortener
+        when /i/i
+          :isgd
+        when /b/i
+          :bitly
+        when /t/i
+          :tinyurl
+        else
+          :none
+        end
+
+      sub(/_[ibt]$/i, "")
+    end
+
+    # Destructive version of #extract_shortener
+    # @see #extract_shortener
+    # @return     [String] The string without the shortener
+    def extract_shortener!
+      replace extract_shortener
+    end
+
+    # Format and append a query string
+    #
+    # @return     [String] The formatted query string
+    #
+    def add_query_string
+      return self if SL.query.empty?
+
+      query = SL.query.map { |k, v| "#{k}=#{v}" }.join("&")
+
+      query = if self =~ /\?[^= ]+=\S+/
+          "&#{query}"
+        else
+          "?#{query}"
+        end
+
+      "#{self}#{query}"
+    end
+
+    # Destructive version of #add_query_string
+    # @see #add_query_string
+    # @return     [String] The formatted query string
+    def add_query_string!
+      replace add_query_string
+    end
+
     # URL Encode string
     #
     # @return     [String] url encoded string
@@ -78,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
@@ -241,7 +310,7 @@ module SL
         "‘" => "’",
         "[" => "]",
         "(" => ")",
-        "<" => ">"
+        "<" => ">",
       }
 
       left_punct = []
@@ -311,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
 
@@ -336,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
@@ -354,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?
@@ -457,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]
@@ -476,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
 
     ##
@@ -524,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.84"
+  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.84
+  version: 2.3.86
 platform: ruby
 authors:
 - Brett Terpstra
 bindir: bin
 cert_chain: []
-date: 2025-03-27 00:00:00.000000000 Z
+date: 2025-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -141,14 +141,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.1
+        version: 3.7.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.1
+        version: 3.7.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -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,13 +296,17 @@ 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