kgmusic 0.1.0pre20160509 → 0.1.0pre20160513

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68d83609da57a5345ed4495de570a8bad9b753e2
-  data.tar.gz: a8c5eadffc0386bd494f1f0888eb5f1e2c50736a
+  metadata.gz: dff9fbe5070d1a37e25827f4bfa52fd5c28c183f
+  data.tar.gz: 5568456eed54334f98b9dab45ee5da8ee93067a3
 SHA512:
-  metadata.gz: 5497d4f10b77b737dd778b0ea94346fe8902b7e2470181ce8b63d29ae1343210921de8120598e6b42a854cedbe5b4bcfa25bb7f09f2faa853ee01e2334ec9b59
-  data.tar.gz: 4cadfde95394b8924378812c69354f4944e47876092bf35889605e8a9c412eb3d836b63825563480654fea7f7512f8c90adc7a43ffab502203f712964f67dfa3
+  metadata.gz: d4b2084a705b3f4c65d9c76cb4f7c471e2c312a1a74e2486b91707c3845b2c6ba1d8418ab5a253f67f4f685fb1f5ee3fe591074b8beb12472b0840d184027608
+  data.tar.gz: 4bf0d0b2131b16d11e41fbd91e03f62f190f593cabfeb8632c082a08fe2cfa7a4f38ad48026f711e806e76acdc1131fbc629c85559e3d7544734d90ec04025d7

data/lib/kgmusic/basemod.rb

@@ -61,7 +61,60 @@ module KgMusic
 
     def get_content_length __uri
       response = __head_request __uri
-      @content_length = 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
+    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
     end
   end
 end

data/lib/kgmusic/version.rb

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

data/lib/kgmusic.rb

@@ -10,13 +10,14 @@ module KgMusic
     attr_reader :artist, :album
     attr_reader :doc, :info, :result, :download_page, :direct_link
 
-    def initialize(args)
-      begin
-        if args.include?(:artist) and args.include?(:album)
-          @artist = validate(args[:artist]) if args[:artist].is_a? String
-          @album = validate(args[:album]) if args[:album].is_a? String
+    def initialize args
+      keys = [:artist, :album]
+      keys.each do |k|
+        if args[k].is_a? String
+          self.instance_variable_set "@#{k}", validate(args[k])
+        else
+          raise ArgumentError
         end
-      rescue
       end
     end
 
@@ -56,69 +57,15 @@ module KgMusic
       @direct_link = link.to_s
     end
 
-    def obtain_final_url
+    def get_album
+      url = obtain_final_url @direct_link
+      outfile = File.join(ENV['HOME'], "#{@artist} - #{@album}.zip")
       begin
-        uri = uri_parse @direct_link
-        response = Net::HTTP.start(uri.host) { |http| http.request_get(uri.path) }
-        @final_uri = response['location']
+        download_proc url, outfile
       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
-        @progress_bar.finish
-        puts "Ok, Done."
-      end
-    end
-
     public
 
     def search
@@ -126,11 +73,7 @@ module KgMusic
     end
 
     def download_album
-      begin
-        get_album
-      rescue => e
-        puts e.message
-      end
+      get_album
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kgmusic
 version: !ruby/object:Gem::Version
-  version: 0.1.0pre20160509
+  version: 0.1.0pre20160513
 platform: ruby
 authors:
 - vitvegl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2016-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client