kgmusic 0.1.0pre4 → 0.1.0pre20160509

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffecb0c3212801f6e8c1ae897cd2e7f2c4d84065
-  data.tar.gz: 1a09a8b4ab6fbb7bc87bf0a4fcb84cb8c0d55abb
+  metadata.gz: 68d83609da57a5345ed4495de570a8bad9b753e2
+  data.tar.gz: a8c5eadffc0386bd494f1f0888eb5f1e2c50736a
 SHA512:
-  metadata.gz: ab437cc7d8f544f47fcd5c6054fa473f5e3cdedab5c8c71a1f43906148ab9153252c44a2b9e7d27a1f641d297530196a699620af0c7de36424d4ea3a1af01786
-  data.tar.gz: c72283cb0b640a93e4200d72a7dff0e3fcaa370209fec35f4dc973a9c75647a4b3dab1c2ac2a7d9758a0477b83d54e6bd223ef3604f9adc7fc6d6be7adcd44a6
+  metadata.gz: 5497d4f10b77b737dd778b0ea94346fe8902b7e2470181ce8b63d29ae1343210921de8120598e6b42a854cedbe5b4bcfa25bb7f09f2faa853ee01e2334ec9b59
+  data.tar.gz: 4cadfde95394b8924378812c69354f4944e47876092bf35889605e8a9c412eb3d836b63825563480654fea7f7512f8c90adc7a43ffab502203f712964f67dfa3

data/Gemfile

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

data/kgmusic.gemspec

@@ -17,9 +17,10 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "unicode_utils", "1.4.0"
+  #spec.add_runtime_dependency "unicode_utils", "1.4.0"
   spec.add_runtime_dependency "rest-client", "~> 1.8", ">= 1.8.0"
   spec.add_runtime_dependency "nokogiri", "~> 1.6", ">= 1.6.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.rb

@@ -1,4 +1,5 @@
 require "kgmusic/basemod"
+require "progressbar"
 
 module KgMusic
 
@@ -55,18 +56,66 @@ module KgMusic
       @direct_link = link.to_s
     end
 
-    def get_album
-      @archive = "#{@artist} - #{@album}.zip"
+    def obtain_final_url
       begin
-        @content = RestClient::Request.execute ({
-          :method => :get,
-          :url => @direct_link,
-          :timeout => 3600
-        })
-        File.open(File.join(ENV['HOME'], @archive), 'w') do |f|
-          f.write @content
+        uri = uri_parse @direct_link
+        response = Net::HTTP.start(uri.host) { |http| http.request_get(uri.path) }
+        @final_uri = response['location']
+      rescue
+      end
+    end
+
+    def get_album
+
+      result = obtain_final_url
+      uri = uri_parse result
+      host, path = uri.host, uri.path
+      @outfile = File.join(ENV['HOME'], "#{@artist} - #{@album}.zip")
+
+      counter = 0
+
+      unless File.exist? @outfile
+        Net::HTTP.start(host) do |http|
+          get_content_length @final_uri
+          @progress_bar = ProgressBar.new("Progress", @content_length)
+          File.open(@outfile, 'w') do |f|
+            http.read_timeout = 3
+            http.request_get(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
+        puts "Ok, Done."
+      else
+        Net::HTTP.start(host) do |http|
+          get_content_length @final_uri
+          @progress_bar = ProgressBar.new("Progress", @content_length)
+          fsize = File.size @outfile
+          counter += fsize
+          @progress_bar.set counter
+          while @content_length > File.size(@outfile) do
+            File.open(@outfile, 'a+') do |f|
+              partial_size = File.size(@outfile)
+              __range = Range.new(partial_size, @content_length)
+              __headers = {"Range" => "bytes=#{__range.first}-#{__range.last}"}
+              http.read_timeout = 3
+              http.request_get(path, __headers) do |response|
+                response.read_body do |body|
+                  f.write body
+                  counter += body.length
+                  @progress_bar.set counter
+                end
+              end
+            end
+          end
         end
-      rescue IOError
+        @progress_bar.finish
+        puts "Ok, Done."
       end
     end
 
@@ -77,7 +126,11 @@ module KgMusic
     end
 
     def download_album
-      get_album
+      begin
+        get_album
+      rescue => e
+        puts e.message
+      end
     end
   end
 end

data/lib/kgmusic/basemod.rb

@@ -1,11 +1,11 @@
 require 'kgmusic/version'
-require 'unicode_utils/titlecase'
+#require 'unicode_utils/titlecase'
 require 'rest-client'
 require 'nokogiri'
 
 module KgMusic
   module BaseMod
-    include UnicodeUtils
+    #include UnicodeUtils
 
     UNALLOWED_SYMBOLS = [
       "`", "~", "!", "@", "#", "$", "%", "^", "&", "*", "(", ")", ",", "_", "=",
@@ -29,9 +29,8 @@ module KgMusic
       counter.size > 0 ? true : false
     end
 
-    def strip_unallowed_symbols(key)
-      UNALLOWED_SYMBOLS.map {|s| key.delete!(s)}
-      key
+    def strip_unallowed_symbols!(key)
+      UNALLOWED_SYMBOLS.map! {|s| key.delete(s)}
     end
 
     def parse_html doc
@@ -39,13 +38,30 @@ module KgMusic
     end
 
     def validate(key)
-      strip_unallowed_symbols(key) if has_unallowed_symbols?(key)
-      words = key.split
-      if words.size == 1
-        key[0] =~ /^[[:lower:]]$/ ? titlecase(key) : key
-      elsif words.size > 1
-        words.map {|w| titlecase(w) unless (w[0].ord === w[0])}.join(" ")
+      strip_unallowed_symbols!(key) if has_unallowed_symbols?(key)
+      key
+      #words = key.split
+      #if words.size == 1
+      #  key[0] =~ /^[[:lower:]]$/ ? titlecase(key) : key
+      #elsif words.size > 1
+      #  words.map {|w| titlecase(w) unless (w[0].ord === w[0])}.join(" ")
+      #end
+    end
+
+    def uri_parse __uri
+      URI.parse __uri
+    end
+
+    def __head_request __url
+      uri = uri_parse __url
+      Net::HTTP.start(uri.host) do |http|
+        http.request_head(uri.path)
       end
     end
+
+    def get_content_length __uri
+      response = __head_request __uri
+      @content_length = response['content-length'].to_i
+    end
   end
 end

data/lib/kgmusic/version.rb

@@ -1,3 +1,3 @@
 module KgMusic
-  VERSION = "0.1.0pre4"
+  VERSION = "0.1.0pre20160509"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: kgmusic
 version: !ruby/object:Gem::Version
-  version: 0.1.0pre4
+  version: 0.1.0pre20160509
 platform: ruby
 authors:
 - vitvegl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: unicode_utils
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -64,6 +50,20 @@ 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
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Find music albums on kibergrad.fm