searchlink 2.3.86 → 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

@@ -11,7 +11,7 @@ module SL
             ["popa", "Popup Amazon Search"],
             ["popg", "Popup Google Search"],
             ["popw", "Popup Wikipedia Search"]
-          ],
+          ]
         }
       end
 
@@ -20,20 +20,19 @@ module SL
 
         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
+              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
+        res = `automator -i "#{url}" "#{SL::Util.popup_path}"`.strip
 
         begin
           if res.empty?
@@ -54,7 +53,7 @@ module SL
       private
 
       def workflow_exist?
-        unless File.exist?(File.expand_path("~/Library/Services/Preview URL.workflow"))
+        unless SL::Util.popup_path
           SL.add_error("Missing Service", "Preview URL Service not installed")
           return false
         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

@@ -18,22 +18,20 @@ module SL
       # @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\\"}")
+
+        if SL::Util.popup_path
+          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 =~ /Confirm/ unless res =~ /Preview/
+
+          res = `automator -i "#{url}" "#{SL::Util.popup_path}"`.strip
 
-            return res.empty? ? false : res
-          else
-            return res =~ /Confirm/
-          end
+          return res.empty? ? false : res
         end
 
-        res = system(%(osascript -e "display dialog \"#{url}\" with title \"#{title}\" buttons {\"Cancel\", \"Confirm\"}"))
+        res = system(%(osascript -e 'display dialog "#{url}" with title "#{title}" buttons {"Cancel", "Confirm"}'))
 
         res == 0
       end
@@ -55,12 +53,14 @@ module SL
         known_shorteners = %i[tinyurl bitly isgd]
         return url unless known_shorteners.include?(shortener)
 
-        # Confirm shortening the URL
-        res = SL::Shortener.confirm?(url)
+        unless NO_CONFIRM
+          # Confirm shortening the URL
+          res = SL::Shortener.confirm?(url, title: "Shorten URL?")
 
-        return url unless res
+          return url unless res
 
-        url = res if res.is_a?(String)
+          url = res if res.is_a?(String)
+        end
 
         return url unless SL::URL.url?(url)
 

data/lib/searchlink/searches/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/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

@@ -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)
@@ -190,7 +190,7 @@ require_relative "searches/itunes"
 # import
 require_relative "searches/amazon"
 
-#import
+# import
 require_relative "searches/shortener"
 
 # import

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
@@ -151,23 +151,23 @@ module SL
         output = " "
         m[2].split("").each do |arg|
           output += case arg
-            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
+                    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
@@ -310,7 +310,7 @@ module SL
         "‘" => "’",
         "[" => "]",
         "(" => ")",
-        "<" => ">",
+        "<" => ">"
       }
 
       left_punct = []
@@ -380,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
 
@@ -405,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
@@ -423,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?
@@ -526,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]
@@ -545,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
 
     ##
@@ -593,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

@@ -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"]

data/lib/searchlink/util.rb

@@ -86,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.86'
+  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"