searchlink 2.3.62 → 2.3.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20591719c33fd31a48e40072d839ea484f13fec80789fccee1417108e0e4f9f4
-  data.tar.gz: ff92074f65ad60d2bb52016169f9cb5d61d4ef3696130195f8ef1dfeb8b0635b
+  metadata.gz: 4fe46ed7fe6c7688ce62b32035592b22ada5ccfd918c39cb4efde42d40c328a4
+  data.tar.gz: 14c5b53c4b88f6fea15f729781fc8fb7bb21ecabc211e0d49fd7a3b2078d36b0
 SHA512:
-  metadata.gz: 06fd6071642386fed86432d1b18ccac1d7ebad0dbdcdfb8c8e5e244431d7e190039b6b53e2ce75654bef4512c28b67ba5f7d4d56c6f728bd7387bb7d74eeb5e9
-  data.tar.gz: 6d7e73ece33947326e6ff610af6c71cf8f7d113650c447bb2d97409095d780b54c3ebc5b3a6cb2da4a075e03684e02d1ff0bef1a301a8f4576576a8329b4e4db
+  metadata.gz: 560cbfc23c8ebcb47ccd67d896e1168ce9acb9d58adccde348df1bd11cea3e8d5e9990d2565088a2367239e4b3799bd50effd856fb41836d8007d4ae3f42e4ea
+  data.tar.gz: debe843ab12a7abd1075f36456d789f38f7cb402af6bb717c7c53ffb59205626e3a925aa515a17dd40c0fb34b9e2950203fc368a33d28e4a4fcc6857a10a7446

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

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.62'
+  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.62
+  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