searchlink 2.3.62 → 2.3.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20591719c33fd31a48e40072d839ea484f13fec80789fccee1417108e0e4f9f4
-  data.tar.gz: ff92074f65ad60d2bb52016169f9cb5d61d4ef3696130195f8ef1dfeb8b0635b
+  metadata.gz: c19b349c222ba84795f47cc03fc5039efb3ea3f0c7ae305ad1e125c2763d33e3
+  data.tar.gz: 7be23e30bcee8c3dd2dbffe05dc06c345ffa7d65f64b20cf10e33b6a57f1b6fe
 SHA512:
-  metadata.gz: 06fd6071642386fed86432d1b18ccac1d7ebad0dbdcdfb8c8e5e244431d7e190039b6b53e2ce75654bef4512c28b67ba5f7d4d56c6f728bd7387bb7d74eeb5e9
-  data.tar.gz: 6d7e73ece33947326e6ff610af6c71cf8f7d113650c447bb2d97409095d780b54c3ebc5b3a6cb2da4a075e03684e02d1ff0bef1a301a8f4576576a8329b4e4db
+  metadata.gz: e27d21134df20d7b7721375899a62fedcd0fa0f9ac7378a2c3bf8e54dbd1f302bdc899b4d1edc89e25d2652229a980639ffe8a906e687848fbbdd60ca5129771
+  data.tar.gz: fd1f793c0031421d5525c78ae7b173119eb45b203ca7966db09e3991d420ab078f81a92c51280cd369a1fe5ee66a75c77df2bb4f99c9c1eeb73fc2e5c65ccbf8

data/lib/searchlink/curl/html.rb

@@ -107,6 +107,7 @@ module Curl
     ## @param      tag     The tag
     ## @param      source  [Boolean] Return full tag instead of contents
     ##
+    ## @return [Array] array of tag matches/contents
     def extract_tag_contents(tag, source: false)
       return @body.scan(%r{<#{tag}.*?>(?:.*?</#{tag}>)?}) if source
 
@@ -452,13 +453,11 @@ module Curl
         end
 
         # look for a charset in a content-encoding header
-        if content_type
-          encoding ||= content_type[/charset=["']?(.*?)($|["';\s])/i, 1]
-        end
+        encoding ||= content_type[/charset=["']?(.*?)($|["';\s])/i, 1] if content_type
 
         # look for a charset in a meta tag in the first 1024 bytes
         unless encoding
-          data = body[0..1023].gsub(/<!--.*?(-->|\Z)/m, "")
+          data = body[0..1023].gsub(/<!--.*?(-->|\Z)/m, '')
           data.scan(/<meta.*?>/im).each do |meta|
             encoding ||= meta[/charset=["']?([^>]*?)($|["'\s>])/im, 1]
           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

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,11 +1,11 @@
 module SL
-  VERSION = '2.3.62'
+  VERSION = '2.3.64'
 end
 
 module SL
   class << self
     def version_check
-      cachefile = File.expand_path('~/.searchlink_update_check')
+      cachefile = File.expand_path('~/.config/cache/update.txt')
       if File.exist?(cachefile)
         last_check, latest_tag = IO.read(cachefile).strip.split(/\|/)
         last_time = Time.parse(last_check)
@@ -22,12 +22,12 @@ module SL
       latest_tag ||= SL::VERSION
       latest = SemVer.new(latest_tag)
       current = SemVer.new(SL::VERSION)
-      
+
       File.open(cachefile, 'w') { |f| f.puts("#{last_time.strftime('%c')}|#{latest.to_s}") }
 
-      return "SearchLink v#{current.to_s}, #{latest.to_s} available. Run 'update' to download." if latest_tag && current.older_than(latest)
+      return "SearchLink v#{current}, #{latest} available. Run 'update' to download." if latest_tag && current.older_than(latest)
 
-      "SearchLink v#{current.to_s}"
+      "SearchLink v#{current}"
     end
 
     # Check for a newer version than local copy using GitHub release tag
@@ -63,6 +63,11 @@ module SL
     end
 
     def update_searchlink
+      if %x{uname}.strip !~ /Darwin/
+        add_output('Auto updating only available on macOS')
+        return
+      end
+
       new_version = SL.new_version?
       if new_version
         folder = File.expand_path('~/Downloads')

data/lib/tokens.rb

@@ -1,3 +1,3 @@
 module Secrets
-  GH_AUTH_TOKEN = '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'
+  GH_AUTH_TOKEN = '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'
 end

metadata

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