searchlink 2.3.61 → 2.3.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cff5bedf7ccbc233a648654e9f3c7bf41981a451c11ddfb6b1fd90741ae6ae2a
-  data.tar.gz: 41e05ed7af669c38d093eb5f109489a786e5bef29575caade95c8328332abf06
+  metadata.gz: 4fe46ed7fe6c7688ce62b32035592b22ada5ccfd918c39cb4efde42d40c328a4
+  data.tar.gz: 14c5b53c4b88f6fea15f729781fc8fb7bb21ecabc211e0d49fd7a3b2078d36b0
 SHA512:
-  metadata.gz: 1fcb8a00815275b8263805029d47d50d8fd5d934de2880dcfb32c41384652c5791a0c2415e5cead7b2649c348b5374f050d2a4f74b817b8399e25efd5bc72912
-  data.tar.gz: c65f32af3fdeca3ea36306b92babcaa09cfb4c1aee01c5569a1dcf8132821d9b94a05e9f186961a2e67990db6ec409b22562b12e73ef7ca4517036263a8bc642
+  metadata.gz: 560cbfc23c8ebcb47ccd67d896e1168ce9acb9d58adccde348df1bd11cea3e8d5e9990d2565088a2367239e4b3799bd50effd856fb41836d8007d4ae3f42e4ea
+  data.tar.gz: debe843ab12a7abd1075f36456d789f38f7cb402af6bb717c7c53ffb59205626e3a925aa515a17dd40c0fb34b9e2950203fc368a33d28e4a4fcc6857a10a7446

data/lib/searchlink/config.rb

@@ -20,10 +20,11 @@ module SL
     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
+      if File.exist?(old_style) && !File.exist?(new_style)
+        old_style
       else
-        return new_style
+        FileUtils.mkdir_p(File.dirname(new_style))
+        new_style
       end
     end
 

data/lib/searchlink/searches/lyrics.rb

@@ -9,14 +9,15 @@ module SL
           # `trigger` is A regular expression that will trigger this plugin
           # when used with a bang. The one below will trigger on !lyrics or
           # !lyricse.
-          trigger: 'lyrics?e?',
+          trigger: 'lyrics?(e|e?js)?',
           # Every search that the plugin should execute should be individually
           # listed and described in the searches array. This is used for
           # completion and help generation. Do not include the bang (!) in the
           # search keyword.
           searches: [
             ['lyric', 'Song Lyrics Search'],
-            ['lyrice', 'Song Lyrics Embed']
+            ['lyrice', 'Song Lyrics Embed'],
+            ['lyricjs', 'Song Lyrics JS Embed']
           ]
         }
       end
@@ -45,6 +46,15 @@ module SL
             SL.add_error('No lyrics found', "Song lyrics for #{search_terms} not found")
             false
           end
+        when /js$/
+          url, title = SL.ddg("site:genius.com #{search_terms}", link_text)
+          if url
+            title = js_embed(url)
+            title ? ['embed', title, link_text] : false
+          else
+            SL.add_error('No lyrics found', "Song lyrics for #{search_terms} not found")
+            false
+          end
         else
           # You can perform a DuckDuckGo search using SL#ddg, passing the
           # search terms and link_text. It will return url, title, and
@@ -59,6 +69,24 @@ module SL
         end
       end
 
+      def js_embed(url)
+        if SL::URL.valid_link?(url)
+          body = Curl::Html.new(url).body
+          api_path = body.match(%r{\\"apiPath\\":\\"(/songs/.*?)\\"})[1]
+          id = api_path.sub(/.*?(\d+)$/, '\1')
+          title = body.match(/_sf_async_config.title = '(.*?) \| Genius Lyrics'/)[1]
+
+          <<~EOEMBED
+            <div id='rg_embed_link_#{id}' class='rg_embed_link' data-song-id='#{id}'>
+            Read <a href='#{url}'>#{title}</a> on Genius
+            </div>
+            <script crossorigin src='//genius.com#{api_path}/embed.js'></script>
+          EOEMBED
+        else
+          false
+        end
+      end
+
       # Any additional helper methods can be defined after #search
       def get_lyrics(url)
         if SL::URL.valid_link?(url)
@@ -66,13 +94,14 @@ module SL
           # `curl -SsL` is faster and easier. Curl::Html.new(url) returns a
           # new object containing :body
           body = Curl::Html.new(url).body
-
+          title = body.match(/_sf_async_config.title = '(.*?) \| Genius Lyrics'/)[1].gsub(/\\/, '').sub(/ Lyrics$/, '')
           matches = body.scan(%r{class="Lyrics__Container-.*?>(.*?)</div><div class="LyricsFooter})
 
           lyrics = matches.join("\n")
 
           if lyrics
-            "```\n#{CGI.unescape(lyrics).gsub(%r{<br/?>}, "  \n").gsub(%r{</?.*?>}, '').gsub(/&#x27;/, "'")}\n```"
+            lyrics = CGI.unescape(lyrics).gsub(%r{<br/?>}, "  \n").gsub(%r{</?.*?>}, '').gsub(/&#x27;/, "'")
+            "#{title}\n\n#{lyrics.code_indent}\n"
           else
             false
           end

data/lib/searchlink/searches.rb

@@ -70,7 +70,7 @@ module SL
 
       def best_search_match(term)
         searches = all_possible_searches.dup
-        searches.select { |s| s.matches_score(term, separator: '', start_word: false) > 8 }
+        searches.flatten.select { |s| s.matches_score(term, separator: '', start_word: false) > 8 }
       end
 
       def all_possible_searches
@@ -115,14 +115,17 @@ module SL
 
       def load_custom
         plugins_folder = File.expand_path('~/.local/searchlink/plugins')
+        new_plugins_folder = File.expand_path('~/.config/searchlink/plugins')
 
-        Dir.glob(File.join(plugins_folder, '**/*.rb')).sort.each do |plugin|
-          require plugin
+        if File.directory?(plugins_folder) && !File.directory?(new_plugins_folder)
+          Dir.glob(File.join(plugins_folder, '**/*.rb')).sort.each do |plugin|
+            require plugin
+          end
         end
 
-        plugins_folder = File.expand_path('~/.config/searchlink/plugins')
+        return unless File.directory?(new_plugins_folder)
 
-        Dir.glob(File.join(plugins_folder, '**/*.rb')).sort.each do |plugin|
+        Dir.glob(File.join(new_plugins_folder, '**/*.rb')).sort.each do |plugin|
           require plugin
         end
       end

data/lib/searchlink/string.rb

@@ -2,7 +2,7 @@
 class ::String
   # Scrub invalid characters from string
   def scrub
-    encode('utf-16', invalid: :replace).encode('utf-8')
+    encode('utf-16', invalid: :replace).encode('utf-8').gsub(/\u00A0/, ' ')
   end
 
   # @see #scrub
@@ -476,4 +476,12 @@ class ::String
     str = gsub(/(#{separator})+/, separator)
     str.split(/#{separator}/).map { |arg| /#{bound}#{arg.gsub(/[^a-z0-9]/i, '.?')}/i }
   end
+
+  ##
+  ## Indent each line of string with 4 spaces
+  ##
+  ## @return [String] indented string
+  def code_indent
+    split(/\n/).map { |l| "    #{l}" }.join("\n")
+  end
 end

data/lib/searchlink/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchlink
 version: !ruby/object:Gem::Version
-  version: 2.3.61
+  version: 2.3.63
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-25 00:00:00.000000000 Z
+date: 2023-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler