vk_music 3.1.2 → 3.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f27b9cb93f819517475fdba4135daf7fde34e6bdb0e992a642308838f0e32bb
-  data.tar.gz: 85445fdf8362b71fbe2dde767b9772e95b8e47ab887e5d584062f008a1899be3
+  metadata.gz: 49d94fb81d001d5d050d274f14ab6a3931467097adb46aa84601444fba4ac312
+  data.tar.gz: b8b6433c2373a1229bf5e27e31d8bc5c7d4ae01840b0620f99e715707ddc665e
 SHA512:
-  metadata.gz: 2f5ed3c5cca385e291e8f9abab438adc557a87d4a5145dc6e9b47c1d46535474433ae10cf8eb40318717ba47722c8112ef44997741073783caddda6ba6b6c812
-  data.tar.gz: 27317f2d5cc75756e8015cd9a95eb5bb71a66a55ffa2495044f7de75dcfa87f2e9f5769e8b8d9c56219aea211b2e728bcb77e0ae2763d39b180d28eaadec1f96
+  metadata.gz: ee9d28c4ef87b6fc12865ec267aeca8ddb24a9275c6c231f42fc68c6390b8fb9bfa8759f3d0f3b6f17e1d8e4ba8880b32976f987c0bde5edb4c1c3856a0a2ab1
+  data.tar.gz: 48451ee22f080a93a0d8fea4fbb468f1c45b97bc089dc87675663d602092ba2fb255826ef3b127129b7d6fe8855751ee6bc3869e0c59ccc8e5e4c413eb9be45d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vk_music (3.1.0)
+    vk_music (3.1.7)
       execjs (~> 2.7)
       json (~> 2.0)
       logger (~> 1.4)
@@ -11,14 +11,14 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    coderay (1.1.2)
+    coderay (1.1.3)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     execjs (2.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    json (2.3.0)
-    logger (1.4.1)
+    json (2.3.1)
+    logger (1.4.2)
     mechanize (2.7.6)
       domain_name (~> 0.5, >= 0.5.1)
       http-cookie (~> 1.0)
@@ -29,16 +29,16 @@ GEM
       ntlm-http (~> 0.1, >= 0.1.1)
       webrobots (>= 0.0.9, < 0.2)
     method_source (0.9.2)
-    mime-types (3.3)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
+    mime-types-data (3.2020.0512)
     mini_portile2 (2.4.0)
-    minitest (5.13.0)
+    minitest (5.14.1)
     net-http-digest_auth (1.4.1)
     net-http-persistent (2.9.4)
-    nokogiri (1.10.8)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    nokogiri (1.10.8-x64-mingw32)
+    nokogiri (1.10.10-x64-mingw32)
       mini_portile2 (~> 2.4.0)
     ntlm-http (0.1.1)
     pry (0.12.2)
@@ -47,9 +47,10 @@ GEM
     rake (13.0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.6)
+    unf_ext (0.0.7.7)
+    unf_ext (0.0.7.7-x64-mingw32)
     webrobots (0.1.2)
-    yard (0.9.20)
+    yard (0.9.25)
 
 PLATFORMS
   ruby
@@ -66,4 +67,4 @@ DEPENDENCIES
   yard (~> 0.9)
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/lib/vk_music/audio.rb

@@ -153,7 +153,7 @@ module VkMusic
       else
         # Probably audios from some post
         new(
-          artist: node.at_css(".medias_audio_artist").text.strip,
+          artist: node.at_css(".medias_music_author").text.strip,
           title: Utility.plain_text(node.at_css(".medias_audio_title")).strip,
           duration: Utility.parse_duration(node.at_css(".medias_audio_dur").text)
         )

data/lib/vk_music/client.rb

@@ -43,13 +43,12 @@ module VkMusic
     def find(query = "", type: :audio)
       raise ArgumentError if query.empty?
       uri = URI(Constants::URL::VK[:audios])
+      search_page = load_ajax(uri, { "q" => query })
       case type
       when :audio
-        uri.query = Utility.hash_to_params({ "act" => "search", "q" => query })
-        audios_from_page(uri)
+        audios_from_ajax(search_page)
       when :playlist
-        uri.query = Utility.hash_to_params({ "q" => query, "tab" => "global" })
-        urls = playlist_urls_from_page(uri)
+        urls = playlist_urls_from_page(search_page)
         urls.map { |url| playlist(url: url, up_to: 0, use_web: false) }
       else
         raise ArgumentError
@@ -81,7 +80,7 @@ module VkMusic
         raise Exceptions::ParseError
       end
       raise ArgumentError unless owner_id && playlist_id
-      use_web = up_to > 200 if use_web.nil?
+      use_web ||= (up_to <= 200)
       if use_web
         playlist_web(owner_id, playlist_id, access_hash, up_to: up_to)
       else
@@ -363,6 +362,23 @@ module VkMusic
         raise Exceptions::ParseError, error.message, caller
       end
     end
+    ##
+    # Load response to AJAX post request.
+    # @param url [String, URI]
+    # @return [Nokogiri::XML::Document]
+    def load_ajax(url, query = {})
+      uri = URI(url) if url.class != URI
+      query["_ajax"] = 1
+      headers = { "Content-Type" => "application/x-www-form-urlencoded", "x-requested-with" => "XMLHttpRequest" }
+      VkMusic.debug("Loading #{uri} with query #{query}")
+      begin
+        page = @agent.post(uri, query, headers)
+        str = JSON.parse(page.body.strip)["data"][2]
+        Nokogiri::XML("<body>#{CGI.unescapeElement(str)}</body>")
+      rescue
+        raise Exceptions::RequestError
+      end
+    end
 
     ##
     # Load playlist web page.
@@ -458,6 +474,20 @@ module VkMusic
         raise Exceptions::ParseError
       end
     end
+    ##
+    # Load audios from AJAX data.
+    # @param page [Nokogiri::XML::Document]
+    # @return [Array<Audio>]
+    def audios_from_ajax(page)
+      begin
+        page.css(".audio_item.ai_has_btn").map do |elem|
+          data = JSON.parse(elem.attribute("data-audio"))
+          Audio.from_data(data, @id)
+        end
+      rescue
+        raise Exceptions::ParseError
+      end
+    end
 
     ##
     # Load playlist through web page requests.
@@ -467,26 +497,7 @@ module VkMusic
     # @param up_to [Integer] if less than 0, all audios will be loaded.
     # @return [Playlist]
     def playlist_web(owner_id, playlist_id, access_hash = nil, up_to: -1)
-      # Load first page and get info
-      first_page = load_page_playlist(owner_id, playlist_id, access_hash, offset: 0)
-      begin
-        # Parse out essential data
-        title = first_page.at_css(".audioPlaylist__title").text.strip
-        subtitle = first_page.at_css(".audioPlaylist__subtitle").text.strip
-
-        footer_node = first_page.at_css(".audioPlaylist__footer")
-        if footer_node
-          footer_match = footer_node.text.strip.match(/^\d+/)
-          real_size = footer_match ? footer_match[0].to_i : 0
-        else
-          real_size = 0
-        end
-      rescue
-        raise Exceptions::ParseError
-      end
-      # Now we can be sure we are on correct page and have essential data.
-
-      first_page_audios = audios_from_page(first_page)
+      first_page_audios, title, subtitle, real_size = playlist_first_page_web(owner_id, playlist_id, access_hash || "")
 
       # Check whether need to make additional requests
       up_to = real_size if (up_to < 0 || up_to > real_size)
@@ -514,18 +525,16 @@ module VkMusic
     # @param up_to [Integer] if less than 0, all audios will be loaded.
     # @return [Playlist]
     def playlist_json(owner_id, playlist_id, access_hash, up_to: -1)
-      # Trying to parse out audios
-      first_json = load_json_playlist_section(owner_id, playlist_id, access_hash, offset: 0)
-      begin
-        first_data = first_json["data"][0]
-        first_data_audios = audios_from_data(first_data["list"])
-      rescue
-        raise Exceptions::ParseError
+      if playlist_id == -1
+        first_audios, title, subtitle, real_size = playlist_first_page_json(owner_id, playlist_id, access_hash || "")
+      else
+        first_audios, title, subtitle, real_size = playlist_first_page_web(owner_id, playlist_id, access_hash || "")
       end
+      # NOTE: We need to load first page from web to be able to unmask links in future
 
-      real_size = first_data["totalCount"]
+      # Check whether need to make additional requests
       up_to = real_size if (up_to < 0 || up_to > real_size)
-      list = first_data_audios.first(up_to)
+      list = first_audios.first(up_to)
       while list.length < up_to do
         json = load_json_playlist_section(owner_id, playlist_id, access_hash, offset: list.length)
         audios = begin
@@ -538,11 +547,11 @@ module VkMusic
 
       begin
         Playlist.new(list,
-          id: first_data["id"],
-          owner_id: first_data["owner_id"],
-          access_hash: first_data["access_hash"],
-          title: CGI.unescapeHTML(first_data["title"].to_s),
-          subtitle: CGI.unescapeHTML(first_data["subtitle"].to_s),
+          id: playlist_id,
+          owner_id: owner_id,
+          access_hash: access_hash,
+          title: title,
+          subtitle: subtitle,
           real_size: real_size
         )
       rescue
@@ -550,6 +559,59 @@ module VkMusic
       end
     end
 
+    ##
+    # Load playlist first page in web and return essential data.
+    # @note not suitable for user audios
+    # @param owner_id [Integer]
+    # @param playlist_id [Integer]
+    # @param access_hash [String, nil]
+    # @return [Array<Array, String, String, Integer>] array with audios from first page, title, subtitle and playlist real size.
+    def playlist_first_page_web(owner_id, playlist_id, access_hash)
+      first_page = load_page_playlist(owner_id, playlist_id, access_hash, offset: 0)
+      begin
+        # Parse out essential data
+        title = first_page.at_css(".audioPlaylist__title").text.strip
+        subtitle = first_page.at_css(".audioPlaylist__subtitle").text.strip
+
+        footer_node = first_page.at_css(".audioPlaylist__footer")
+        if footer_node
+          footer_text = footer_node.text.strip
+          footer_text.gsub!(/\s/, "") # Removing all whitespace to get rid of delimiters ('1 042 audios')
+          footer_match = footer_text.match(/^\d+/)
+          real_size = footer_match ? footer_match[0].to_i : 0
+        else
+          real_size = 0
+        end
+
+        first_audios = audios_from_page(first_page)
+      rescue
+        raise Exceptions::ParseError
+      end
+      [first_audios, title, subtitle, real_size]
+    end
+
+    ##
+    # Load playlist first page in JSON and return essential data.
+    # @param owner_id [Integer]
+    # @param playlist_id [Integer]
+    # @param access_hash [String, nil]
+    # @return [Array<Array, String, String, Integer>] array with audios from first page, title, subtitle and playlist real size.
+    def playlist_first_page_json(owner_id, playlist_id, access_hash)
+      first_json = load_json_playlist_section(owner_id, playlist_id, access_hash, offset: 0)
+      begin
+        first_data = first_json["data"][0]
+        first_data_audios = audios_from_data(first_data["list"])
+      rescue
+        raise Exceptions::ParseError
+      end
+
+      real_size = first_data["totalCount"]
+      title = CGI.unescapeHTML(first_data["title"].to_s)
+      subtitle = CGI.unescapeHTML(first_data["subtitle"].to_s)
+
+      [first_data_audios, title, subtitle, real_size]
+    end
+
     ##
     # Found playlist URLs on *global* search page.
     # @param obj [Mechanize::Page, String, URI]

data/lib/vk_music/constants.rb

@@ -52,7 +52,7 @@ module VkMusic
       VK_AUDIOS_URL_POSTFIX = /^audios(-?\d+)$/
       ##
       # Playlist URL regular expression.
-      VK_PLAYLIST_URL_POSTFIX = /.*(?:audio_playlist|album\/)(-?\d+)_(\d+)(?:(?:(?:.*(?=&access_hash=)&access_hash=)|\/|%2F|_)([\da-z]+))?/
+      VK_PLAYLIST_URL_POSTFIX = /.*(?:audio_playlist|album\/|playlist\/)(-?\d+)_(\d+)(?:(?:(?:.*(?=&access_hash=)&access_hash=)|\/|%2F|_)([\da-z]+))?/
       ##
       # Post URL regular expression #1.
       VK_POST_URL_POSTFIX = /.*post(-?\d+)_(\d+)/

data/lib/vk_music/version.rb

@@ -1,5 +1,5 @@
 module VkMusic
   ##
   # Library version.
-  VERSION = "3.1.2"
+  VERSION = "3.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vk_music
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.7
 platform: ruby
 authors:
 - Fizvlad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-19 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Provides interface to work with VK music via HTTP requests