searchlink 2.3.85 → 2.3.87

data/lib/searchlink/searches/history.rb

@@ -41,7 +41,7 @@ module SL
             ["heh", "Edge History Search"],
             ["heb", "Edge Bookmark Search"],
             ["hehb", nil],
-            ["hebh", nil]
+            ["hebh", nil],
           ],
           config: [
             {
@@ -65,9 +65,9 @@ module SL
                 brave_history
                 arc_history
                 arc_bookmarks
-              ]
-            }
-          ]
+              ],
+            },
+          ],
         }
       end
 
@@ -156,7 +156,7 @@ module SL
         end
 
         url, title = search_history(search_terms, types)
-        link_text = title if link_text == "" || link_text == search_terms
+        link_text = title if link_text == ""
         [url, title, link_text]
       end
 

data/lib/searchlink/searches/linkding.rb

@@ -46,7 +46,7 @@ module SL
       end
 
       def get_linkding_bookmarks
-        curl = TTY::Which.which("curl")
+        TTY::Which.which("curl")
         call = "/api/bookmarks/?limit=8000&format=json"
 
         json = get_json(call)
@@ -101,7 +101,7 @@ module SL
             cache = linkding_bookmarks
             save_linkding_cache(cache)
           end
-          curl = TTY::Which.which("curl")
+          TTY::Which.which("curl")
           updated = get_json("/api/bookmarks/?limit=1&format=json")["results"][0]
           last_bookmark = Time.parse(updated["date_modified"])
           if cache&.key?("update_time")

data/lib/searchlink/searches/popup.rb

@@ -0,0 +1,67 @@
+# 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
+
+        res = `automator -i "#{url}" "#{SL::Util.popup_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 SL::Util.popup_path
+          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/setapp.rb

@@ -65,7 +65,9 @@ module SL
       end
 
       def process_link(link, search_terms, link_text)
-        SL::URL.valid_link?(link, 2) && [link, search_terms, link_text] || SL.ddg("site:setapp.com #{search_terms}", link_text)
+        SL::URL.valid_link?(link,
+                            2) && [link, search_terms,
+                                   link_text] || SL.ddg("site:setapp.com #{search_terms}", link_text)
       end
 
       def process_search_type(search_type, link, title, link_text)

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 SL::Util.popup_path
+          cmd = %(osascript -e 'display dialog "#{url}" with title "#{title}" buttons {"Cancel", "Confirm", "Preview"}')
+
+          res = `#{cmd}`.strip
+
+          return res =~ /Confirm/ unless res =~ /Preview/
+
+          res = `automator -i "#{url}" "#{SL::Util.popup_path}"`.strip
+
+          return res.empty? ? false : res
+        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)
+
+        unless NO_CONFIRM
+          # Confirm shortening the URL
+          res = SL::Shortener.confirm?(url, title: "Shorten URL?")
+
+          return url unless res
+
+          url = res if res.is_a?(String)
+        end
+
+        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}

@@ -58,7 +58,8 @@ module SL
           "long_url" => url,
           "domain" => domain
         }
-        data = Curl::Json.new("https://api-ssl.bitly.com/v4/shorten", data: data_obj.to_json, headers: headers, symbolize_names: true)
+        data = Curl::Json.new("https://api-ssl.bitly.com/v4/shorten", data: data_obj.to_json, headers: headers,
+                                                                      symbolize_names: true)
 
         return false unless data.json.key?(:link)
 

data/lib/searchlink/searches/{tinyurl.rb → shorteners/tinyurl.rb}

@@ -44,7 +44,8 @@ module SL
         data_obj = {
           "url" => url
         }
-        data = Curl::Json.new("https://tinyurl.ph/api/url/add", data: data_obj.to_json, headers: headers, symbolize_names: true)
+        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])

data/lib/searchlink/searches/social.rb

@@ -11,7 +11,7 @@ module SL
             ["@f", "Facebook Handle"],
             ["@i", "Instagram Handle"],
             ["@l", "LinkedIn Handle"],
-            ["@m", "Mastodon Handle"],
+            ["@m", "Mastodon Handle"]
           ],
           config: [
             description: "Formatting for social links, use %service%, %user%, and %url%
@@ -27,33 +27,38 @@ module SL
 
       def search(search_type, search_terms, link_text = "")
         type = case search_type
-          when /^@t/ # twitter-ify username
-            unless search_terms.strip =~ /^@?[0-9a-z_$]+$/i
-              return [false, "#{search_terms} is not a valid Twitter handle", link_text]
-            end
-
-            "t"
-          when /^@fb?/ # fb-ify username
-            return [false, "#{search_terms} is not a valid Facebook username", link_text] unless search_terms.strip =~ /^@?[0-9a-z_]+$/i
-
-            "f"
-          when /^@i/ # intagramify username
-            return [false, "#{search_terms} is not a valid Instagram username", link_text] unless search_terms.strip =~ /^@?[0-9a-z_]+$/i
-
-            "i"
-          when /^@l/ # linked-inify username
-            unless search_terms.strip =~ /^@?[0-9a-z_]+$/i
-              return [false, "#{search_terms} is not a valid LinkedIn username", link_text]
-            end
-
-            "l"
-          when /^@m/ # mastodonify username
-            return [false, "#{search_terms} is not a valid Mastodon username", link_text] unless search_terms.strip =~ /^@?[0-9a-z_]+@[0-9a-z_.]+$/i
-
-            "m"
-          else
-            "t"
-          end
+               when /^@t/ # twitter-ify username
+                 return [false, "#{search_terms} is not a valid Twitter handle", link_text] unless search_terms.strip =~ /^@?[0-9a-z_$]+$/i
+
+                 "t"
+               when /^@fb?/ # fb-ify username
+                 unless search_terms.strip =~ /^@?[0-9a-z_]+$/i
+                   return [false, "#{search_terms} is not a valid Facebook username",
+                           link_text]
+                 end
+
+                 "f"
+               when /^@i/ # intagramify username
+                 unless search_terms.strip =~ /^@?[0-9a-z_]+$/i
+                   return [false, "#{search_terms} is not a valid Instagram username",
+                           link_text]
+                 end
+
+                 "i"
+               when /^@l/ # linked-inify username
+                 return [false, "#{search_terms} is not a valid LinkedIn username", link_text] unless search_terms.strip =~ /^@?[0-9a-z_]+$/i
+
+                 "l"
+               when /^@m/ # mastodonify username
+                 unless search_terms.strip =~ /^@?[0-9a-z_]+@[0-9a-z_.]+$/i
+                   return [false, "#{search_terms} is not a valid Mastodon username",
+                           link_text]
+                 end
+
+                 "m"
+               else
+                 "t"
+               end
 
         url, title = social_handle(type, search_terms)
         link_text = title if link_text == ""

data/lib/searchlink/searches/twitter.rb

@@ -26,19 +26,18 @@ module SL
 
       def twitter_embed(tweet)
         res = `curl -sSL 'https://publish.twitter.com/oembed?url=#{tweet.url_encode}'`.strip
-        if res
-          begin
-            json = JSON.parse(res)
-            url = "embed"
-            title = json["html"]
-          rescue StandardError
-            SL.add_error("Tweet Error", "Error retrieving tweet")
-            url = false
-            title = tweet
-          end
-        else
-          return [false, "Error retrieving tweet"]
+        return [false, "Error retrieving tweet"] unless res
+
+        begin
+          json = JSON.parse(res)
+          url = "embed"
+          title = json["html"]
+        rescue StandardError
+          SL.add_error("Tweet Error", "Error retrieving tweet")
+          url = false
+          title = tweet
         end
+
         [url, title]
       end
     end

data/lib/searchlink/searches.rb

@@ -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
@@ -189,7 +191,7 @@ require_relative "searches/itunes"
 require_relative "searches/amazon"
 
 # import
-require_relative "searches/bitly"
+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

@@ -145,12 +145,14 @@ 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 "c"
+                      "--#{bool}confirm"
                     when "d"
                       "--#{bool}debug "
                     when "i"

data/lib/searchlink/url.rb

@@ -66,7 +66,7 @@ module SL
       end
 
       def only_url?(input)
-        input =~ %r{(?i)^((http|https)://)?([\w\-_]+(\.[\w\-_]+)+)([\w\-.,@?^=%&:/~+#]*[\w\-@^=%&/~+#])?$}
+        input =~ %r{(?i)^(https?://)?([\w-]+(\.[\w-]+)+)([\w\-.,@?^=%&:/~+#]*[\w\-@^=%&/~+#])?$}
       end
 
       def ref_title_for_url(url)
@@ -110,7 +110,10 @@ module SL
       def amazon_affiliatize(url, amazon_partner)
         return url if amazon_partner.nil? || amazon_partner.empty?
 
-        return [url, ""] unless url =~ %r{https?://(?<subdomain>.*?)amazon.com/(?:(?<title>.*?)/)?(?<type>[dg])p/(?<id>[^?]+)}
+        unless url =~ %r{https?://(?<subdomain>.*?)amazon.com/(?:(?<title>.*?)/)?(?<type>[dg])p/(?<id>[^?]+)}
+          return [url,
+                  ""]
+        end
 
         m = Regexp.last_match
         sd = m["subdomain"]
@@ -146,6 +149,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
@@ -85,6 +86,19 @@ module SL
         FileUtils.mkdir_p(cache_folder) unless File.directory?(cache_folder)
         File.join(cache_folder, filename.sub(/(\.cache)?$/, ".cache"))
       end
+
+      # Checks if the Preview URL.workflow exists, return path if it does.
+      def popup_path
+        begin
+          path = File.expand_path(File.join(__dir__, "../../helpers/Preview URL.workflow"))
+          path = File.expand_path("~/Library/Services/Preview URL.workflow") unless File.exist?(path)
+        rescue
+          path = File.expand_path("~/Library/Services/Preview URL.workflow")
+        end
+        return false unless File.exist?(path)
+
+        path
+      end
     end
   end
 end

data/lib/searchlink/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SL
-  VERSION = "2.3.85"
+  VERSION = "2.3.87"
 end
 
 # Main module
@@ -29,7 +29,7 @@ module SL
       latest = SemVer.new(latest_tag)
       current = SemVer.new(SL::VERSION)
 
-      File.open(cachefile, "w") { |f| f.puts("#{last_time.strftime("%c")}|#{latest}") }
+      File.open(cachefile, "w") { |f| f.puts("#{last_time.strftime('%c')}|#{latest}") }
 
       return "SearchLink v#{current}, #{latest} available. Run \"update\" to download." if latest_tag && current.older_than(latest)
 
@@ -42,12 +42,12 @@ module SL
     def new_version?
       headers = {
         "Accept" => "application/vnd.github+json",
-        "X-GitHub-Api-Version" => "2022-11-28",
+        "X-GitHub-Api-Version" => "2022-11-28"
       }
       if defined? Secrets::GH_AUTH_TOKEN
         headers["Authorization"] = "Bearer #{Secrets::GH_AUTH_TOKEN}"
       elsif SL.config["github_token"]
-        headers["Authorization"] = "Bearer #{SL.config["github_token"]}"
+        headers["Authorization"] = "Bearer #{SL.config['github_token']}"
       end
 
       url = "https://api.github.com/repos/ttscoff/searchlink/releases/latest"

data/lib/searchlink.rb

@@ -15,6 +15,9 @@ require "json"
 require "erb"
 require "English"
 
+# import
+require_relative "searchlink/plist"
+
 # import
 require_relative "tokens" if File.exist?("tokens.rb")
 
@@ -42,9 +45,6 @@ require_relative "searchlink/array"
 # import
 require_relative "searchlink/string"
 
-# import
-require_relative "searchlink/plist"
-
 # import
 require_relative "searchlink/config"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: searchlink
 version: !ruby/object:Gem::Version
-  version: 2.3.85
+  version: 2.3.87
 platform: ruby
 authors:
 - Brett Terpstra
 bindir: bin
 cert_chain: []
-date: 2025-03-30 00:00:00.000000000 Z
+date: 2025-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -282,12 +282,14 @@ files:
 - lib/searchlink/output.rb
 - lib/searchlink/parse.rb
 - lib/searchlink/plist.rb
+- lib/searchlink/plist/generator.rb
+- lib/searchlink/plist/parser.rb
+- lib/searchlink/plist/version.rb
 - lib/searchlink/script_plugin.rb
 - lib/searchlink/search.rb
 - 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 +299,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