vk_music 3.1.1 → 3.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa5586e89dfad05d417c5b0c2466a561091c4a9383857da45fee1ee126f8b6a5
-  data.tar.gz: f4c788d950d1a36e25df46e7edbfe4507dc21078f35956f6503f18832c91b7c0
+  metadata.gz: 6142de69f08e3ca82697048c3062fc42eea675370f64e678433f8587edc4011e
+  data.tar.gz: 8321b28592040daf8af1880c0fb15a1969ba33017cdd9a2919063c43f446ce9e
 SHA512:
-  metadata.gz: 99793ea61b1020faa0290d94adfcbb9734deb1f7770a8f9fb5bd390ed686fe138d32f72ce5a4d2ebb80d120ed98af19179f6481d810aba63163f158d8fe05ab8
-  data.tar.gz: 0274015ac09a8189c09fdb9979c784607a08c67b4f090149e3306b73915cfd68b78c2aa729f117bf392e8bfff42e432dd303843bb7db0afe27a39f8bcd45423c
+  metadata.gz: 21d19b28d4141f33ae545a5216ec6ee192df00de769b9f8cb2f9b856a997662d8bd31560f1846dac7370b142d8182baa0789d3dfa2599afc7d8bf8408f142ea5
+  data.tar.gz: e431fd771443125940ef2bb3fc611b63d3f9c7d3818caf0712af3103331f6d0643c02b3bdf5aacba61852447e10ef854cfeeb9b47a3a63278a9349585094f751

data/Gemfile.lock

@@ -1,69 +1,70 @@
-PATH
-  remote: .
-  specs:
-    vk_music (3.1.0)
-      execjs (~> 2.7)
-      json (~> 2.0)
-      logger (~> 1.4)
-      mechanize (~> 2.7)
-      net-http-persistent (= 2.9.4)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    coderay (1.1.2)
-    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)
-    mechanize (2.7.6)
-      domain_name (~> 0.5, >= 0.5.1)
-      http-cookie (~> 1.0)
-      mime-types (>= 1.17.2)
-      net-http-digest_auth (~> 1.1, >= 1.1.1)
-      net-http-persistent (>= 2.5.2)
-      nokogiri (~> 1.6)
-      ntlm-http (~> 0.1, >= 0.1.1)
-      webrobots (>= 0.0.9, < 0.2)
-    method_source (0.9.2)
-    mime-types (3.3)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
-    mini_portile2 (2.4.0)
-    minitest (5.13.0)
-    net-http-digest_auth (1.4.1)
-    net-http-persistent (2.9.4)
-    nokogiri (1.10.8)
-      mini_portile2 (~> 2.4.0)
-    nokogiri (1.10.8-x64-mingw32)
-      mini_portile2 (~> 2.4.0)
-    ntlm-http (0.1.1)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rake (13.0.1)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.6)
-    webrobots (0.1.2)
-    yard (0.9.20)
-
-PLATFORMS
-  ruby
-  x64-mingw32
-
-DEPENDENCIES
-  bundler (~> 2.0)
-  logger (~> 1.4)
-  mechanize (~> 2.7)
-  minitest (~> 5.0)
-  pry (~> 0.12.2)
-  rake (~> 13.0)
-  vk_music!
-  yard (~> 0.9)
-
-BUNDLED WITH
-   2.0.2
+PATH
+  remote: .
+  specs:
+    vk_music (3.1.5)
+      execjs (~> 2.7)
+      json (~> 2.0)
+      logger (~> 1.4)
+      mechanize (~> 2.7)
+      net-http-persistent (= 2.9.4)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    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.1)
+    logger (1.4.2)
+    mechanize (2.7.6)
+      domain_name (~> 0.5, >= 0.5.1)
+      http-cookie (~> 1.0)
+      mime-types (>= 1.17.2)
+      net-http-digest_auth (~> 1.1, >= 1.1.1)
+      net-http-persistent (>= 2.5.2)
+      nokogiri (~> 1.6)
+      ntlm-http (~> 0.1, >= 0.1.1)
+      webrobots (>= 0.0.9, < 0.2)
+    method_source (0.9.2)
+    mime-types (3.3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2020.0512)
+    mini_portile2 (2.4.0)
+    minitest (5.14.1)
+    net-http-digest_auth (1.4.1)
+    net-http-persistent (2.9.4)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
+    nokogiri (1.10.10-x64-mingw32)
+      mini_portile2 (~> 2.4.0)
+    ntlm-http (0.1.1)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    rake (13.0.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.7)
+    unf_ext (0.0.7.7-x64-mingw32)
+    webrobots (0.1.2)
+    yard (0.9.25)
+
+PLATFORMS
+  ruby
+  x64-mingw32
+
+DEPENDENCIES
+  bundler (~> 2.0)
+  logger (~> 1.4)
+  mechanize (~> 2.7)
+  minitest (~> 5.0)
+  pry (~> 0.12.2)
+  rake (~> 13.0)
+  vk_music!
+  yard (~> 0.9)
+
+BUNDLED WITH
+   2.1.4

data/lib/vk_music/audio.rb

@@ -120,6 +120,7 @@ module VkMusic
       @owner_id = owner_id
       @secret_1 = secret_1
       @secret_2 = secret_2
+      @secret_1 = @secret_2 if @secret_1.nil? || @secret_1.empty?
       @artist = artist.strip
       @title = title.strip
       @duration = duration
@@ -152,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

@@ -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,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.1"
+  VERSION = "3.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vk_music
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.6
 platform: ruby
 authors:
 - Fizvlad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-19 00:00:00.000000000 Z
+date: 2020-09-07 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.2
 signing_key: 
 specification_version: 4
 summary: Provides interface to work with VK music via HTTP requests