vk_music 3.1.3 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c327f0b3925e4ed7f0def0ef082ea982867e49ce73e9e9a8d8aa2d1bc05f044
-  data.tar.gz: cb2e29ae86aff312032d86c9fa6259fccffb2bd0ea988d51416a69a6d935634a
+  metadata.gz: 745b91709f47cb2b6b5bcaa013824a51f836977ecbe4cd1259a74d4a6f56e8c8
+  data.tar.gz: 9a7a2e9998adcd73a0c87d2934c6e763e8c76fdedcf08f757543497395e64322
 SHA512:
-  metadata.gz: 6f1ad6834b2234ef252f44ad383b3d2fc5094c667e61a78fb4d84d1fe62d422b29d163c0c5a84da532ca313dbc9c62432e051b1eeb672ce941de3a84486d91ec
-  data.tar.gz: 0b0d8dcff331325d6f4ee617683465e8ba4a15f48b3224250972d2d7082cb3b978b9b1371a570be7211a6fca8cd986e6447c9698e32c1ea055246adc796e903f
+  metadata.gz: 1bd33552a23e56c0372500fc1edc20736afed079f650d4405650a91a48d01300269aeb37f51935c2c9916c4ee52449b7abb29949e7b32eb572e4641ac0e05e13
+  data.tar.gz: a252e563da14bcf249e72ab997414dbdb14388fa2308f24afc99f0507d6c003bfd5f80e0335db8df30b8d1eb7300036c2380ad99fd47cf402083238891c4ba17

data/lib/vk_music/client.rb

@@ -81,7 +81,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
@@ -467,26 +467,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 +495,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 +517,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 +529,57 @@ 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_match = footer_node.text.strip.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.3"
+  VERSION = "3.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vk_music
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.4
 platform: ruby
 authors:
 - Fizvlad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-09 00:00:00.000000000 Z
+date: 2020-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler