natalia 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1cd40e71255d902fb12309ee83888b4ea78b322baf87caaaaa8aaafca0d3886
-  data.tar.gz: de2c722d139e874be4675975a909d745182e73bdf5e41cd6f2542b71e53dc197
+  metadata.gz: fa2e17162fde6d6e03709031a6d3c2084418bfb23da0b758e44afd81dc6dd0b1
+  data.tar.gz: ac8e18a3060c3b747529bc18085920ae0cdc9c0d78ea05756a27af6b1b91149c
 SHA512:
-  metadata.gz: 4f65cc234804d15401dc4902b9dcd87804408cd3c97cfae2c8e17d9044768725781c14d14fdf75b0c467916da795ce5cfaee9b77a4fe548cbb9a5d63684d48dc
-  data.tar.gz: 583b39aefe55add76fb4af7c25c395ab6e2ab6363fa0e7e81b0a246c957be50087cab8dd48442496d001a2c6e17e16bb61fdb48463e54127335ff829ae8faca7
+  metadata.gz: d27b7645635319c47c3c8af0691e2a4339d2981d7755cc361a666d7e4b9e1f78f5c4c29f22aa0aa091017c190b79bc8487328b48d052c0409e89c7481678e4c0
+  data.tar.gz: 37f819764e68c428f2c6f594f1fb96aa013e2fb7fcc6e1673bf673e672813275c117677f0a36745b4e8ed2e2c9e2b61e91c60ef59de5902665534798449150d5

data/lib/natalia/services/j_lyric.rb

@@ -0,0 +1,125 @@
+# frozen_string_literal: true
+
+require 'nokogiri'
+require 'time'
+require_relative '../utils'
+
+module Natalia
+  module JLyric
+    # sort という概念はないっぽい
+    def self.search(keyword, type: :title, sort: :popularity_desc)
+      case type
+      when :title
+        search_by_title(keyword)
+      when :artist
+        search_by_artist(keyword, sort: sort)
+      else
+        raise ArgumentError, "unsupported search type `#{type}`"
+      end
+    end
+
+    def self.search_by_title(keyword)
+      entries = []
+      (1..).each do |page|
+        response =
+          Natalia::Utils.curl_get('https://search2.j-lyric.net/index.php', {
+                                    kt: keyword,
+                                    ct: '2', # kt 検索方法 (0: 前方, 1: 完全, 2: 中間, 3: 後方)
+                                    search: '検索', # 謎
+                                    ex: 'on', # 謎
+                                    ca: '2', # ka 検索方法
+                                    cl: '2', # kl 検索方法
+                                    p: page
+                                  })
+        response.value
+
+        doc = Nokogiri::HTML.parse(response.body)
+        table = doc.css('div#bas div#cnt div#mnb > div.bdy')
+        break if table.empty?
+
+        table.each do |body|
+          entries << {
+            source: self,
+            id: body.at_css('p.mid a')['href'].match(%r{/artist/(.+)\.html\z})[1],
+            title: body.at_css('p.mid a').content,
+            artist: body.css('p.sml')[0].at_css('a').content,
+            artist_id: body.css('p.sml')[0].at_css('a')['href'].match(%r{/artist/(.+)/\z})[1]
+          }
+        end
+      end
+
+      entries
+    end
+
+    def self.search_by_artist(artist_id, sort: :popularity_desc)
+      response = Natalia::Utils.curl_get("https://j-lyric.net/artist/#{artist_id}/")
+      response.value
+
+      doc = Nokogiri::HTML.parse(response.body)
+      artist_name = doc.at_css('div#mnb div.cnt div.cap h2').content.match(/\A(.+)の歌詞リスト\z/)[1]
+      table = doc.css('div#bas div#cnt div#mnb div.bdy[id^=ly]')
+
+      entries = table.map do |row|
+        order, date, popularity = row.css('input[type=hidden]').map {|e| e['value']}
+        {
+          source: self,
+          id: row.at_css('p.ttl a')['href'].match(%r{/artist/(.+)\.html\z})[1],
+          title: row.at_css('p.ttl a').content,
+          artist: artist_name,
+          artist_id: artist_id,
+          order: order.to_i,
+          date: Time.parse("#{date} JST"),
+          popularity: -popularity.to_i
+        }
+      end.compact
+
+      case sort
+      when :title
+        entries.sort_by {|e| e[:order]}
+      when :title_desc
+        entries.sort_by {|e| -e[:order]}
+      when :popularity
+        entries.sort_by {|e| e[:popularity]}
+      when :popularity_desc
+        entries.sort_by {|e| -e[:popularity]}
+      when :date
+        entries.sort_by {|e| e[:date]}
+      when :date_desc
+        entries.sort_by {|e| -e[:date].to_i}
+      when :artist, :artist_desc
+        entries
+      else
+        raise ArgumentError, "unsupported sort type `#{sort}`"
+      end
+    end
+
+    def self.get(id)
+      response = Natalia::Utils.curl_get("https://j-lyric.net/artist/#{id}.html")
+      response.value
+
+      doc = Nokogiri::HTML.parse(response.body)
+
+      smls = doc.css('div#mnb div.lbdy p.sml')
+
+      ret = {
+        source: self,
+        id: id,
+        title: doc.at_css('div#mnb div.cap h2').content.match(/\A「(.+)」歌詞\z/)[1],
+        artist: smls[0].at_css('a').content,
+        artist_id: smls[0].at_css('a')['href'].match(%r{/artist/(.+)/\z})[1]
+      }
+
+      smls[1..].each do |e|
+        content = e.content
+        ret[:lyricist] = content.match(/作詞：(.+)/)[1] if content.start_with?('作詞：')
+        ret[:composer] = content.match(/作曲：(.+)/)[1] if content.start_with?('作曲：')
+      end
+
+      ret[:lyrics] = doc.at_css('p#Lyric').children.map do |e|
+        e.name == 'br' ? "\n" : e.content
+      end.join.strip
+
+      ret
+    end
+  end
+end

data/lib/natalia/services/joysound.rb

@@ -24,7 +24,8 @@ module Natalia
 
     def self.search(keyword, type: :title, sort: :popularity_desc)
       sort = SORT_MAP[sort]
-      raise ArgumentError, 'invalid sort type' unless sort
+      raise ArgumentError, "unsupported sort type `#{sort}`" unless sort
+      raise ArgumentError, "unsupported search type `#{type}`" unless KIND_MAP.key?(type)
 
       response = Natalia::Utils.curl_post('https://mspxy.joysound.com/Common/ContentsList') do |request|
         request.content_type = 'application/x-www-form-urlencoded; charset=UTF-8'

data/lib/natalia/services/{utamap.rb → uta_net.rb}

@@ -4,7 +4,7 @@ require 'nokogiri'
 require_relative '../utils'
 
 module Natalia
-  module Utamap
+  module UtaNet
     SORT_MAP = {
       title: 1,
       title_desc: 2,
@@ -19,8 +19,8 @@ module Natalia
     # @param [String] keyword キーワード（タイトル検索）、ID（それ以外）
     def self.search(keyword, type: :title, sort: :popularity_desc)
       sort = SORT_MAP[sort]
-      raise ArgumentError, 'invalid sort type' unless sort
-      raise ArgumentError, 'type must be :title, :artist, :lyricist, :composer, or :arranger' unless %i[title artist lyricist composer arranger].include?(type)
+      raise ArgumentError, "unsupported sort type `#{sort}`" unless sort
+      raise ArgumentError, "unsupported search type `#{type}`" unless %i[title artist lyricist composer arranger].include?(type)
 
       entries = []
       (type == :title ? 1.. : [1]).each do |page|

data/lib/natalia/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Natalia
-  VERSION = '0.1.0'
+  VERSION = '0.1.2'
 end

data/lib/natalia.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
+require_relative 'natalia/services/j_lyric'
 require_relative 'natalia/services/joysound'
-require_relative 'natalia/services/utamap'
+require_relative 'natalia/services/uta_net'
 require_relative 'natalia/version'
 
 module Natalia
@@ -43,7 +44,8 @@ module Natalia
 
   # 信頼できるソース順に並べる
   SERVICES = [
-    Natalia::Utamap,
+    Natalia::UtaNet,
+    Natalia::JLyric,
     Natalia::Joysound
   ].freeze
 
@@ -51,6 +53,9 @@ module Natalia
     entries = []
     SERVICES.each do |service|
       entries += service.search(keyword, type: :title, sort: sort)
+    rescue StandardError
+      warn "Failed to search by #{service}"
+      warn $!.full_message
     end
     entries.map {|entry| Song.new(entry)}
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: natalia
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Ishotihadus
@@ -37,8 +37,9 @@ files:
 - README.md
 - Rakefile
 - lib/natalia.rb
+- lib/natalia/services/j_lyric.rb
 - lib/natalia/services/joysound.rb
-- lib/natalia/services/utamap.rb
+- lib/natalia/services/uta_net.rb
 - lib/natalia/utils.rb
 - lib/natalia/version.rb
 homepage: https://github.com/natalia