vk_music_loader 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9487bed8735df5dec33b4295a2d70b28cec9d7f1
-  data.tar.gz: 3320b8a52fcf60e408c0aa412ab5f9508d87d8f8
+  metadata.gz: d90ff47d1e518d8014179a9bb389fcae197c4e19
+  data.tar.gz: b4c5432cf4e3a91fe72ebb7ea1e2edd7d879234a
 SHA512:
-  metadata.gz: 8da45f9d965ef76e98dc6e088354389d76c9bf47de021e3c740ecd16a4ac8aadc2810ff58d79775dff019c3d2ae87856e34acdef9a0b5107bac21f219b2af160
-  data.tar.gz: c852c6fc59de8494da3d92917d3be15f15d1b447e97a4de9d80ceae21ef2e76e5c10611d40dfa53c0a43ec2d0756bf82d5ac58694127520378ac0c94299c23e7
+  metadata.gz: d2651974018eae6dc81846e626bc4053acb0ec3003bf7948c4a8611a863e36f6201a54ca6c6b5e180fba7ac9e79bc420bf96513de34072047dc0687b99fe3ce1
+  data.tar.gz: bed398b138a2e19a3b563110ed52f419193fb06a2a9b19ccdeb4c598bd687620db84ad2ce615e8c50bdcc7dae4ed7cd307673dc1111d96e7f263d9d4d8820657

data/README.md

@@ -2,7 +2,8 @@
 
 <a href="https://vk.com"><img src="https://cdn2.iconfinder.com/data/icons/vkontakte-3/154/api-vk-vkontakte-programming-128.png" align="left" hspace="10" vspace="6" width="50" height="50"></a>
 
-**VK Music Loader** is a simple CLI Ruby gem to download music from VK (ВКонта́кте) using easy and convenient way of authorization  - [Implicit Flow](https://new.vk.com/dev/implicit_flow_user)
+**VK Music Loader** is a simple CLI Ruby gem to download music from VK (ВКонта́кте) ~~using easy and convenient way of authorization  - [Implicit Flow](https://new.vk.com/dev/implicit_flow_user)~~
+using [mirror of VK Audio API](http://api.xn--41a.ws/)
 This gem aimed at Ruby 2.0 or later.
 
 ## Installation
@@ -13,13 +14,19 @@ $ gem install vk_music_loader
 
 ## Usage
 
-To login you will need [create Standalone Application](https://new.vk.com/editapp?act=create) or use the author's application (default APP ID: `5377636`)
+~~To login you will need [create Standalone Application](https://new.vk.com/editapp?act=create) or use the author's application (default APP ID: `5377636`)~~
+From December 16, 2016, the public API for working with audio files will be disabled. 
+Existing methods for the audio section will be unavailable for calling, except for methods regarding audio file uploads.
+([source](source))
+
+So you need to use a [mirror of VK Audio API](http://api.xn--41a.ws/) and buy an authentication key: http://api.xn--41a.ws/addmoney/.
+I think 1$ is enough for a long time (100k requests) for personal use or also you can write to me to share my key.
 
 ```sh
 $ vk_music_loader -id USER_OR_GROUP_ID
 $ vk_music_loader -q QUERY_SEARCH
-  [ -app (or -app, --app, -application, --application) your_standalone_app_id (default: 5377636) ]
-  [ -count (or count, -count, --count, c, -c, --c) count_of_songs ]
+  [ -key (or key, --key, -k) your_auth_key (need only enter the first time after it is saved) ]
+  [ -count (or count, -count, --count, c, -c, --c) count_of_songs (default: 300) ]
   [ -folder (or -folder, --folder, path, -path, --path, -p) folder_path_to_download_music (default: 'music') ]
   [ -random (or  --random, shuffle, -shuffle, --shuffle, -r) shuffle_download_flag (default: false) ]
 ```

data/lib/vk_music_loader.rb

@@ -8,7 +8,6 @@ require 'net/http'
 require 'openssl'
 require 'json'
 require 'slop'
-require 'launchy'
 
 require 'vk_music_loader/authorizer'
 require 'vk_music_loader/songs_downloader'
@@ -17,7 +16,7 @@ module VkMusicLoader
   def self.call
     begin
       opts = Slop.parse uppress_errors: true do |o|
-        o.integer 'app', '-app', '--app', '-application', '-application', default: 5377636 # author's application (you can use it)
+        o.string 'key', '-key', '--key', '-k'
         o.integer 'id', '-id', '--id', '-user-id', '--user-id', '-group-id', '--group-id'
         o.string 'query', '-query', '--query', '-q', 'search', '-search', '--search'
         o.integer 'count', '-count', '--count', 'c', '-c', '--c'
@@ -26,7 +25,7 @@ module VkMusicLoader
       end
 
       if opts[:id] || opts[:query]
-        auth_token = VkMusicLoader::Authorizer.new(opts[:app]).perform
+        auth_token = VkMusicLoader::Authorizer.new(opts[:key]).perform
         VkMusicLoader::SongsDownloader.new(auth_token, opts).perform
       else
         puts 'No user id or group id or query'

data/lib/vk_music_loader/authorizer.rb

@@ -2,78 +2,64 @@ module VkMusicLoader
   class Authorizer
     AUTH_FILE_PATH = File.expand_path('~') + '/.vk_music_loader/auth_data'
 
-    AUTHORIZE_API_PATH = 'https://oauth.vk.com/authorize'
-    QUERY_PARAMS = {
-        scope: 'audio',
-        redirect_uri: 'http://oauth.vk.com/blank.html',
-        display: 'page',
-        response_type: 'token'
-    }
+    API_CHECK_AUDIO_METHOD_PATH = 'http://api.xn--41a.ws/api.php'
 
-    def initialize(app_id)
-      @app_id = app_id
+    def initialize(auth_key = nil)
+      @auth_key = auth_key
     end
 
-    def perform
-      get_auth_token
-    end
-
-    private
+    def self.auth_key_valid?(auth_key)
+      uri = URI(API_CHECK_AUDIO_METHOD_PATH)
+      uri.query = URI.encode_www_form(key: auth_key, method: :by_owner, owner_id: :dummy)
 
-    attr_reader :app_id
+      req = Net::HTTP::Get.new(uri)
+      res = Net::HTTP.new(uri.host, uri.port).request(req)
 
-    def query_params
-      QUERY_PARAMS.merge(client_id: app_id)
+      res.body != 'wrong key' && res.body != 'key wrong format'
     end
 
-    def build_uri
-      uri = URI(AUTHORIZE_API_PATH)
-      uri.query = URI.encode_www_form(query_params)
-      uri
+    def perform
+      get_auth_token
     end
 
-    def get_auth_params_from_browser_bar(uri)
-      ARGV.clear
-
-      Launchy.open(uri)
-      puts 'Paste full URL from browser bar and press ENTER: '
-      CGI.parse(URI(gets.chomp.strip).fragment)
-    end
+    private
 
-    def save_auth_params_to_file
-      auth_params = get_auth_params_from_browser_bar(build_uri)
+    attr_reader :auth_key
 
+    def save_auth_params_to_file(auth_key)
       dir_path = File.dirname(AUTH_FILE_PATH)
       Dir.mkdir(dir_path) unless File.exists?(dir_path)
 
       auth_file = File.open(AUTH_FILE_PATH, 'w')
-      auth_file.puts(Time.new + auth_params['expires_in'].first.to_i)
-      auth_file.puts(auth_params['access_token'].first)
-      auth_file.puts(auth_params['user_id'].first)
+      auth_file.puts(auth_key)
       auth_file.close
     end
 
     def get_auth_params_from_file
-      auth_file = File.open(AUTH_FILE_PATH, 'r')
+      begin
+        auth_file = File.open(AUTH_FILE_PATH, 'r')
 
-      expires_in = auth_file.readline
-      access_token = auth_file.readline.chomp
-      auth_file.close
+        auth_key = auth_file.readline.chomp
+        auth_file.close
 
-      access_token if Time.parse(expires_in) > Time.new
+        auth_key
+      rescue
+        nil
+      end
     end
 
     def get_auth_token
-      begin
-        auth_token = get_auth_params_from_file
-        unless auth_token.nil?
+      auth_token = auth_key || get_auth_params_from_file
+
+      unless auth_token.nil?
+        if Authorizer.auth_key_valid?(auth_token)
+          save_auth_params_to_file(auth_token)
           auth_token
         else
-          raise 'The validity of the token has expired'
+          abort('Invalid authentication key')
         end
-      rescue
-        save_auth_params_to_file
-        retry
+      else
+        abort('No authentication key')
       end
     end
   end

data/lib/vk_music_loader/songs_downloader.rb

@@ -1,87 +1,126 @@
 module VkMusicLoader
   class SongsDownloader
-    API_AUDIO_METHOD_PATHS = {
-        get: 'https://api.vk.com/method/audio.get',
-        search: 'https://api.vk.com/method/audio.search'
-    }
+    API_AUDIO_METHOD_PATH = 'http://api.xn--41a.ws/api.php'
 
     QUERY_PARAMS = {
-        v: '5.53'
+        by_owner: {
+            method: 'by_owner'
+        },
+        search: {
+            method: 'search'
+        },
+        get: {
+            method: 'get.audio'
+        }
     }
 
-    def initialize(auth_token, opts)
-      @auth_token = auth_token
+    SONGS_LIMIT = 300
+    SONGS_LIMIT_REQUEST = 10
+
+    def initialize(auth_key, opts)
+      @auth_key = auth_key
       @opts = opts
     end
 
     def perform
-      raw_playlist = get_raw_playlist
-
-      if raw_playlist['error']
-        puts raw_playlist['error']['error_msg']
-      else
-        download_songs(get_milled_playlist(raw_playlist))
-      end
+      get_songs_urls_and_download(get_playlist)
     end
 
     private
 
-    attr_reader :auth_token, :opts
+    attr_reader :opts, :auth_key
 
-    def query_params
-      merged_query_params = QUERY_PARAMS.merge(access_token: auth_token)
+    def build_query_params_for_ids
+      merged_query_params = audio_method_params
       merged_query_params[:owner_id] = opts[:id] unless opts[:query]
       merged_query_params[:q] = opts[:query] unless opts[:id]
-      merged_query_params[:count] = 300 if opts[:query]
-      # In other cases, do not set the number of audios, because bug: https://new.vk.com/bugs?act=show&id=5502832_1
+      merged_query_params[:key] = auth_key
+
+      merged_query_params
+    end
+
+    def build_query_params_for_urls(songs_ids_list)
+      merged_query_params = QUERY_PARAMS[:get]
+      merged_query_params[:ids] = songs_ids_list.join(',')
+      merged_query_params[:key] = auth_key
 
       merged_query_params
     end
 
-    def audio_method_path
+    def audio_method_params
       if opts[:id]
-        API_AUDIO_METHOD_PATHS[:get]
+        QUERY_PARAMS[:by_owner]
       elsif opts[:query]
-        API_AUDIO_METHOD_PATHS[:search]
+        QUERY_PARAMS[:search]
       end
     end
 
-    def build_uri
-      uri = URI(audio_method_path)
+    def build_uri(query_params)
+      uri = URI(API_AUDIO_METHOD_PATH)
       uri.query = URI.encode_www_form(query_params)
       uri
     end
 
     def build_http(uri)
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      http
+      Net::HTTP.new(uri.host, uri.port)
     end
 
-    def get_raw_playlist
-      uri = build_uri
+    def get_playlist
+      uri = build_uri(build_query_params_for_ids)
+
       req = Net::HTTP::Get.new(uri)
       res = build_http(uri).request(req)
 
-      JSON.parse(res.body)
+      begin
+        JSON.parse(res.body)
+      rescue
+        abort('Perhaps a user or group with such id does not exist or limited by privacy settings')
+      end
     end
 
-    def get_milled_playlist(raw_playlist)
-      songs = raw_playlist['response']['items']
-      songs_count = opts[:count] || songs.count
+    def get_songs_urls_and_download(raw_playlist)
+      songs_ids_list = raw_playlist['list'].map { |song_info| "#{song_info[1]}_#{song_info[0]}" }
+      filtered_songs_ids_list = filter_playlist(songs_ids_list)
 
-      opts[:random] ? songs.sample(songs_count) : songs.take(songs_count)
-    end
-
-    def download_songs(playlist)
       Dir.mkdir(opts[:folder]) unless File.exists?(opts[:folder])
+      final_downloads_count = 0
 
-      downloads_count = 0
+      filtered_songs_ids_list.each_slice(SONGS_LIMIT_REQUEST) do |ids|
+        query_params = build_query_params_for_urls(ids)
 
-      playlist.each do |song|
-        song_url = URI.parse(song['url'])
-        file_name = "#{song['artist']} - #{song['title']}".slice(0, 100).gsub(/[\x00\/\\:\*\?\"<>\|]/, '_') + '.mp3'
+        uri = build_uri(query_params)
+        req = Net::HTTP::Get.new(uri)
+        res = build_http(uri).request(req)
+
+        begin
+          final_downloads_count += download_songs(JSON.parse(res.body)
+            .map { |song_info| { url: song_info[2], title: song_info[3], artist: song_info[4] } })
+        rescue JSON::ParserError
+          puts 'Some songs download failed'
+        end
+      end
+
+      puts "-----> Downloaded #{final_downloads_count} songs in #{opts[:folder]}"
+      puts "-----> The other #{filtered_songs_ids_list.count - final_downloads_count} songs have been already downloaded" if
+          filtered_songs_ids_list.count - final_downloads_count > 0
+    end
+
+    def filter_playlist(playlist)
+      if !opts[:random] && opts[:count]
+        playlist.take(opts[:count])
+      elsif opts[:random] && !opts[:count]
+        playlist.sample(SONGS_LIMIT)
+      elsif opts[:random] && opts[:count]
+        playlist.sample(opts[:count])
+      else
+        playlist
+      end
+    end
+
+    def download_songs(playlist)
+      playlist.inject(0) do |count, song|
+        song_url = URI.parse(song[:url])
+        file_name = "#{song[:artist]} - #{song[:title]}".slice(0, 100).gsub(/[\x00\/\\:\*\?\"<>\|]/, '_') + '.mp3'
         file_path = "#{opts[:folder]}/#{file_name}"
 
         unless File.file?(file_path)
@@ -89,15 +128,13 @@ module VkMusicLoader
             f.write Net::HTTP.get(song_url)
             f.close
 
-            downloads_count += 1
             puts "Downloaded: #{file_name}"
+            count += 1
           end
         end
-      end
 
-      puts "-----> Downloaded #{downloads_count} songs in #{opts[:folder]}"
-      puts "-----> The other #{playlist.count - downloads_count} songs have been already downloaded" if
-          playlist.count - downloads_count > 0
+        count
+      end
     end
   end
 end

data/lib/vk_music_loader/version.rb

@@ -1,3 +1,3 @@
 module VkMusicLoader
-  VERSION = '0.2.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: vk_music_loader
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Anatoly Ryabov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2017-01-06 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: launchy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement
@@ -52,7 +38,6 @@ files:
 - lib/vk_music_loader.rb
 - lib/vk_music_loader/authorizer.rb
 - lib/vk_music_loader/songs_downloader.rb
-- lib/vk_music_loader/trash.rb
 - lib/vk_music_loader/version.rb
 homepage: https://github.com/m1neral/vk_music_loader
 licenses:
@@ -79,4 +64,3 @@ signing_key:
 specification_version: 4
 summary: Simple gem to download VK user/group audio playlist.
 test_files: []
-has_rdoc: 

data/lib/vk_music_loader/trash.rb

@@ -1,32 +0,0 @@
-require 'rubygems'
-require 'time'
-require 'cgi'
-require 'uri'
-require 'net/http'
-require 'openssl'
-require 'json'
-require 'slop'
-require 'launchy'
-
-require '../vk_music_loader/authorizer'
-require '../vk_music_loader/songs_downloader'
-
-begin
-  opts = Slop.parse uppress_errors: true do |o|
-    o.integer 'app', '-app', '--app', '-application', '-application', default: 5377636 # author's application (you can use it)
-    o.integer 'id', '-id', '--id', '-user-id', '--user-id', '-group-id', '--group-id'
-    o.string 'query', '-query', '--query', '-q', 'search', '-search', '--search'
-    o.integer 'count', '-count', '--count', 'c', '-c', '--c'
-    o.string 'folder', '-folder', '--folder', 'path', '-path', '--path', '-p', default: 'audio'
-    o.bool 'random', '-random', '--random', 'shuffle', '-shuffle', '--shuffle', '-r'
-  end
-
-  if opts[:id] || opts[:query]
-    auth_token = VkMusicLoader::Authorizer.new(opts[:app]).perform
-    VkMusicLoader::SongsDownloader.new(auth_token, opts).perform
-  else
-    puts 'No user id or group id or query'
-  end
-rescue Slop::Error => e
-  puts e.message
-end