vk_music 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25c3df47d7b4d786a9ee10b0eb5c899f572c58d4bc9a634cbbf70d46c93a8c36
-  data.tar.gz: e55054576e38c23768e31646d2ca8217f60abd85256ea0d6dd2ea9d25eee73d0
+  metadata.gz: 9d584af9c00d7c7f501ceec5ca75d802bdb3bc921208cec733b58d174d52d9f9
+  data.tar.gz: 2beb29130f8e26d4e14d07663307137f7308088e81ba6b31bf6deb1a1e639639
 SHA512:
-  metadata.gz: bcc72c7b4e438ba08072b48d4deb7e63d69fb624487b9fada6444b087dc9d6aa3af8ed29e27ffe449573bf0929e78b31e2b6b0daf2321d59583f4a1d0aa071cd
-  data.tar.gz: 54066b7c151a1d3f2b29c166d67b5ba6a33a43c8824d0bdcdefd104d2f8f6efd447d94671be7d72b892721b84e0bd93d88ac89ff027298d27181209568bccc3a
+  metadata.gz: 1c355075749ef34b0c33f36578720d684a28b47e24dd5e092f1552eb46f03e89d2c57821f92974da1de48a57101502bd673c829926476fc632aec25172632d74
+  data.tar.gz: 272700646076074d4b9f1eff44c5f0828c3cefbf2a6547ba6bf18456d99fc0c47857aed213241ecd628fd609d819a88e455ce4e81b4a108f9f861fe8013efc65

data/lib/vk_music/client.rb

@@ -30,7 +30,7 @@ module VkMusic
     def get_playlist(url, up_to = nil)
       # NOTICE: it is possible to use same type of requests as in get_audios method
       begin
-        url, owner_id, id, access_hash = url.match(PLAYLIST_URL_REGEX).to_a
+        url, owner_id, id, access_hash = url.to_s.match(PLAYLIST_URL_REGEX).to_a
       
         # Load first page and get info
         first_page = load_playlist_page(owner_id: owner_id, id: id, access_hash: access_hash, offset: 0)
@@ -75,12 +75,15 @@ module VkMusic
       })
     end
     
-    def get_audios(id, up_to = nil)
+    def get_audios(obj, up_to = nil)
       Warning.warn("Current implementation of method VkMusic::Client#get_audios is only able to load first 100 audios from user page.\n") if (up_to && up_to > 100)
       # NOTICE: this method is only able to load first 100 audios
       # NOTICE: it is possible to download 50 audios per request on "https://m.vk.com/audios#{owner_id}?offset=#{offset}", so it will cost A LOT to download all of audios (up to 200 requests).
       # NOTICE: it is possible to load up to 2000 audios **without url** if offset is negative
       
+      # Firstly, we need to get numeric id
+      id = get_id(obj.to_s)      
+      
       # Trying to parse out audios
       begin
         first_json = load_playlist_json_section(id: id.to_s, playlist_id: -1, offset: 0)
@@ -105,7 +108,38 @@ module VkMusic
       })
     end
     
+    def get_id(str)
+      case str
+        when VK_URL_REGEX
+          path = str.match(VK_URL_REGEX)[1]
+          get_id(path) # Recursive call
+        when VK_ID_REGEX
+          str
+        when VK_PREFIXED_ID_REGEX
+          id = str.match(/\d+/).to_s # Just numbers. Sign needed
+          id = "-#{id}" unless str.start_with?("id")
+          id
+        when VK_CUSTOM_ID_REGEX
+          begin
+            page = load_page("#{VK_URL[:home]}/#{str}")
+          rescue Exception => error
+            raise IdParseError, "unable to load page by id \"#{str}\". Error: #{error.message}"
+          end
+          
+          unless page.at_css(".PageBlock .owner_panel")
+            # Ensure this isn't some random vk page
+            raise IdParseError, "page #{str} doesn't seem to be a group or user page"
+          end
+          
+          id = page.link_with(href: VK_HREF_ID_CONTAINING_REGEX).href.slice(/-?\d+/) # Numbers with sign
+          id
+      else
+        raise IdParseError, "unable to convert \"#{str}\" into id"
+      end
+    end
+    
     private
+    
     # Loading pages
     def load_page(url)
       uri = URI(url) if url.class != URI      
@@ -153,6 +187,7 @@ module VkMusic
     end
     
     
+    # Login
     def login(username, password)
       # Loading login page
       homepage = load_page(VK_URL[:home])
@@ -168,7 +203,7 @@ module VkMusic
       # Parsing information about this profile
       profile = load_page(VK_URL[:profile])      
       @name = profile.title
-      @id = profile.link_with(href: /audios/).href.slice(/\d+/)
+      @id = profile.link_with(href: VK_HREF_ID_CONTAINING_REGEX).href.slice(/\d+/)
     end
     
     def unmask_link(link)

data/lib/vk_music/constants.rb

@@ -19,6 +19,14 @@ module VkMusic
     :password => "pass",
   }
   
+  
+  VK_ID_REGEX = /^-?\d+$/
+  VK_PREFIXED_ID_REGEX = /^(?:id|club|group|public|event)\d+$/ # TODO: Rework. This one is REALLY dirty. Not quite sure every page can return correct id with this regex
+  VK_CUSTOM_ID_REGEX = /^\w+$/
+  VK_URL_REGEX = /(?:https?:\/\/)?(?:m\.|www\.)?vk\.com\/(\w+)/
+  
+  VK_HREF_ID_CONTAINING_REGEX = /(?:audios|photo|write|owner_id=)-?\d+/
+  
   # Playlist
   PLAYLIST_URL_REGEX = /.*audio_playlist(-?[\d]+)_([\d]+)(?:(?:(?:&access_hash=)|\/|%2F)([\da-z]+))?/
   

data/lib/vk_music/exceptions.rb

@@ -16,4 +16,8 @@ module VkMusic
     # Unable to load or parse audios section
   end
   
+  class IdParseError < AudiosParseError
+    # Unable to convert string to id
+  end
+  
 end

data/lib/vk_music/utility.rb

@@ -7,6 +7,17 @@ module VkMusic
       "#{(s / 60).to_s.rjust(2, "0")}:#{(s % 60).to_s.rjust(2, "0")}";
     end
     
+    def self.guess_request_type(str)
+      # Guess what type of request is this. Returns Symbol: :find, :playlist, :audios
+      if str.match? PLAYLIST_URL_REGEX
+        :playlist
+      elsif str.match? VK_URL_REGEX
+        :audios
+      else
+        :find
+      end
+    end
+    
   end
   
 end

data/test/test_get_id.rb

@@ -0,0 +1,103 @@
+require "minitest/autorun"
+require_relative "../lib/vk_music.rb"
+
+begin
+  CLIENT = VkMusic::Client.new(username: ARGV[0], password: ARGV[1])
+rescue VkMusic::LoginError
+  puts "Unable to login! Please check provided credetionals"
+  exit
+end
+
+class TestVkMusic < MiniTest::Test
+
+  def test_user_link_with_id
+    id = CLIENT.get_id("https://vk.com/id51842614")
+    assert_equal("51842614", id, "Ids don't match")
+  end
+  
+  def test_user_custom_link
+    id = CLIENT.get_id("https://vk.com/kopatych56")
+    assert_equal("51842614", id, "Ids don't match")
+  end
+  
+  def test_user_custom
+    id = CLIENT.get_id("kopatych56")
+    assert_equal("51842614", id, "Ids don't match")
+  end
+  
+  def test_user_id
+    id = CLIENT.get_id("51842614")
+    assert_equal("51842614", id, "Ids don't match")
+  end  
+  
+  def test_user_id_with_prefix
+    id = CLIENT.get_id("id51842614")
+    assert_equal("51842614", id, "Ids don't match")
+  end
+  
+  
+  def test_group_link_with_id
+    id = CLIENT.get_id("https://vk.com/public39786657")
+    assert_equal("-39786657", id, "Ids don't match")
+  end
+  
+  def test_group_custom_link
+    id = CLIENT.get_id("https://vk.com/mashup")
+    assert_equal("-39786657", id, "Ids don't match")
+  end
+  
+  def test_group_custom
+    id = CLIENT.get_id("mashup")
+    assert_equal("-39786657", id, "Ids don't match")
+  end
+  
+  def test_group_id
+    id = CLIENT.get_id("-39786657")
+    assert_equal("-39786657", id, "Ids don't match")
+  end
+  
+  def test_group_id_with_prefix
+    id = CLIENT.get_id("public39786657")
+    assert_equal("-39786657", id, "Ids don't match")
+  end
+  
+  
+  def test_user_deleted
+    id = CLIENT.get_id("https://vk.com/id245722576")
+    assert_equal("245722576", id, "Ids don't match")
+  end
+  
+  def test_user_no_photos
+    id = CLIENT.get_id("drop_the_treble")
+    assert_equal("437727675", id, "Ids don't match")
+  end
+  
+  def test_user_private
+    id = CLIENT.get_id("poppingeyesocketcherry") # I hope this guy won't change his custom
+    assert_equal("300415", id, "Ids don't match")
+  end
+  
+  def test_group_no_photos
+    id = CLIENT.get_id("vk.com/opentestroom")
+    assert_equal("-184089233", id, "Ids don't match")
+  end
+  
+  def test_bad_url
+    assert_raises(VkMusic::IdParseError) do
+      CLIENT.get_id("https://vk.com/feed")
+    end
+  end
+  
+  def test_bad_custom
+    assert_raises(VkMusic::IdParseError) do
+      CLIENT.get_id("a")
+    end
+  end
+  
+  def test_empty
+    assert_raises(VkMusic::IdParseError) do
+      CLIENT.get_id("")
+    end
+  end
+  
+end

data/test/test_user_or_group_audios.rb

@@ -59,4 +59,9 @@ class TestVkMusic < MiniTest::Test
     assert_empty(pl, "This group got no audios")
   end
   
+  def test_group_by_custom_id
+    pl = CLIENT.get_audios("mashup")
+    refute_empty(pl, "This group got audios")
+  end
+  
 end

data/vk_music.gemspec

@@ -2,7 +2,7 @@ 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        = "0.1.2"
+  s.version        = "0.1.3"
   s.author         = "Kuznetsov Vladislav"
   s.email          = "fizvlad@mail.ru"
   s.homepage       = "https://github.com/fizvlad/vk-music-rb"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vk_music
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Kuznetsov Vladislav
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-01 00:00:00.000000000 Z
+date: 2019-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -70,6 +70,7 @@ files:
 - lib/vk_music/link_decoder.rb
 - lib/vk_music/playlist.rb
 - lib/vk_music/utility.rb
+- test/test_get_id.rb
 - test/test_login.rb
 - test/test_playlist.rb
 - test/test_search.rb
@@ -100,6 +101,7 @@ signing_key:
 specification_version: 4
 summary: Provides interface to work with VK music via HTTP requests
 test_files:
+- test/test_get_id.rb
 - test/test_login.rb
 - test/test_playlist.rb
 - test/test_search.rb