vk_music 2.1.5 → 2.2.0

data/lib/vk_music/client.rb

@@ -1,6 +1,3 @@
-require "mechanize"
-require "json"
-
 ##
 # @!macro [new] options_hash_param
 #   @param options [Hash] hash with options.
@@ -210,7 +207,7 @@ module VkMusic
 
     ##
     # @!macro [new] wall__up_to_option
-    #   @option up_to [Integer] :up_to (10) maximum amount of audios to load from wall.
+    #   @option up_to [Integer] :up_to (50) maximum amount of audios to load from wall.
     #   
     # @!macro [new] wall__with_url_option
     #   @option options [Boolean] :with_url (true) automatically use {Client#from_id} to get download URLs.
@@ -260,7 +257,7 @@ module VkMusic
         raise ArgumentError, "Bad arguments", caller
       end
 
-      options[:up_to] ||= 10
+      options[:up_to] ||= 50
       options[:with_url] = true if options[:with_url].nil?
 
       wall__json(owner_id, post_id, options)
@@ -269,6 +266,8 @@ module VkMusic
     ##
     # Get audios attached to post.
     #
+    # @note currently this method works incorrectly with reposts.
+    #
     # @overload post(url)
     #   @param url [String] URL to post.
     #
@@ -277,7 +276,7 @@ module VkMusic
     #   @option options [Integer] :owner_id numerical ID of wall owner.
     #   @option options [Integer] :post_id numerical ID of post.
     #
-    # @return [Array<Audio>] audios with download URLs.
+    # @return [Array<Audio>] array of audios. Possibly without download URL.
     def post(arg)
       begin
         case arg
@@ -294,20 +293,26 @@ module VkMusic
         raise ArgumentError, "Bad arguments", caller
       end
 
-      amount = attached_audios_amount(owner_id: owner_id, post_id: post_id)
-      wall(owner_id: owner_id, post_id: post_id, up_to: amount)
+      attached = attached_audios(owner_id: owner_id, post_id: post_id)
+      wall = wall(owner_id: owner_id, post_id: post_id, with_url: false)
+
+      no_link = attached.map do |a_empty|
+        # Here we just search for matching audios on wall
+        wall.find { |a| a.artist == a_empty.artist && a.title == a_empty.title } || a_empty
+      end
+      loaded_audios = from_id(no_link)
+      
+      loaded_audios.map.with_index { |el, i| el || no_link[i] }
     end
 
     ##
     # Get audios with download URLs by their IDs and secrets.
     #
-    # @note warning: audios must not match.
-    #
-    # @todo workaround for not unique audios in request
-    #
     # @param args [Array<Audio, Array<(owner_id, audio_id, secret_1, secret_2)>, "#{owner_id}_#{id}_#{secret_1}_#{secret_2}">]
     #
-    # @return [Array<Audio>] array of audios with download URLs.
+    # @return [Array<Audio, nil>] array of: audio with download URLs or audio
+    #   audio without URL if wasn't able to get it for audio or +nil+ if
+    #   matching element can't be retrieved for array or string.
     def from_id(args)
       begin
         args_formatted = args.map do |el| 
@@ -315,7 +320,7 @@ module VkMusic
             when Array
               el.join("_")
             when Audio
-              "#{el.owner_id}_#{el.id}_#{el.secret_1}_#{el.secret_2}"
+              el.full_id
             when String
               el # Do not change
             else
@@ -325,15 +330,29 @@ module VkMusic
       rescue
         raise ArgumentError, "Bad arguments", caller
       end
+      args_formatted.compact.uniq # Not dealing with nil or doubled IDs
       
-      result = []
+      audios = []
       args_formatted.each_slice(10) do |subarray|
         json = load__json__audios_by_id(subarray)
         subresult = audios__from_data(json["data"][0].to_a)
-        raise Exceptions::ParseError, "Result size don't match: excepected #{subarray.size}, got #{subresult.size}", caller if subresult.size != subarray.size
-        result.concat(subresult)
+        audios.concat(subresult)
+      end
+      Utility.debug("Loaded audios from ids: #{audios.map(&:pp).join(", ")}")
+
+      args.map do |el|
+        case el
+          when Array
+            audios.find { |audio| audio.owner_id == el[0].to_i && audio.id == el[1].to_i }
+          when Audio
+            next el if el.full_id.nil? # Audio was skipped
+            audios.find { |audio| audio.owner_id == el.owner_id && audio.id == el.id }
+          when String
+            audios.find { |audio| [audio.owner_id, audio.id] == el.split("_").first(2).map(&:to_i) }
+          else
+            nil # This shouldn't happen actually
+        end
       end
-      result
     end
 
     ##
@@ -436,18 +455,18 @@ module VkMusic
     end
 
     ##
-    # Get amount of audios attached to specified post.
+    # Get audios attached to specified post.
     #
-    # @overload attached_audios_amount(url)
+    # @overload attached_audios(url)
     #   @param url [String] URL to post.
     #
-    # @overload attached_audios_amount(options)
+    # @overload attached_audios(options)
     #   @macro options_hash_param
     #   @option options [Integer] :owner_id numerical ID of wall owner.
     #   @option options [Integer] :post_id numerical ID of post.
     #
-    # @return [Integer] amount of audios.
-    def attached_audios_amount(arg)
+    # @return [Array<Audio>] audios with only artist, title and duration.
+    def attached_audios(arg)
       begin
         case arg
           when String
@@ -472,7 +491,7 @@ module VkMusic
 
       raise Exceptions::ParseError, "Post not found: #{owner_id}_#{post_id}", caller unless page.css(".service_msg_error").empty?
       begin
-        result = page.css(".wi_body > .pi_medias .medias_audio").size
+        result = page.css(".wi_body > .pi_medias .medias_audio").map { |e| Audio.from_node(e, @id) }
       rescue Exception => error
         raise Exceptions::ParseError, "Unable to get amount of audios in post #{owner_id}_#{post_id}. Error: #{error.message}", caller
       end
@@ -623,10 +642,6 @@ module VkMusic
 
     # Load playlist through JSON requests.
     def playlist__json(owner_id, playlist_id, access_hash, options)
-      if options[:up_to] < 0 || options[:up_to] > 100
-        Utility.warn("Current implementation of this method is not able to return more than 100 first audios with URL.")
-      end
-
       # Trying to parse out audios
       begin
         first_json = load__json__playlist_section(owner_id, playlist_id, access_hash, offset: 0)

data/lib/vk_music/link_decoder.rb

@@ -1,5 +1,3 @@
-require "execjs"
-
 module VkMusic
 
   ##

data/lib/vk_music/utility.rb

@@ -1,6 +1,3 @@
-require "cgi"
-require "logger"
-
 module VkMusic
 
   ##
@@ -108,6 +105,29 @@ module VkMusic
           raise ArgumentError, "Bad arguments", caller
       end
     end
+
+    ##
+    # Get content of text children of provided Node.
+    #
+    # @param node [Nokogiri::Xml::Node]
+    #
+    # @return [String]
+    def self.plain_text(node)
+      node.children.select(&:text?).map(&:text).join ""
+    end
+
+    ##
+    # Turn human readable track length to its size in seconds.
+    #
+    # @param str [String] string in format "(HH:MM:SS)" or something alike.
+    #
+    # @return [Integer] amount of seconds.
+    def self.parse_duration(str)
+      str.scan(/\d+/)
+         .map(&:to_i)
+         .reverse
+         .each_with_index.reduce(0) { |m, arr| m + arr[0] * 60**arr[1] }
+    end
     
   end
   

data/lib/vk_music/version.rb

@@ -0,0 +1,7 @@
+module VkMusic
+
+  ##
+  # Library version.
+  VERSION = "2.2.0"
+
+end

data/vk_music.gemspec

@@ -1,22 +1,40 @@
-Gem::Specification.new do |s|
-  s.name           = "vk_music"
-  s.summary        = "Provides interface to work with VK music via HTTP requests"
-  s.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."
-  s.version        = "2.1.5"
-  s.author         = "Kuznetsov Vladislav"
-  s.email          = "fizvlad@mail.ru"
-  s.homepage       = "https://github.com/fizvlad/vk-music-rb"
-  s.platform       = Gem::Platform::RUBY
-  s.required_ruby_version = ">=2.3.1"
-  s.files          = Dir[ "bin/**/**", "lib/**/**", "test/**/**", "LICENSE", "Rakefile", "README.md", "vk_music.gemspec" ]
-  s.test_files     = Dir[ "test/test*.rb" ]
-  s.license        = "MIT"
-  
-  s.add_runtime_dependency "mechanize", "~>2.7"
-  s.add_runtime_dependency "net-http-persistent", "2.9.4" # Required for mechanize. Future versions cause error.
-  s.add_runtime_dependency "execjs",    "~>2.7"
-  s.add_runtime_dependency "json",      "~>2.0"
-
-  s.add_development_dependency "rake", "~>12.3"
-  s.add_development_dependency "yard", "~>0.9"
-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", "~> 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

metadata

@@ -1,45 +1,87 @@
 --- !ruby/object:Gem::Specification
 name: vk_music
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.2.0
 platform: ruby
 authors:
-- Kuznetsov Vladislav
+- Fizvlad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-03 00:00:00.000000000 Z
+date: 2019-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: mechanize
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
-  type: :runtime
+        version: '2.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: net-http-persistent
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.4
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.4
+        version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: execjs
+  name: mechanize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -53,58 +95,64 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.7'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.9.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.9.4
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: execjs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
-  type: :development
+        version: '2.7'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
+        version: '2.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '2.0'
 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.
-email: fizvlad@mail.ru
+email:
+- fizvlad@mail.ru
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
+- ".gitignore"
+- ".travis.yml"
+- Gemfile
+- Gemfile.lock
+- LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
+- bin/setup
 - lib/vk_music.rb
 - lib/vk_music/audio.rb
 - lib/vk_music/client.rb
@@ -113,21 +161,15 @@ files:
 - lib/vk_music/link_decoder.rb
 - lib/vk_music/playlist.rb
 - lib/vk_music/utility.rb
-- test/test_attached_audios_amount.rb
-- test/test_audios.rb
-- test/test_find.rb
-- test/test_from_id.rb
-- test/test_last_post_id.rb
-- test/test_login.rb
-- test/test_page_id.rb
-- test/test_playlist.rb
-- test/test_post.rb
-- test/test_wall.rb
+- lib/vk_music/version.rb
 - vk_music.gemspec
 homepage: https://github.com/fizvlad/vk-music-rb
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: https://github.com/fizvlad/vk-music-rb
+  source_code_uri: https://github.com/fizvlad/vk-music-rb
+  changelog_uri: https://github.com/fizvlad/vk-music-rb/releases
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -147,14 +189,4 @@ rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Provides interface to work with VK music via HTTP requests
-test_files:
-- test/test_attached_audios_amount.rb
-- test/test_audios.rb
-- test/test_find.rb
-- test/test_from_id.rb
-- test/test_last_post_id.rb
-- test/test_login.rb
-- test/test_page_id.rb
-- test/test_playlist.rb
-- test/test_post.rb
-- test/test_wall.rb
+test_files: []