searchlink 2.3.74 → 2.3.77

data/lib/searchlink/parse.rb

@@ -12,7 +12,7 @@ module SL
     #
     def parse_arguments(string, opt = {})
       input = string.dup
-      return '' if input.nil?
+      return "" if input.nil?
 
       skip_flags = opt[:only_meta] || false
       no_restore = opt[:no_restore] || false
@@ -24,8 +24,12 @@ module SL
       options.each do |o|
         if input =~ /^ *#{o}:\s+(\S+)$/
           val = Regexp.last_match(1).strip
-          val = true if val =~ /true/i
-          val = false if val =~ /false/i
+
+          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
@@ -37,11 +41,11 @@ module SL
 
           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
+            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}/, '')
+          input.sub!(/\s?--(no-)?#{o}/, "")
         end
       end
       SL.clipboard ? string : input
@@ -60,32 +64,32 @@ module SL
           help_dialog
         else
           $stdout.puts SL.version_check.to_s
-          $stdout.puts 'See https://github.com/ttscoff/searchlink/wiki for help'
+          $stdout.puts "See https://github.com/ttscoff/searchlink/wiki for help"
         end
         print input
       when /^!?(wiki|docs)$/i
-        warn 'Opening wiki in browser'
+        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('')
+        print SL.output.join("")
       end
       Process.exit 0
     end
 
     def create_footnote(mtch)
-      if mtch[1].nil? || mtch[1] == ''
+      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
+            @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)
@@ -106,7 +110,7 @@ module SL
           SL.add_footer SL.make_link(:ref_title, @link_text, @url, title: title, force_title: false)
         end
         @delete_line = true
-      elsif SL.config['inline']
+      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
@@ -115,11 +119,11 @@ module SL
       else
         unless @links.key? @url
           @highest_marker += 1
-          @links[@url] = format('%<pre>s%<m>04d', pre: @prefix, m: @highest_marker)
+          @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
+        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
@@ -129,13 +133,13 @@ module SL
     end
 
     def custom_search(search_type, search_terms)
-      SL.config['custom_site_searches'].each do |k, v|
+      SL.config["custom_site_searches"].each do |k, v|
         next unless search_type == k
 
-        @link_text = search_terms if !SL.titleize && @link_text == ''
+        @link_text = search_terms if !SL.titleize && @link_text == ""
         v = parse_arguments(v, { no_restore: true })
         if v =~ %r{^(/|http)}i
-          search_type = 'r'
+          search_type = "r"
           tokens = v.scan(/\$term\d+[ds]?/).sort.uniq
 
           if !tokens.empty?
@@ -147,7 +151,7 @@ module SL
             end
             terms_p = search_terms.split(/ +/)
             if terms_p.length > highest_token
-              remainder = terms_p[highest_token - 1..-1].join(' ')
+              remainder = terms_p[highest_token - 1..-1].join(" ")
               terms_p = terms_p[0..highest_token - 2]
               terms_p.push(remainder)
             end
@@ -159,12 +163,12 @@ module SL
               case t
               when /d$/
                 replacement.downcase!
-                re_down = ''
+                re_down = ""
               when /s$/
                 replacement.slugify!
-                re_down = ''
+                re_down = ""
               else
-                re_down = '(?!d|s)'
+                re_down = "(?!d|s)"
               end
               v.gsub!(/#{Regexp.escape(t) + re_down}/, replacement.url_encode)
             end
@@ -177,7 +181,7 @@ module SL
             end
           end
         else
-          search_type = SL::GoogleSearch.api_key? ? 'gg' : 'g'
+          search_type = SL::GoogleSearch.api_key? ? "gg" : "g"
           search_terms = "site:#{v} #{search_terms}"
         end
 
@@ -195,7 +199,7 @@ module SL
 
       parse_commands(input)
 
-      SL.config['inline'] = true if input.scan(/\]\(/).length == 1 && input.split(/\n/).length == 1
+      SL.config["inline"] = true if input.scan(/\]\(/).length == 1 && input.split(/\n/).length == 1
       SL.errors = {}
       SL.report = []
 
@@ -210,20 +214,20 @@ module SL
       counter_links = 0
       counter_errors = 0
 
-      input.sub!(/\n?<!-- Report:.*?-->\n?/m, '')
-      input.sub!(/\n?<!-- Errors:.*?-->\n?/m, '')
+      input.sub!(/\n?<!-- Report:.*?-->\n?/m, "")
+      input.sub!(/\n?<!-- Errors:.*?-->\n?/m, "")
 
       input.scan(/\[(.*?)\]:\s+(.*?)\n/).each { |match| @links[match[1].strip] = match[0] }
 
-      @prefix = if SL.config['prefix_random']
-                 if input =~ /\[(\d{4}-)\d+\]: \S+/
-                   Regexp.last_match(1)
-                 else
-                   format('%04d-', rand(9999))
-                 end
-               else
-                 ''
-               end
+      @prefix = if SL.config["prefix_random"]
+          if input =~ /\[(\d{4}-)\d+\]: \S+/
+            Regexp.last_match(1)
+          else
+            format("%04d-", rand(9999))
+          end
+        else
+          ""
+        end
 
       @highest_marker = 0
       input.scan(/^\s{,3}\[(?:#{@prefix})?(\d+)\]: /).each do
@@ -237,7 +241,7 @@ module SL
         @footnote_counter = m[1].to_i if m[1].to_i > @footnote_counter
       end
 
-      if SL.config['complete_bare']
+      if SL.config["complete_bare"]
         rx = %r{(?ix-m)(?<!\(|:\s|<)(?:
                 (?:https?://)(?:[\da-z.-]+)\.(?:[a-z.]{2,6})
                 (?:[/\w\d.\-()_/+=?&%]*?(?=[\s\n]|$))
@@ -301,13 +305,13 @@ module SL
               $stderr.print("\033[0K\rProcessed: #{counter_links} of #{total_links}, #{counter_errors} errors. ")
             end
 
-            @link_text = this_match[1] || ''
-            link_info = parse_arguments(this_match[2].strip).strip || ''
+            @link_text = this_match[1] || ""
+            link_info = parse_arguments(this_match[2].strip).strip || ""
 
-            if @link_text.strip == '' && link_info =~ /".*?"/
+            if @link_text.strip == "" && link_info =~ /".*?"/
               link_info.gsub!(/"(.*?)"/) do
                 m = Regexp.last_match
-                @link_text = m[1] if @link_text == ''
+                @link_text = m[1] if @link_text == ""
                 m[0]
               end
             end
@@ -318,11 +322,11 @@ module SL
 
             if link_info.strip =~ /:$/ && line.strip == match
               @ref_title = true
-              link_info.sub!(/\s*:\s*$/, '')
+              link_info.sub!(/\s*:\s*$/, "")
             end
 
-            unless !@link_text.empty? || !link_info.sub(/^[!\^]\S+/, '').strip.empty?
-              SL.add_error('No input', match)
+            if @link_text.empty? && link_info.sub(/^[!\^]\S+/, "").strip.empty?
+              SL.add_error("No input", match)
               counter_errors += 1
               invalid_search = true
             end
@@ -340,43 +344,45 @@ module SL
             elsif link_info =~ /^\^(.+)/
               m = Regexp.last_match
               create_footnote(m)
-            # Handle [](URL) and [%](URL), filling in title
-            elsif (@link_text == '' || @link_text == '%') && SL::URL.url?(link_info)
+              # Handle [](URL) and [%](URL), filling in title
+            elsif (@link_text == "" || @link_text == "%") && SL::URL.url?(link_info)
               add_title(link_info)
-            elsif (@link_text == '' && link_info == '') || SL::URL.url?(link_info)
-              SL.add_error('Invalid search', match) unless SL::URL.url?(link_info)
+            elsif (@link_text == "" && link_info == "") || SL::URL.url?(link_info)
+              SL.add_error("Invalid search", match) unless SL::URL.url?(link_info)
               match
             else
-              link_info = @link_text if !@link_text.empty? && link_info == ''
+              link_info = @link_text if !@link_text.empty? && link_info == ""
 
-              search_type = ''
-              search_terms = ''
+              search_type = ""
+              search_terms = ""
               link_only = false
               SL.clipboard = false
-              SL.titleize = SL.config['empty_uses_page_title']
+              SL.titleize = SL.config["empty_uses_page_title"]
 
               if link_info =~ /^(?:[!\^](\S+))\s*(.*)$/
                 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_terms = m[2].gsub(/(^["']|["']$)/, '')
+                search_terms = m[2].gsub(/(^["']|["']$)/, "")
                 search_terms.strip!
 
                 # if the link text is just '%' replace with title regardless of config settings
-                if @link_text == '%' && search_terms && !search_terms.empty?
+                if @link_text == "%" && search_terms && !search_terms.empty?
                   SL.titleize = true
-                  @link_text = ''
+                  @link_text = ""
                 end
 
-                search_terms = @link_text if search_terms == ''
+                search_terms = @link_text if search_terms == ""
 
                 # if the input starts with a +, append it to the link text as the search terms
-                search_terms = "#{@link_text} #{search_terms.strip.sub(/^\+\s*/, '')}" if search_terms.strip =~ /^\+[^+]/
+                if search_terms.strip =~ /^\+[^+]/
+                  search_terms = "#{@link_text} #{search_terms.strip.sub(/^\+\s*/, "")}"
+                end
 
                 # if the end of input contain "^", copy to clipboard instead of STDOUT
                 SL.clipboard = true if search_terms =~ /(!!)?\^(!!)?$/
@@ -384,8 +390,7 @@ module SL
                 # if the end of input contains "!!", only print the url
                 link_only = true if search_terms =~ /!!\^?$/
 
-                search_terms.sub!(/(!!)?\^?(!!)?$/, '')
-
+                search_terms = search_terms.sub(/(!!)?\^?(!!)?$/, "")
               elsif link_info =~ /^!/
                 search_word = link_info.match(/^!(\S+)/)
 
@@ -393,8 +398,7 @@ module SL
                   search_type = search_word[1] unless search_word.nil?
                   search_terms = @link_text
                 elsif search_word && search_word[1] =~ /^(\S+\.)+\S+$/
-                  search_type = SL::GoogleSearch.api_key? ? 'gg' : 'g'
-                  puts SL::GoogleSearch.api_key?
+                  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)
@@ -402,13 +406,13 @@ module SL
                   search_terms = false
                 end
               elsif @link_text && !@link_text.empty? && (!link_info || link_info.empty?)
-                search_type = SL::GoogleSearch.api_key? ? 'gg' : 'g'
+                search_type = SL::GoogleSearch.api_key? ? "gg" : "g"
                 search_terms = @link_text
               elsif link_info && !link_info.empty?
-                search_type = SL::GoogleSearch.api_key? ? 'gg' : 'g'
+                search_type = SL::GoogleSearch.api_key? ? "gg" : "g"
                 search_terms = link_info
               else
-                SL.add_error('Invalid search', match)
+                SL.add_error("Invalid search", match)
                 search_type = false
                 search_terms = false
               end
@@ -419,12 +423,11 @@ module SL
 
               if (search_type && search_terms) || @url
                 # warn "Searching #{search_type} for #{search_terms}"
-                unless @url
-                  @search_count += 1
-                  @url, title, @link_text = do_search(search_type, search_terms, @link_text, @search_count)
-                end
 
-                if (@link_text == '' || @link_text == '%') && @url
+                @search_count += 1
+                @url, title, @link_text = do_search(search_type, search_terms, @link_text, @search_count)
+
+                if (@link_text == "" || @link_text == "%") && @url
                   if title
                     @link_text = title
                   else
@@ -433,13 +436,13 @@ module SL
                 end
 
                 if @url
-                  title = SL::URL.title(@url) if SL.titleize && title == ''
+                  title = SL::URL.title(@url) if SL.titleize && title == ""
 
-                  @link_text = title if @link_text == '' && title
+                  @link_text = title if @link_text == "" && title
                   force_title = search_type =~ /def/ ? true : false
 
-                  if link_only || search_type =~ /sp(ell)?/ || @url == 'embed'
-                    @url = title if @url == 'embed'
+                  if link_only || search_type =~ /sp(ell)?/ || @url == "embed"
+                    @url = title if @url == "embed"
                     @cursor_difference += SL.match_length - @url.length
                     SL.match_length = @url.length
                     SL.add_report("#{@match_string} => #{@url}")
@@ -450,7 +453,7 @@ module SL
                       SL.add_footer SL.make_link(:ref_title, @link_text, @url, title: title, force_title: force_title)
                     end
                     @delete_line = true
-                  elsif SL.config['inline']
+                  elsif SL.config["inline"]
                     res = SL.make_link(:inline, @link_text, @url, title: title, force_title: force_title)
                     @cursor_difference += SL.match_length - res.length
                     SL.match_length = res.length
@@ -459,11 +462,11 @@ module SL
                   else
                     unless @links.key? @url
                       @highest_marker += 1
-                      @links[@url] = format('%<pre>s%<m>04d', pre: @prefix, m: @highest_marker)
+                      @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: force_title)
                     end
 
-                    type = SL.config['inline'] ? :inline : :ref_link
+                    type = SL.config["inline"] ? :inline : :ref_link
                     res = SL.make_link(type, @link_text, @links[@url], title: false, force_title: force_title)
                     @cursor_difference += SL.match_length - res.length
                     SL.match_length = res.length
@@ -471,12 +474,12 @@ module SL
                     res
                   end
                 else
-                  SL.add_error('No results', "#{search_terms} (#{@match_string})")
+                  SL.add_error("No results", "#{search_terms} (#{@match_string})")
                   counter_errors += 1
                   match
                 end
               else
-                SL.add_error('Invalid search', match)
+                SL.add_error("Invalid search", match)
                 counter_errors += 1
                 match
               end
@@ -490,7 +493,7 @@ module SL
 
         input = out.delete_if { |l| l.strip =~ /^<!--DELETE-->$/ }.join("\n")
 
-        if SL.config['inline']
+        if SL.config["inline"]
           SL.add_output "#{input}\n"
           SL.add_output "\n#{SL.print_footer}" unless SL.footer.empty?
         elsif SL.footer.empty?
@@ -529,7 +532,7 @@ module SL
 
         # if end of input contains ~, pull url from clipboard
         if input =~ /~[:\^!\s]*$/
-          input.sub!(/[:!\^\s~]*$/, '')
+          input.sub!(/[:!\^\s~]*$/, "")
           clipboard = `__CF_USER_TEXT_ENCODING=$UID:0x8000100:0x8000100 pbpaste`.strip
           if SL::URL.url?(clipboard)
             type = reference_link ? :ref_title : :inline
@@ -540,7 +543,7 @@ module SL
           Process.exit
         end
 
-        input.sub!(/[:!\^\s~]*$/, '')
+        input.sub!(/[:!\^\s~]*$/, "")
 
         ## Maybe if input is just a URL, convert it to a link
         ## using hostname as text without doing search
@@ -552,10 +555,10 @@ module SL
         end
 
         # check for additional search terms in parenthesis
-        additional_terms = ''
+        additional_terms = ""
         if input =~ /\((.*?)\)/
           additional_terms = " #{Regexp.last_match(1).strip}"
-          input.sub!(/\(.*?\)/, '')
+          input.sub!(/\(.*?\)/, "")
         end
 
         # Maybe detect "search + addition terms" and remove additional terms from link text?
@@ -585,13 +588,13 @@ 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|
+              SL.config["custom_site_searches"].each do |k, v|
                 next unless type == k
 
-                @link_text = terms if @link_text == ''
+                @link_text = terms if @link_text == ""
                 v = parse_arguments(v, { no_restore: true })
                 if v =~ %r{^(/|http)}i
-                  type = 'r'
+                  type = "r"
                   tokens = v.scan(/\$term\d+[ds]?/).sort.uniq
 
                   if !tokens.empty?
@@ -602,7 +605,7 @@ module SL
                     end
                     terms_p = terms.split(/ +/)
                     if terms_p.length > highest_token
-                      remainder = terms_p[highest_token - 1..-1].join(' ')
+                      remainder = terms_p[highest_token - 1..-1].join(" ")
                       terms_p = terms_p[0..highest_token - 2]
                       terms_p.push(remainder)
                     end
@@ -613,15 +616,15 @@ module SL
                       replacement = terms_p[int]
 
                       re_down = case t
-                                when /d$/
-                                  replacement.downcase!
-                                  ''
-                                when /s$/
-                                  replacement.slugify!
-                                  ''
-                                else
-                                  '(?!d|s)'
-                                end
+                        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
@@ -633,7 +636,7 @@ module SL
                     end
                   end
                 else
-                  type = SL::GoogleSearch.api_key? ? 'gg' : 'g'
+                  type = SL::GoogleSearch.api_key? ? "gg" : "g"
                   terms = "site:#{v} #{terms}"
                 end
 
@@ -644,7 +647,7 @@ module SL
             # if contains TLD, use site-specific search
             if type =~ /^(\S+\.)+\S+$/
               terms = "site:#{type} #{terms}"
-              type = SL::GoogleSearch.api_key? ? 'gg' : 'g'
+              type = SL::GoogleSearch.api_key? ? "gg" : "g"
             end
             @search_count ||= 0
             @search_count += 1
@@ -654,15 +657,15 @@ module SL
             SL.add_error("Invalid search#{SL::Searches.did_you_mean(type)}", input)
             counter_errors += 1
           end
-        # Social handle expansion
+          # Social handle expansion
         when /^([tfilm])?@(\S+)\s*$/
           type = Regexp.last_match(1)
           type ||= if Regexp.last_match(2) =~ /[a-z0-9_]@[a-z0-9_.]+/i
-                     'm'
-                   else
-                     't'
-                   end
-          @link_text = input.sub(/^[tfilm]/, '')
+              "m"
+            else
+              "t"
+            end
+          @link_text = input.sub(/^[tfilm]/, "")
           @url, title = SL::SocialSearch.social_handle(type, @link_text)
           @link_text = title
         else
@@ -675,7 +678,7 @@ module SL
             SL.add_output(@url)
           elsif link_only
             SL.add_output(@url)
-          elsif @url == 'embed'
+          elsif @url == "embed"
             SL.add_output(title)
           else
             type = reference_link ? :ref_title : :inline
@@ -684,17 +687,17 @@ module SL
             SL.print_errors
           end
         else
-          SL.add_error('No results', title)
+          SL.add_error("No results", title)
           SL.add_output SL.originput.chomp
           SL.print_errors
         end
 
         if SL.clipboard
           if SL.output == SL.originput
-            warn 'No results found'
+            warn "No results found"
           else
-            `echo #{Shellwords.escape(SL.output.join(''))}|tr -d "\n"|pbcopy`
-            warn 'Results in clipboard'
+            `echo #{Shellwords.escape(SL.output.join(""))}|tr -d "\n"|pbcopy`
+            warn "Results in clipboard"
           end
         end
       end

data/lib/searchlink/plist.rb

@@ -64,11 +64,11 @@ module Plist
     COMMENT_END = /.*?-->/um.freeze
 
     def parse
-      plist_tags = PTag.mappings.keys.join('|')
+      plist_tags = PTag.mappings.keys.join("|")
       start_tag  = /<(#{plist_tags})([^>]*)>/i
       end_tag    = %r{</(#{plist_tags})[^>]*>}i
 
-      require 'strscan'
+      require "strscan"
 
       @scanner = StringScanner.new(@xml)
       until @scanner.eos?
@@ -84,7 +84,7 @@ module Plist
         elsif @scanner.scan(end_tag)
           @listener.tag_end(@scanner[1])
         else
-          raise 'Unimplemented element'
+          raise "Unimplemented element"
         end
       end
     end
@@ -98,8 +98,8 @@ module Plist
 
     def self.inherited(sub_class)
       key = sub_class.to_s.downcase
-      key.gsub!(/^plist::/, '')
-      key.gsub!(/^p/, '') unless key == 'plist'
+      key.gsub!(/^plist::/, "")
+      key.gsub!(/^p/, "") unless key == "plist"
 
       @@mappings[key] = sub_class
     end
@@ -110,7 +110,7 @@ module Plist
     end
 
     def to_ruby
-      raise 'Unimplemented: ' + self.class.to_s + "#to_ruby on #{inspect}"
+      raise "Unimplemented: " + self.class.to_s + "#to_ruby on #{inspect}"
     end
   end
 
@@ -140,13 +140,13 @@ module Plist
 
   class PKey < PTag
     def to_ruby
-      CGI.unescapeHTML(text || '')
+      CGI.unescapeHTML(text || "")
     end
   end
 
   class PString < PTag
     def to_ruby
-      CGI.unescapeHTML(text || '')
+      CGI.unescapeHTML(text || "")
     end
   end
 
@@ -180,17 +180,17 @@ module Plist
     end
   end
 
-  require 'date'
+  require "date"
   class PDate < PTag
     def to_ruby
       DateTime.parse(text)
     end
   end
 
-  require 'base64'
+  require "base64"
   class PData < PTag
     def to_ruby
-      data = Base64.decode64(text.gsub(/\s+/, ''))
+      data = Base64.decode64(text.gsub(/\s+/, ""))
 
       begin
         Marshal.load(data)