vk_music 3.0.1 → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c51759b83b9c94ae99db4f957e80f9d7e071d998e171813dd33ccb1883d8d5c
-  data.tar.gz: abd153ed90bc234046c4e38f41870fb66bc38ae390d7755cadce110b54c384bc
+  metadata.gz: aec492ae7fcb04bbc070c56a30110424661fdfda1766a70687bc14f476cd7d65
+  data.tar.gz: dba67eac6a1fe2563995e27d82f01f63f747fa15d06dd39704f6b3e1dffa54b2
 SHA512:
-  metadata.gz: f5476442c461a25f5753cc707238ba01ee9d0cd1a180be23d8d5f7d3f46439a61bfc05106c15396745a62f2a5c8da6590c1c03f83cc0f86f5d10e95026a02505
-  data.tar.gz: 8aade904f7fe57f4c073686a9aa15173083b6ed86ec30863723573fab391daacc2a6288cb3c47fdb253d806fa3607a5c3c0ee37c152b8a38df158c2145d6ebd2
+  metadata.gz: be3afe5a234742fac06fe01a57439ba2f5ca8f8d4ff1a81ea8d74c611f03876adfa41e967dec9598fa62d84bb73f9426d81e7e054f96d7d64c24efe4bfff8427
+  data.tar.gz: '09502160a7456174ba2f74841ed749ae34ecf5003e545b3381d43494f372fb064c9363d2e3df9167f6de9ba6ecb7a58a4abafde8ba99888d736e28cdbacd483c'

data/Gemfile.lock

@@ -1,66 +1,70 @@
-PATH
-  remote: .
-  specs:
-    vk_music (3.0.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.2.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.7-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 (10.5.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.6)
-    webrobots (0.1.2)
-    yard (0.9.20)
-
-PLATFORMS
-  x64-mingw32
-
-DEPENDENCIES
-  bundler (~> 2.0)
-  logger (~> 1.4)
-  mechanize (~> 2.7)
-  minitest (~> 5.0)
-  pry (~> 0.12.2)
-  rake (~> 10.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/README.md

@@ -71,6 +71,13 @@ audios = client.post(url: "https://vk.com/wall-4790861_5453")
 urls = audios.map(&:url) # URLs for every audio
 ```
 
+### Recommended audios and etc
+You can load audios from recommended sections, novices and VK charts:
+
+```ruby
+audios = client.block(url: "https://m.vk.com/audio?act=block&block=PUlQVA8GR0R3W0tMF2teRGpJUVQPGVpfdF1YRwMGXUpkXktMF2tYUWRHS0IXDlpKZFpcVA8FFg")
+```
+
 
 ## Development
 

data/bin/console

@@ -7,4 +7,18 @@ require "vk_music"
 # with your gem easier. You can also use a different console, if you like.
 
 require "pry"
+
+print "Login (leave this empty if no login required): "
+username = STDIN.gets.chomp
+
+unless username.empty?
+  print "Password: "
+  password = STDIN.gets.chomp
+  puts
+
+  $client = VkMusic::Client.new(username: username, password: password)
+  puts "You can now access client at $client"
+end
+puts
+
 Pry.start

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

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
@@ -196,6 +196,7 @@ module VkMusic
       end
     end
     alias_method :from_id, :get_urls
+
     ##
     # Update download URLs of audios.
     # @param audios [Array<Audio>]
@@ -207,6 +208,25 @@ module VkMusic
       end
     end
 
+    ##
+    # Retrieve audios from recommendations or alike pages.
+    # Specify either +url+ or +block_id+.
+    # @param url [String] URL.
+    # @param block_id [String] ID of block.
+    # @return [Array<Audio>] array of audios attached to post. Most of audios will
+    #   already have download URLs, but there might be audios which can't be resolved.
+    def block(url: nil, block_id: nil)
+      begin
+        block_id = url.match(Constants::Regex::VK_BLOCK_URL).captures.first if url
+      rescue
+        raise Exceptions::ParseError
+      end
+
+      uri = URI(Constants::URL::VK[:audios])
+      uri.query = Utility.hash_to_params({ "act" => "block", "block" => block_id })
+      audios_from_page(uri)
+    end
+
     ##
     # @!endgroup
 
@@ -447,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)
@@ -494,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
@@ -518,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
@@ -530,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

@@ -22,7 +22,7 @@ module VkMusic
         login_action: "https://login.vk.com",
         wall: "https://m.vk.com/wall",
         audio_unavailable: "https://m.vk.com/mp3/audio_api_unavailable.mp3",
-        profile_audios: "https://m.vk.com/audios",
+        profile_audios: "https://m.vk.com/audios"
       }
     end
 
@@ -52,13 +52,16 @@ 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+)/
       ##
       # Post URL regular expression #2.
       VK_WALL_URL_POSTFIX = /.*wall(-?\d+)_(\d+)/
+      ##
+      # Audios block ID
+      VK_BLOCK_URL = /(?:section=recoms_block&type=|act=block&block=)([a-zA-Z\d]+)/
     end
 
     ##

data/lib/vk_music/utility.rb

@@ -29,6 +29,8 @@ module VkMusic
           :playlist
         when Constants::Regex::VK_WALL_URL_POSTFIX, Constants::Regex::VK_POST_URL_POSTFIX
           :post
+        when Constants::Regex::VK_BLOCK_URL
+          :block
         when Constants::Regex::VK_URL
           :audios
         else

data/lib/vk_music/version.rb

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

data/vk_music.gemspec

@@ -1,40 +1,40 @@
-lib = File.expand_path("lib", __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "vk_music/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "vk_music"
-  spec.version       = VkMusic::VERSION
-  spec.authors       = ["Fizvlad"]
-  spec.email         = ["fizvlad@mail.ru"]
-
-  spec.summary       = "Provides interface to work with VK music via HTTP requests"
-  spec.description   = "Library to work with audios on popular Russian social network vk.com. VK disabled their public API for audios, so it is now necessary to use parsers instead."
-  spec.homepage      = "https://github.com/fizvlad/vk-music-rb"
-  spec.license       = "MIT"
-
-  spec.required_ruby_version = ">=2.3.1"
-
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/fizvlad/vk-music-rb"
-  spec.metadata["changelog_uri"] = "https://github.com/fizvlad/vk-music-rb/releases"
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "yard", "~>0.9"
-  spec.add_development_dependency "minitest", "~> 5.0"
-
-  spec.add_runtime_dependency "logger", "~>1.4"
-  spec.add_runtime_dependency "mechanize", "~>2.7"
-  spec.add_runtime_dependency "net-http-persistent", "2.9.4" # Required for mechanize. Future versions cause error.
-  spec.add_runtime_dependency "execjs", "~>2.7"
-  spec.add_runtime_dependency "json", "~>2.0"
-end
+lib = File.expand_path("lib", __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "vk_music/version"
+
+Gem::Specification.new do |spec|
+  spec.name          = "vk_music"
+  spec.version       = VkMusic::VERSION
+  spec.authors       = ["Fizvlad"]
+  spec.email         = ["fizvlad@mail.ru"]
+
+  spec.summary       = "Provides interface to work with VK music via HTTP requests"
+  spec.description   = "Library to work with audios on popular Russian social network vk.com. VK disabled their public API for audios, so it is now necessary to use parsers instead."
+  spec.homepage      = "https://github.com/fizvlad/vk-music-rb"
+  spec.license       = "MIT"
+
+  spec.required_ruby_version = ">=2.3.1"
+
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://github.com/fizvlad/vk-music-rb"
+  spec.metadata["changelog_uri"] = "https://github.com/fizvlad/vk-music-rb/releases"
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "yard", "~>0.9"
+  spec.add_development_dependency "minitest", "~> 5.0"
+
+  spec.add_runtime_dependency "logger", "~>1.4"
+  spec.add_runtime_dependency "mechanize", "~>2.7"
+  spec.add_runtime_dependency "net-http-persistent", "2.9.4" # Required for mechanize. Future versions cause error.
+  spec.add_runtime_dependency "execjs", "~>2.7"
+  spec.add_runtime_dependency "json", "~>2.0"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vk_music
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.5
 platform: ruby
 authors:
 - Fizvlad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-12 00:00:00.000000000 Z
+date: 2020-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement