kgmusic 0.1.0pre20160515 → 0.1.0pre20160517

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7e0349e3b0ebb6507c92f2d30de26ce1d1001cd
-  data.tar.gz: 3a81efb1fd03ab00db347c5f21348de7dee60df5
+  metadata.gz: 34f94579c2edfe6b9b62d490224f73a5a5e38653
+  data.tar.gz: 354ca55887440e1b8c8a372ccaa521ddf94005b3
 SHA512:
-  metadata.gz: c79394c6363d8826b5c9d1cfa091a53ada0f64213d40f6aeb642cb19e601f17af657969575edc3b68caeead18572d0d4f96e9b2fedc0dd28767700d71a86b84c
-  data.tar.gz: 36e589b0e96519302bdbd1046bfe8df1329e2ff90578160e5f52303bb9ca022c6cc848b4a4fc720505f1f680881f53efc3ee8613346a1e3fb0d138da06cdba1e
+  metadata.gz: 62a30ea5d3616881032f4aca06861b0ad2c493b7ebe9ddb1ab6bbfb84569ffe5f113ab3452470b54839df4b2f51e75f4b6ad4b27653f9ef54cd78c4bd5f79853
+  data.tar.gz: f07f37ce5c857156e9439a59571ca81de4d976a8b2f9d68d3bc0c3397589ed572c532ed948a04e18d70314956c1fdfc3c4332173b391f00bd3878aa1f3525a13

data/README.md

@@ -19,12 +19,13 @@ Or install it yourself as:
     $ gem install kgmusic
 
 ## Usage
+    require 'kgmusic'
 
-    $ require 'kgmusic'
+    music = KgMusic::Client.new :artist => 'God Is An Astronaut', :album => 'God Is An Astronaut'
 
-    $ music = KgMusic::Search.new :artist => 'God Is An Astronaut', :album => 'God Is An Astronaut'
+    music.search
 
-    $ music.search
+    album = music.download_album
 
 ## Development
 

data/lib/kgmusic/api.rb

@@ -0,0 +1,45 @@
+require "curl"
+require "nokogiri"
+require "singleton"
+
+module KgMusic
+
+  class API
+
+    include Singleton
+
+    class << self
+
+      private
+      def root
+        root = Curl::Easy.new('kibergrad.fm') do |curl|
+          curl.follow_location = true
+          curl.perform
+        end
+
+        doc = Nokogiri::HTML.parse root.body_str
+      end
+
+      public
+      def popular_artists
+        list = root.xpath("//div[@class='popular-artists']//li/a")
+        out = []; list.collect { |element| out << "#{element.children}" }
+        out
+      end
+
+      def popular_genres
+        list = root.xpath("//div/ul[@class='aim-menu css']/li/a")
+        out = []; list.collect { |element| out << "#{element.text}" }
+        out
+      end
+
+      def all_genres
+        list = root.xpath("//div//ul[@class='aim-menu css']//li/a")
+        out = []; list.collect { |element| out << "#{element.text}" }
+        out
+      end
+
+    end
+
+  end
+end

data/lib/kgmusic/basemod.rb

@@ -14,6 +14,7 @@ module KgMusic
     ]
 
     protected
+
     def go_to(url, params={})
       __url = Curl.urlalize(url, params)
       c = Curl::Easy.new(__url) { |c| c.follow_location = true }
@@ -45,18 +46,15 @@ module KgMusic
       #end
     end
 
-    def uri_parse __uri
-      URI.parse __uri
+    def parse_http_header str
+      list = str.split(/[\r\n]+/).map(&:strip)
+      Hash[list.flat_map { |s| s.scan(/^(\S+): (.+)/) }]
     end
 
     def __head_request __url
-      c = Curl::Easy.new(__url) do |curl|
-        curl.set(:nobody, true)
-      end
+      c = Curl::Easy.new(__url) { |curl| curl.set(:nobody, true) }
       c.perform
-      response = c.header_str
-      headers_list = response.split(/[\r\n]+/).map(&:strip)
-      __headers = Hash[headers_list.flat_map {|s| s.scan(/^(\S+): (.+)/)}]
+      parse_http_header c.header_str
     end
 
     def get_content_length __uri
@@ -67,16 +65,21 @@ module KgMusic
     def obtain_final_url __uri
       c = Curl::Easy.new __uri
       c.perform
-      response = c.header_str
-      headers_list = response.split(/[\r\n]+/).map(&:strip)
-      __headers = Hash[headers_list.flat_map {|s| s.scan(/^(\S+): (.+)/)}]
-      __headers['Location'].to_s || __uri
+      __headers = parse_http_header c.header_str
+      __headers['Location'] || __uri
+    end
+
+    def get_album_info(url, params={})
+      __response = go_to url, params
+      doc = parse_html __response
+      doc.css('div.album-info')
     end
 
-    def visit_download_page
-      page = go_to @download_page
-      data = parse_html page
-      @direct_link = data.css('a.download-block').attr('href').to_s
+    def get_direct_link __url
+      __response = go_to __url
+      doc = parse_html __response
+      @direct_link = doc.css('a.download-block').attr('href').to_s
     end
+
   end
 end

data/lib/kgmusic/version.rb

@@ -1,3 +1,3 @@
 module KgMusic
-  VERSION = "0.1.0pre20160515"
+  VERSION = "0.1.0pre20160517"
 end

data/lib/kgmusic.rb

@@ -3,12 +3,12 @@ require "kgmusic/basemod"
 
 module KgMusic
 
-  class Search
+  class Client
 
     include BaseMod
 
     attr_reader :artist, :album
-    attr_reader :doc, :info, :result, :download_page, :direct_link
+    attr_reader :result, :download_page, :direct_link
 
     def initialize args
       keys = [:artist, :album]
@@ -24,26 +24,21 @@ module KgMusic
     protected
 
     def run
-      url = 'kibergrad.fm/search'
-      params = {:q => "#{@artist} - #{@album}", :p => "albums"}
 
-      @page = go_to(url, params)
-      @doc = parse_html @page
+      url = 'kibergrad.fm/search'
+      params = { :q => "#{@artist} - #{@album}", :p => "albums" }
+      album_info = get_album_info url, params
 
-      if not @doc.css('div.album-info').empty?
+      unless album_info.nil?
         begin
-          @info = @doc.css('div.album-info')
-          if @info.size == 1
-            @result = @info.css('h3')
-            @download_page = @result.at('a').attr('href')
-          elsif @info.size > 1
-            n = @info.css('h3').find_index do |e|
-              e.at('a').children.to_s === @album
-            end
-            @result = @info.css('h3')[n]
+          if album_info.size == 1
+            @download_page = album_info.css('h3').at('a').attr('href')
+          elsif album_info.size > 1
+            full_match_index = album_info.css('h3').find_index { |e| e.at('a').children.to_s === @album }
+            @result = album_info.css('h3')[full_match_index]
             @download_page = @result.at('a').attr('href')
           end
-          visit_download_page
+            get_direct_link @download_page
         rescue
         end
       end
@@ -55,15 +50,9 @@ module KgMusic
       outfile = File.join(ENV['HOME'], "#{@artist} - #{@album}.zip")
       content_length = get_content_length url
 
-      if File.exist? outfile
-        fsize = File.size outfile
-      else
-        FileUtils.touch outfile
-        fsize = 0
-      end
-
       begin
-        f = File.open(outfile, 'ab')
+        f = File.open(outfile, 'ab+')
+        fsize = File.size outfile
         c = Curl::Easy.new url do |curl|
           curl.set(:resume_from, fsize) if File.exists? outfile
           curl.on_body { |body| f.write body }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kgmusic
 version: !ruby/object:Gem::Version
-  version: 0.1.0pre20160515
+  version: 0.1.0pre20160517
 platform: ruby
 authors:
 - vitvegl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-15 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curb
@@ -109,6 +109,7 @@ files:
 - bin/setup
 - kgmusic.gemspec
 - lib/kgmusic.rb
+- lib/kgmusic/api.rb
 - lib/kgmusic/basemod.rb
 - lib/kgmusic/version.rb
 homepage: https://github.com/vitvegl/kgmusic.git