searchlink 2.3.84 → 2.3.86

data/lib/searchlink/parse.rb

@@ -2,194 +2,14 @@
 
 module SL
   class SearchLink
-    # Parse arguments in the input string
-    #
-    # @param      string  [String] the string to parse
-    # @param      opt     [Hash] the options to parse
-    # @option opt [Boolean] :only_meta (false) whether to skip flags
-    # @option opt [Boolean] :no_restore (false) whether to restore previous config
-    # @return     [String] the parsed string
-    #
-    def parse_arguments(string, opt = {})
-      input = string.dup
-      return "" if input.nil?
-
-      skip_flags = opt[:only_meta] || false
-      no_restore = opt[:no_restore] || false
-      restore_prev_config unless no_restore
-
-      input.parse_flags! unless skip_flags
-
-      options = %w[debug country_code inline prefix_random include_titles remove_seo validate_links complete_bare]
-      options.each do |o|
-        if input =~ /^ *#{o}:\s+(\S+)$/
-          val = Regexp.last_match(1).strip
-
-          if val.is_a?(String)
-            value = true if val =~ /true/i
-            value = false if val =~ /false/i
-          end
-          val = value if value
-          SL.config[o] = val
-          warn "\r\033[0KGlobal config: #{o} = #{SL.config[o]}\n" unless SILENT
-        end
-
-        next if skip_flags
-
-        while input =~ /^#{o}:\s+(.*?)$/ || input =~ /--(no-)?#{o}/
-          next unless input =~ /--(no-)?#{o}/ && !skip_flags
-
-          unless SL.prev_config.key? o
-            SL.prev_config[o] = SL.config[o]
-            bool = Regexp.last_match(1).nil? || Regexp.last_match(1) == "" ? true : false
-            SL.config[o] = bool
-            $stderr.print "\r\033[0KLine config: #{o} = #{SL.config[o]}\n" unless SILENT
-          end
-          input.sub!(/\s?--(no-)?#{o}/, "")
-        end
-      end
-      SL.clipboard ? string : input
-    end
-
-    # Parse commands from the given input string
-    #
-    # @param      input  [String] the input string
-    def parse_commands(input)
-      # Handle commands like help or docs
-      return unless input.strip =~ /^!?(h(elp)?|wiki|docs?|v(er(s(ion)?)?)?|up(date|grade))$/
-
-      case input.strip
-      when /^!?help$/i
-        if SILENT
-          help_dialog
-        else
-          $stdout.puts SL.version_check.to_s
-          $stdout.puts "See https://github.com/ttscoff/searchlink/wiki for help"
-        end
-        print input
-      when /^!?(wiki|docs)$/i
-        warn "Opening wiki in browser"
-        `open https://github.com/ttscoff/searchlink/wiki`
-      when /^!?v(er(s(ion)?)?)?$/
-        print "[#{SL.version_check}]"
-      when /^!?up(date|grade)$/
-        SL.update_searchlink
-        print SL.output.join("")
-      end
-      Process.exit 0
-    end
-
-    def create_footnote(mtch)
-      if mtch[1].nil? || mtch[1] == ""
-        match
-      else
-        note = mtch[1].strip
-        @footnote_counter += 1
-        ref = if !@link_text.empty? && @link_text.scan(/\s/).empty?
-            @link_text
-          else
-            format("%<p>sfn%<c>04d", p: @prefix, c: @footnote_counter)
-          end
-        SL.add_footer "[^#{ref}]: #{note}"
-        res = "[^#{ref}]"
-        @cursor_difference += (SL.match_length - res.length)
-        SL.match_length = res.length
-        SL.add_report("#{@match_string} => Footnote #{ref}")
-        res
-      end
-    end
-
-    def add_title(link_info)
-      @url = link_info
-      title = SL::URL.title(@url)
-      @link_text = title
-
-      if @ref_title
-        unless @links.key? @url
-          @links[@url] = @link_text
-          SL.add_footer SL.make_link(:ref_title, @link_text, @url, title: title, force_title: false)
-        end
-        @delete_line = true
-      elsif SL.config["inline"]
-        res = SL.make_link(:inline, @link_text, @url, title: title, force_title: false)
-        @cursor_difference += SL.match_length - res.length
-        SL.match_length = res.length
-        SL.add_report("#{@match_string} => #{@url}")
-        res
-      else
-        unless @links.key? @url
-          @highest_marker += 1
-          @links[@url] = format("%<pre>s%<m>04d", pre: @prefix, m: @highest_marker)
-          SL.add_footer SL.make_link(:ref_title, @links[@url], @url, title: title, force_title: false)
-        end
+    # Confirm a URL with a popup if requested
+    def confirmed?(url)
+      return true unless SL.config["confirm"]
 
-        type = SL.config["inline"] ? :inline : :ref_link
-        res = SL.make_link(type, @link_text, @links[@url], title: false, force_title: false)
-        @cursor_difference += SL.match_length - res.length
-        SL.match_length = res.length
-        SL.add_report("#{@match_string} => #{@url}")
-        res
-      end
-    end
-
-    def custom_search(search_type, search_terms)
-      SL.config["custom_site_searches"].each do |k, v|
-        next unless search_type == k
-
-        @link_text = search_terms if !SL.titleize && @link_text == ""
-        v = parse_arguments(v, { no_restore: true })
-        if v =~ %r{^(/|http)}i
-          search_type = "r"
-          tokens = v.scan(/\$term\d+[ds]?/).sort.uniq
-
-          if !tokens.empty?
-            highest_token = 0
-            tokens.each do |token|
-              if token =~ /(\d+)[ds]?$/ && Regexp.last_match(1).to_i > highest_token
-                highest_token = Regexp.last_match(1).to_i
-              end
-            end
-            terms_p = search_terms.split(/ +/)
-            if terms_p.length > highest_token
-              remainder = terms_p[highest_token - 1..].join(" ")
-              terms_p = terms_p[0..highest_token - 2]
-              terms_p.push(remainder)
-            end
-            tokens.each do |t|
-              next unless t =~ /(\d+)[ds]?$/
-
-              int = Regexp.last_match(1).to_i - 1
-              replacement = terms_p[int]
-              case t
-              when /d$/
-                replacement.downcase!
-                re_down = ""
-              when /s$/
-                replacement.slugify!
-                re_down = ""
-              else
-                re_down = "(?!d|s)"
-              end
-              v.gsub!(/#{Regexp.escape(t) + re_down}/, replacement.url_encode)
-            end
-            search_terms = v
-          else
-            search_terms = v.gsub(/\$term[ds]?/i) do |mtch|
-              search_terms.downcase! if mtch =~ /d$/i
-              search_terms.slugify! if mtch =~ /s$/i
-              search_terms.url_encode
-            end
-          end
-        else
-          search_type = SL::GoogleSearch.api_key? ? "gg" : "g"
-          search_terms = "site:#{v} #{search_terms}"
-        end
-
-        break
-      end
-      [search_type, search_terms]
+      SL::Shortener.confirm?(url)
     end
 
+    # Parse the input string and perform searches
     def parse(input)
       SL.output = []
       return false if input.empty?
@@ -202,6 +22,7 @@ module SL
       SL.config["inline"] = true if input.scan(/\]\(/).length == 1 && input.split(/\n/).length == 1
       SL.errors = {}
       SL.report = []
+      SL.shortener = :none
 
       # Check for new version
       latest_version = SL.new_version?
@@ -274,6 +95,7 @@ module SL
         end
       end
 
+      # Handle links in the form of [text](url) or [text](url "title")
       if input =~ /\[(.*?)\]\((.*?)\)/
         lines = input.split(/\n/)
         out = []
@@ -330,6 +152,7 @@ module SL
 
             @link_text = this_match[1] || ""
             link_info = parse_arguments(this_match[2].strip).strip || ""
+            query, link_info = link_info.extract_query({})
 
             if @link_text.strip == "" && link_info =~ /".*?"/
               link_info.gsub!(/"(.*?)"/) do
@@ -355,7 +178,7 @@ module SL
             end
 
             if link_info =~ /^!(\S+)/
-              search_type = Regexp.last_match(1)
+              search_type = Regexp.last_match(1).extract_shortener
               unless SL::Searches.valid_search?(search_type) || search_type =~ /^(\S+\.)+\S+$/
                 SL.add_error("Invalid search#{SL::Searches.did_you_mean(search_type)}", match)
                 invalid_search = true
@@ -386,10 +209,12 @@ module SL
                 m = Regexp.last_match
 
                 search_type = if m[1].nil?
-                                SL::GoogleSearch.api_key? ? "gg" : "g"
-                              else
-                                m[1]
-                              end
+                    SL::GoogleSearch.api_key? ? "gg" : "g"
+                  else
+                    m[1]
+                  end
+
+                search_type.extract_shortener!
 
                 search_terms = m[2].gsub(/(^["']|["']$)/, "")
                 search_terms.strip!
@@ -419,18 +244,17 @@ module SL
                   search_type = "g"
                   search_terms = "site:#{m[1]} #{search_terms}"
                 end
-
               elsif link_info =~ /^!/
                 search_word = link_info.match(/^!(\S+)/)
-
-                if search_word && SL::Searches.valid_search?(search_word[1])
-                  search_type = search_word[1] unless search_word.nil?
+                st = search_word[1].extract_shortener
+                if search_word && SL::Searches.valid_search?(st)
+                  search_type = st unless search_word.nil?
                   search_terms = @link_text
-                elsif search_word && search_word[1] =~ /^(\S+\.)+\S+$/
+                elsif search_word && st =~ /^(\S+\.)+\S+$/
                   search_type = SL::GoogleSearch.api_key? ? "gg" : "g"
                   search_terms = "site:#{search_word[1]} #{@link_text}"
                 else
-                  SL.add_error("Invalid search#{SL::Searches.did_you_mean(search_word[1])}", match)
+                  SL.add_error("Invalid search#{SL::Searches.did_you_mean(st)}", match)
                   search_type = false
                   search_terms = false
                 end
@@ -450,6 +274,8 @@ module SL
                 search_type, search_terms = custom_search(search_type, search_terms)
               end
 
+              SL.add_query(query) if query
+
               if (search_type && search_terms) || @url
                 # warn "Searching #{search_type} for #{search_terms}"
 
@@ -465,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
@@ -544,12 +377,13 @@ module SL
         SL.add_report("Processed: #{total_links} links, #{counter_errors} errors.")
         SL.print_report
         SL.print_errors
-      else
+      else # Assume single line input
         link_only = false
         SL.clipboard = false
 
         res = parse_arguments(input.strip!).strip
         input = res.nil? ? input.strip : res
+        query, input = input.extract_query({})
 
         # if the end of input contain "^", copy to clipboard instead of STDOUT
         SL.clipboard = true if input =~ /\^[!~:\s]*$/
@@ -608,8 +442,9 @@ module SL
 
         case input
         when /^!(\S+)\s+(.*)$/
-          type = Regexp.last_match(1)
+          type = Regexp.last_match(1).extract_shortener
           link_info = Regexp.last_match(2).strip
+
           @link_text ||= link_info
           terms = link_info + additional_terms
           terms.strip!
@@ -617,60 +452,7 @@ module SL
           if SL::Searches.valid_search?(type) || type =~ /^(\S+\.)+\S+$/
             if type && terms && !terms.empty?
               # Iterate through custom searches for a match, perform search if matched
-              SL.config["custom_site_searches"].each do |k, v|
-                next unless type == k
-
-                @link_text = terms if @link_text == ""
-                v = parse_arguments(v, { no_restore: true })
-                if v =~ %r{^(/|http)}i
-                  type = "r"
-                  tokens = v.scan(/\$term\d+[ds]?/).sort.uniq
-
-                  if !tokens.empty?
-                    highest_token = 0
-                    tokens.each do |token|
-                      t = Regexp.last_match(1)
-                      highest_token = t.to_i if token =~ /(\d+)d?$/ && t.to_i > highest_token
-                    end
-                    terms_p = terms.split(/ +/)
-                    if terms_p.length > highest_token
-                      remainder = terms_p[highest_token - 1..].join(" ")
-                      terms_p = terms_p[0..highest_token - 2]
-                      terms_p.push(remainder)
-                    end
-                    tokens.each do |t|
-                      next unless t =~ /(\d+)d?$/
-
-                      int = Regexp.last_match(1).to_i - 1
-                      replacement = terms_p[int]
-
-                      re_down = case t
-                        when /d$/
-                          replacement.downcase!
-                          ""
-                        when /s$/
-                          replacement.slugify!
-                          ""
-                        else
-                          "(?!d|s)"
-                        end
-                      v.gsub!(/#{Regexp.escape(t) + re_down}/, replacement.url_encode)
-                    end
-                    terms = v
-                  else
-                    terms = v.gsub(/\$term[ds]?/i) do |mtch|
-                      terms.downcase! if mtch =~ /d$/i
-                      terms.slugify! if mtch =~ /s$/i
-                      terms.url_encode
-                    end
-                  end
-                else
-                  type = SL::GoogleSearch.api_key? ? "gg" : "g"
-                  terms = "site:#{v} #{terms}"
-                end
-
-                break
-              end
+              type, terms = custom_search(type, terms)
             end
 
             # if contains TLD, use site-specific search
@@ -681,6 +463,7 @@ module SL
             @search_count ||= 0
             @search_count += 1
 
+            SL.add_query(query) if query
             @url, title, @link_text = do_search(type, terms, @link_text, @search_count)
           else
             SL.add_error("Invalid search#{SL::Searches.did_you_mean(type)}", input)
@@ -695,24 +478,38 @@ module SL
               "t"
             end
           @link_text = input.sub(/^[tfilm]/, "")
+          SL.add_query(query) if query
           @url, title = SL::SocialSearch.social_handle(type, @link_text)
           @link_text = title
         else
+          SL.add_query(query) if query
           @link_text ||= input
           @url, title, @link_text = SL.ddg(input, @link_text)
         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
 
-            SL.add_output SL.make_link(type, @link_text, @url, title: title, force_title: false)
+            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.print_errors
+            end
+          else
+            SL.add_error("Canceled", "User canceled result #{@url}")
+            SL.add_output SL.originput.chomp
             SL.print_errors
           end
         else
@@ -731,5 +528,199 @@ module SL
         end
       end
     end
+
+    private
+
+    def add_title(link_info)
+      @url = link_info
+      title = SL::URL.title(@url)
+      @link_text = title
+
+      if @ref_title
+        unless @links.key? @url
+          @links[@url] = @link_text
+          SL.add_footer SL.make_link(:ref_title, @link_text, @url, title: title, force_title: false)
+        end
+        @delete_line = true
+      elsif SL.config["inline"]
+        res = SL.make_link(:inline, @link_text, @url, title: title, force_title: false)
+        @cursor_difference += SL.match_length - res.length
+        SL.match_length = res.length
+        SL.add_report("#{@match_string} => #{@url}")
+        res
+      else
+        unless @links.key? @url
+          @highest_marker += 1
+          @links[@url] = format("%<pre>s%<m>04d", pre: @prefix, m: @highest_marker)
+          SL.add_footer SL.make_link(:ref_title, @links[@url], @url, title: title, force_title: false)
+        end
+
+        type = SL.config["inline"] ? :inline : :ref_link
+        res = SL.make_link(type, @link_text, @links[@url], title: false, force_title: false)
+        @cursor_difference += SL.match_length - res.length
+        SL.match_length = res.length
+        SL.add_report("#{@match_string} => #{@url}")
+        res
+      end
+    end
+
+    # Parse arguments in the input string
+    #
+    # @param      string  [String] the string to parse
+    # @param      opt     [Hash] the options to parse
+    # @option opt [Boolean] :only_meta (false) whether to skip flags
+    # @option opt [Boolean] :no_restore (false) whether to restore previous config
+    # @return     [String] the parsed string
+    #
+    def parse_arguments(string, opt = {})
+      input = string.dup
+      return "" if input.nil?
+
+      skip_flags = opt[:only_meta] || false
+      no_restore = opt[:no_restore] || false
+      restore_prev_config unless no_restore
+
+      input.parse_flags! unless skip_flags
+
+      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
+
+          if val.is_a?(String)
+            value = true if val =~ /true/i
+            value = false if val =~ /false/i
+          end
+          val = value if value
+          SL.config[o] = val
+          warn "\r\033[0KGlobal config: #{o} = #{SL.config[o]}\n" unless SILENT
+        end
+
+        next if skip_flags
+
+        while input =~ /^#{o}:\s+(.*?)$/ || input =~ /--(no-)?#{o}/
+          next unless input =~ /--(no-)?#{o}/ && !skip_flags
+
+          unless SL.prev_config.key? o
+            SL.prev_config[o] = SL.config[o]
+            bool = Regexp.last_match(1).nil? || Regexp.last_match(1) == "" ? true : false
+            SL.config[o] = bool
+            $stderr.print "\r\033[0KLine config: #{o} = #{SL.config[o]}\n" unless SILENT
+          end
+          input.sub!(/\s?--(no-)?#{o}/, "")
+        end
+      end
+      SL.clipboard ? string : input
+    end
+
+    # Parse commands from the given input string
+    #
+    # @param      input  [String] the input string
+    def parse_commands(input)
+      # Handle commands like help or docs
+      return unless input.strip =~ /^!?(h(elp)?|wiki|docs?|v(er(s(ion)?)?)?|up(date|grade))$/
+
+      case input.strip
+      when /^!?help$/i
+        if SILENT
+          help_dialog
+        else
+          $stdout.puts SL.version_check.to_s
+          $stdout.puts "See https://github.com/ttscoff/searchlink/wiki for help"
+        end
+        print input
+      when /^!?(wiki|docs)$/i
+        warn "Opening wiki in browser"
+        `open https://github.com/ttscoff/searchlink/wiki`
+      when /^!?v(er(s(ion)?)?)?$/
+        print "[#{SL.version_check}]"
+      when /^!?up(date|grade)$/
+        SL.update_searchlink
+        print SL.output.join("")
+      end
+      Process.exit 0
+    end
+
+    def create_footnote(mtch)
+      if mtch[1].nil? || mtch[1] == ""
+        match
+      else
+        note = mtch[1].strip
+        @footnote_counter += 1
+        ref = if !@link_text.empty? && @link_text.scan(/\s/).empty?
+            @link_text
+          else
+            format("%<p>sfn%<c>04d", p: @prefix, c: @footnote_counter)
+          end
+        SL.add_footer "[^#{ref}]: #{note}"
+        res = "[^#{ref}]"
+        @cursor_difference += (SL.match_length - res.length)
+        SL.match_length = res.length
+        SL.add_report("#{@match_string} => Footnote #{ref}")
+        res
+      end
+    end
+
+    def custom_search(search_type, search_terms)
+      SL.config["custom_site_searches"].each do |k, v|
+        next unless search_type == k
+
+        @link_text = search_terms if !SL.titleize && @link_text == ""
+        v = parse_arguments(v, { no_restore: true })
+        query, v = v.extract_query({})
+
+        SL.add_query(query)
+
+        if v =~ %r{^(/|http)}i
+          search_type = "r"
+          tokens = v.scan(/\$term\d+[ds]?/).sort.uniq
+
+          if !tokens.empty?
+            highest_token = 0
+            tokens.each do |token|
+              if token =~ /(\d+)[ds]?$/ && Regexp.last_match(1).to_i > highest_token
+                highest_token = Regexp.last_match(1).to_i
+              end
+            end
+            terms_p = search_terms.split(/ +/)
+            if terms_p.length > highest_token
+              remainder = terms_p[highest_token - 1..].join(" ")
+              terms_p = terms_p[0..highest_token - 2]
+              terms_p.push(remainder)
+            end
+            tokens.each do |t|
+              next unless t =~ /(\d+)[ds]?$/
+
+              int = Regexp.last_match(1).to_i - 1
+              replacement = terms_p[int]
+              case t
+              when /d$/
+                replacement.downcase!
+                re_down = ""
+              when /s$/
+                replacement.slugify!
+                re_down = ""
+              else
+                re_down = "(?!d|s)"
+              end
+              v.gsub!(/#{Regexp.escape(t) + re_down}/, replacement.url_encode)
+            end
+            search_terms = v
+          else
+            search_terms = v.gsub(/\$term[ds]?/i) do |mtch|
+              search_terms.downcase! if mtch =~ /d$/i
+              search_terms.slugify! if mtch =~ /s$/i
+              search_terms.url_encode
+            end
+          end
+        else
+          search_type = SL::GoogleSearch.api_key? ? "gg" : "g"
+          search_terms = "site:#{v} #{search_terms}"
+        end
+
+        break
+      end
+      [search_type, search_terms]
+    end
   end
 end

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

@@ -68,8 +68,13 @@ module SL
       ## @return     [Array] [url, title, date]
       ##
       def search_safari_bookmarks(terms)
-        data = `plutil -convert xml1 -o - ~/Library/Safari/Bookmarks.plist`.strip
+        data = `plutil -extract Children xml1 -o - ~/Library/Safari/Bookmarks.plist`.strip
+
+        data.gsub!(%r{<key>Data</key>\s+<data>(.+?)</data>\n}m, "")
+        data.gsub!(/\t/, "")
+
         parent = Plist.parse_xml(data)
+
         results = get_safari_bookmarks(parent, terms)
         return false if results.empty?
 

data/lib/searchlink/searches/history.rb

@@ -45,12 +45,11 @@ module SL
           ],
           config: [
             {
-              description:
-                ["Remove or comment (with #) history searches you don't want",
-                 "performed by `!h`. You can force-enable them per search, e.g.",
-                 "`!hsh` (Safari History only), `!hcb` (Chrome Bookmarks only)",
-                 "etc. Multiple types can be strung together: !hshcb (Safari",
-                 "History and Chrome bookmarks)"].join(" "),
+              description: ["Remove or comment (with #) history searches you don't want",
+                            "performed by `!h`. You can force-enable them per search, e.g.",
+                            "`!hsh` (Safari History only), `!hcb` (Chrome Bookmarks only)",
+                            "etc. Multiple types can be strung together: !hshcb (Safari",
+                            "History and Chrome bookmarks)"].join(" "),
               required: false,
               key: "history_types",
               value: %w[