kgmusic 0.1.0pre20160513 → 0.1.0pre20160515

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dff9fbe5070d1a37e25827f4bfa52fd5c28c183f
-  data.tar.gz: 5568456eed54334f98b9dab45ee5da8ee93067a3
+  metadata.gz: f7e0349e3b0ebb6507c92f2d30de26ce1d1001cd
+  data.tar.gz: 3a81efb1fd03ab00db347c5f21348de7dee60df5
 SHA512:
-  metadata.gz: d4b2084a705b3f4c65d9c76cb4f7c471e2c312a1a74e2486b91707c3845b2c6ba1d8418ab5a253f67f4f685fb1f5ee3fe591074b8beb12472b0840d184027608
-  data.tar.gz: 4bf0d0b2131b16d11e41fbd91e03f62f190f593cabfeb8632c082a08fe2cfa7a4f38ad48026f711e806e76acdc1131fbc629c85559e3d7544734d90ec04025d7
+  metadata.gz: c79394c6363d8826b5c9d1cfa091a53ada0f64213d40f6aeb642cb19e601f17af657969575edc3b68caeead18572d0d4f96e9b2fedc0dd28767700d71a86b84c
+  data.tar.gz: 36e589b0e96519302bdbd1046bfe8df1329e2ff90578160e5f52303bb9ca022c6cc848b4a4fc720505f1f680881f53efc3ee8613346a1e3fb0d138da06cdba1e

data/Gemfile

@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
 #gem 'unicode_utils', '1.4.0'
-gem 'rest-client', '~> 1.8', '>= 1.8.0'
+#gem 'rest-client', '~> 1.8', '>= 1.8.0'
+gem 'curb', '~> 0.9', '>= 0.9.3'
 gem 'nokogiri', '~> 1.6', '>= 1.6.0'
-gem 'progressbar', '0.21.0'
+#gem 'progressbar', '0.21.0'

data/kgmusic.gemspec

@@ -18,9 +18,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   #spec.add_runtime_dependency "unicode_utils", "1.4.0"
-  spec.add_runtime_dependency "rest-client", "~> 1.8", ">= 1.8.0"
+  #spec.add_runtime_dependency "rest-client", "~> 1.8", ">= 1.8.0"
+  spec.add_runtime_dependency "curb", "~> 0.9", ">= 0.9.3"
   spec.add_runtime_dependency "nokogiri", "~> 1.6", ">= 1.6.0"
-  spec.add_runtime_dependency "progressbar", "0.21.0"
+  #spec.add_runtime_dependency "progressbar", "0.21.0"
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

data/lib/kgmusic/basemod.rb

@@ -1,6 +1,7 @@
 require 'kgmusic/version'
 #require 'unicode_utils/titlecase'
-require 'rest-client'
+require 'fileutils'
+require 'curl'
 require 'nokogiri'
 
 module KgMusic
@@ -14,14 +15,10 @@ module KgMusic
 
     protected
     def go_to(url, params={})
-      RestClient.get(url, params) do |response, request, result, &block|
-        if [301, 302, 307].include? response.code
-          response.follow_redirection(request, result, &block)
-        else
-          final_url = request.url
-          response.return!(request, result, &block)
-        end
-      end
+      __url = Curl.urlalize(url, params)
+      c = Curl::Easy.new(__url) { |c| c.follow_location = true }
+      c.perform
+      c.body_str
     end
 
     def has_unallowed_symbols?(key)
@@ -53,68 +50,33 @@ module KgMusic
     end
 
     def __head_request __url
-      uri = uri_parse __url
-      Net::HTTP.start(uri.host) do |http|
-        http.request_head(uri.path)
+      c = Curl::Easy.new(__url) do |curl|
+        curl.set(:nobody, true)
       end
+      c.perform
+      response = c.header_str
+      headers_list = response.split(/[\r\n]+/).map(&:strip)
+      __headers = Hash[headers_list.flat_map {|s| s.scan(/^(\S+): (.+)/)}]
     end
 
     def get_content_length __uri
       response = __head_request __uri
-      response['content-length'].to_i
+      response['Content-Length'].to_i
     end
 
     def obtain_final_url __uri
-      uri = uri_parse __uri
-      response = Net::HTTP.start(uri.host) do |http|
-        http.request_get(uri.path)
-      end
-      response['location'] || __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
     end
 
-    def download_proc(url, outfile)
-
-      uri = uri_parse url
-      content_length = get_content_length url
-      counter = 0
-
-      unless File.exist? outfile
-        Net::HTTP.start(uri.host) do |http|
-          @progress_bar = ProgressBar.new("Progress", content_length)
-          File.open(outfile, 'w') do |f|
-            http.read_timeout = 5
-            http.request_get(uri.path) do |response|
-              response.read_body do |body|
-                f.write body
-                counter += body.length
-                @progress_bar.set counter
-              end
-            end
-          end
-        end
-        @progress_bar.finish
-      else
-        Net::HTTP.start(uri.host) do |http|
-          partial_size = File.size(outfile)
-          __range = [partial_size, content_length]
-          __headers = {"Range" => "bytes=#{__range.first}-#{__range.last}"}
-          @progress_bar = ProgressBar.new("Progress", content_length)
-          counter += partial_size
-          while content_length > File.size(outfile) do
-            File.open(outfile, 'a') do |f|
-              http.read_timeout = 5
-              http.request_get(uri.path, __headers) do |response|
-                response.read_body do |body|
-                  f.write body
-                  counter += body.length
-                  @progress_bar.set counter
-                end
-              end
-            end
-          end
-        end
-      end
-        @progress_bar.finish
+    def visit_download_page
+      page = go_to @download_page
+      data = parse_html page
+      @direct_link = data.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.0pre20160513"
+  VERSION = "0.1.0pre20160515"
 end

data/lib/kgmusic.rb

@@ -1,5 +1,5 @@
 require "kgmusic/basemod"
-require "progressbar"
+#require "progressbar"
 
 module KgMusic
 
@@ -13,7 +13,7 @@ module KgMusic
     def initialize args
       keys = [:artist, :album]
       keys.each do |k|
-        if args[k].is_a? String
+        if args.keys === keys and args[k].is_a? String
           self.instance_variable_set "@#{k}", validate(args[k])
         else
           raise ArgumentError
@@ -27,7 +27,7 @@ module KgMusic
       url = 'kibergrad.fm/search'
       params = {:q => "#{@artist} - #{@album}", :p => "albums"}
 
-      @page = go_to(url, :params => params)
+      @page = go_to(url, params)
       @doc = parse_html @page
 
       if not @doc.css('div.album-info').empty?
@@ -36,33 +36,43 @@ module KgMusic
           if @info.size == 1
             @result = @info.css('h3')
             @download_page = @result.at('a').attr('href')
-            visit_download_page
           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]
             @download_page = @result.at('a').attr('href')
-            visit_download_page
           end
+          visit_download_page
         rescue
         end
       end
     end
 
-    def visit_download_page
-      page = go_to @download_page
-      data = parse_html page
-      link = data.css('a.download-block').attr('href')
-      @direct_link = link.to_s
-    end
-
     def get_album
+
       url = obtain_final_url @direct_link
       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
-        download_proc url, outfile
-      rescue
+        f = File.open(outfile, 'ab')
+        c = Curl::Easy.new url do |curl|
+          curl.set(:resume_from, fsize) if File.exists? outfile
+          curl.on_body { |body| f.write body }
+        end
+        puts "Please, wait ..."
+        c.perform if content_length > fsize
+      rescue IOError
+      ensure
+        f.close
       end
     end
 

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: kgmusic
 version: !ruby/object:Gem::Version
-  version: 0.1.0pre20160513
+  version: 0.1.0pre20160515
 platform: ruby
 authors:
 - vitvegl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: curb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 0.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 0.9.3
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -50,20 +50,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.0
-- !ruby/object:Gem::Dependency
-  name: progressbar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.21.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement