searchlink 2.3.60 → 2.3.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90196cb473d5230cce634897bd0b7e59a5d7d2a6966480cef6c4cced7503f73c
-  data.tar.gz: a719aa259b7d20a45e6453d6f4edd2784c0d6f6f386cf9709ca191e3700cc8ec
+  metadata.gz: cff5bedf7ccbc233a648654e9f3c7bf41981a451c11ddfb6b1fd90741ae6ae2a
+  data.tar.gz: 41e05ed7af669c38d093eb5f109489a786e5bef29575caade95c8328332abf06
 SHA512:
-  metadata.gz: 2463f6f2745687aee721ed1055049b3ff459b6e7f763460c549ed2fc4ea5a2fc7eaad1e1ffe251a1e232a7ed599cc6f8835da316d0eba7a9b74f561511a51f89
-  data.tar.gz: d5b691776856fb06312ec6edbfcacdb5cd60de9c336c9cc691262de0e5a72f2f79c82f1f44cbc1942e3eca016a046b57f34e3b3b93414166943589576803cef2
+  metadata.gz: 1fcb8a00815275b8263805029d47d50d8fd5d934de2880dcfb32c41384652c5791a0c2415e5cead7b2649c348b5374f050d2a4f74b817b8399e25efd5bc72912
+  data.tar.gz: c65f32af3fdeca3ea36306b92babcaa09cfb4c1aee01c5569a1dcf8132821d9b94a05e9f186961a2e67990db6ec409b22562b12e73ef7ca4517036263a8bc642

data/lib/searchlink/config.rb

@@ -17,10 +17,19 @@ module SL
   class SearchLink
     # Values found in ~/.searchlink will override defaults in
     # this script
+    def config_file
+      old_style = File.expand_path('~/.searchlink')
+      new_style = File.expand_path('~/.config/searchlink/config.yaml')
+      if File.exist?(old_style)
+        return old_style
+      else
+        return new_style
+      end
+    end
 
     def initialize(opt = {})
       SL.printout = opt[:echo] || false
-      unless File.exist? File.expand_path('~/.searchlink')
+      unless File.exist? config_file
         default_config = <<~ENDCONFIG
           # set to true to have an HTML comment included detailing any errors
           # Can be disabled per search with `--d`, or enabled with `++d`.
@@ -146,12 +155,12 @@ module SL
 
         ENDCONFIG
 
-        File.open(File.expand_path('~/.searchlink'), 'w') do |f|
+        File.open(config_file, 'w') do |f|
           f.puts default_config
         end
       end
 
-      config = YAML.load_file(File.expand_path('~/.searchlink'))
+      config = YAML.load_file(config_file)
 
       # set to true to have an HTML comment inserted showing any errors
       config['debug'] ||= false

data/lib/searchlink/searches.rb

@@ -24,9 +24,9 @@ module SL
       def description_for_search(search_type)
         description = "#{search_type} search"
         plugins[:search].each do |_, plugin|
-          s = plugin[:searches].select { |s| s[0] == search_type }
-          unless s.empty?
-            description = s[0][1]
+          search = plugin[:searches].select { |s| s[0].is_a?(Array) ? s[0].include?(search_type) : s[0] == search_type }
+          unless search.empty?
+            description = search[0][1]
             break
           end
         end
@@ -42,11 +42,14 @@ module SL
         searches = plugins[:search]
                    .flat_map { |_, plugin| plugin[:searches] }
                    .reject { |s| s[1].nil? }
-                   .sort_by { |s| s[0] }
+                   .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>']
-        searches.each { |s| out << "<tr><td><code>!#{s[0]}</code></td><td>#{s[1]}</td></tr>" }
+
+        searches.each do |s|
+          out << "<tr><td><code>!#{s[0].is_a?(Array) ? "#{s[0][0]} (#{s[0][1..].join(',')})" : s[0]}</code></td><td>#{s[1]}</td></tr>"
+        end
         out.concat(['</tbody>', '</table>']).join("\n")
       end
 
@@ -58,9 +61,11 @@ module SL
       def available_searches
         searches = []
         plugins[:search].each { |_, plugin| searches.concat(plugin[:searches].delete_if { |s| s[1].nil? }) }
-        out = ''
-        searches.each { |s| out += "!#{s[0]}#{s[0].spacer}#{s[1]}\n" }
-        out
+        out = []
+        searches.each do |s|
+          out += "!#{s[0].is_a?(Array) ? "#{s[0][0]} (#{s[0][1..].join(',')})" : s[0]}#{s[0].spacer}#{s[1]}"
+        end
+        out.join("\n")
       end
 
       def best_search_match(term)
@@ -110,7 +115,12 @@ module SL
 
       def load_custom
         plugins_folder = File.expand_path('~/.local/searchlink/plugins')
-        return unless File.directory?(plugins_folder)
+
+        Dir.glob(File.join(plugins_folder, '**/*.rb')).sort.each do |plugin|
+          require plugin
+        end
+
+        plugins_folder = File.expand_path('~/.config/searchlink/plugins')
 
         Dir.glob(File.join(plugins_folder, '**/*.rb')).sort.each do |plugin|
           require plugin

data/lib/searchlink/util.rb

@@ -78,7 +78,7 @@ module SL
       ## @return     [String] path to new cache file
       ##
       def cache_file_for(filename)
-        cache_folder = File.expand_path('~/.local/share/searchlink/cache')
+        cache_folder = File.expand_path('~/.config/searchlink/cache')
         FileUtils.mkdir_p(cache_folder) unless File.directory?(cache_folder)
         File.join(cache_folder, filename.sub(/(\.cache)?$/, '.cache'))
       end

data/lib/searchlink/version.rb

@@ -1,5 +1,5 @@
 module SL
-  VERSION = '2.3.60'
+  VERSION = '2.3.61'
 end
 
 module SL

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: searchlink
 version: !ruby/object:Gem::Version
-  version: 2.3.60
+  version: 2.3.61
 platform: ruby
 authors:
 - Brett Terpstra