kgmusic 0.1.0pre20160614 → 0.1.0pre20160714

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5ca7c38be623e5e6c561330d317ea53d87e9104
-  data.tar.gz: e4db947176a1c349b99ae3600178027d8f7e6a12
+  metadata.gz: d73f513669536de0261aefbe5a944f6443a69b04
+  data.tar.gz: 8c2e529a169cc96c4c1254550d5f425ae0a23667
 SHA512:
-  metadata.gz: bf1836cd6d83458cbf7385131ac3ce79e7dd8fa89127bf511bcaeaf828e20f1cc0e9e8802f92acddbf85f2e21975f5bce242e421395f8f55958068cf598d22e8
-  data.tar.gz: a6efea97a95056f55930cea606d6495d59118c2ebe38f02836a398626b8f8133a575c76c85322c4bda5c71f030ed65dc2de707b6fefaa4193f464e8bda326b68
+  metadata.gz: 4eac3e426cae4a299ab6a3d01843eeca9d122ab4eba04f086dbdf2fecb5b6a9c7f333ea9f5654027eb7dfff738593fd9db52684f95807580e16dc49c3138bff6
+  data.tar.gz: 3d6b463942511755767dfc8ad08530a3d21d88757718ab6a8d062146483ecb7185c9989af1741e5ea0701f058365dc0966f1b9272ac142574503ea1fa039fc17

data/lib/kgmusic/base/basemod.rb

@@ -16,15 +16,25 @@ module KgMusic
 
     protected
     def create_work_dir
-      @work_dir = File.join(ENV['HOME'], 'kgmusic')
-      Dir.mkdir(@work_dir, 0700) unless Dir.exist?(@work_dir)
+      @@work_dir = File.join(ENV['HOME'], 'kgmusic')
+      Dir.mkdir(@@work_dir, 0700) unless Dir.exist?(@@work_dir)
     end
 
-    def go_to(url, params = {})
+    def go_to(url, params = {}, &block)
+      request = __perform_request(url, params, &block)
+      request.body_str
+    end
+
+    def __build_request(url, params = {}, &block)
       __url = Curl.urlalize(url, params)
-      c = Curl::Easy.new(__url) { |c| c.follow_location = true }
-      c.perform
-      c.body_str
+      Curl::Easy.new(__url, &block)
+    end
+
+    def __perform_request(url, params = {}, &block)
+      request = __build_request(url, params, &block)
+      request.perform
+
+      request
     end
 
     def has_unallowed_symbols?(key)
@@ -36,10 +46,6 @@ module KgMusic
       UNALLOWED_SYMBOLS.map {|s| key.delete!(s)}
     end
 
-    def parse_html doc
-      Nokogiri::HTML.parse doc
-    end
-
     def validate(key)
       if key.is_a? String
         strip_unallowed_symbols!(key) if has_unallowed_symbols?(key)
@@ -55,39 +61,33 @@ module KgMusic
       end
     end
 
-    def parse_http_header str
+    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) { |curl| curl.set(:nobody, true) }
-      c.perform
-      parse_http_header c.header_str
+    def __head_request(url)
+      request = __perform_request(url) { |r| r.set(:nobody, true) }
+
+      parse_http_header(request.header_str)
     end
 
-    def get_content_length __uri
-      response = __head_request __uri
+    def get_content_length(url)
+      response = __head_request(url)
       response['Content-Length'].to_i
     end
 
-    def obtain_final_url __uri
-      c = Curl::Easy.new __uri
-      c.perform
-      __headers = parse_http_header c.header_str
-      __headers['Location'] || __uri
-    end
+    def obtain_final_url(url)
+      response = __perform_request(url)
+      headers = parse_http_header(response.header_str)
 
-    def get_album_info(url, params={})
-      __response = go_to url, params
-      doc = parse_html __response
-      doc.css('div.album-info')
+      headers['Location'] || url
     end
 
-    def get_direct_link __url
-      __response = go_to __url
-      doc = parse_html __response
-      @direct_link = doc.css('a.download-block').attr('href').to_s
+    def get_direct_link(url)
+      response = go_to(url)
+      doc = Nokogiri::HTML.parse(response)
+      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.0pre20160614"
+  VERSION = "0.1.0pre20160714"
 end

data/lib/kgmusic.rb

@@ -15,70 +15,70 @@ module KgMusic
 
     include BaseMod
 
-    attr_reader :artist, :album, :work_dir
-    attr_reader :direct_link
+    attr_reader :artist, :album, :direct_link
 
     def initialize(artist:, album:)
       @artist = validate(artist)
       @album = validate(album)
-      create_work_dir
     end
 
-    protected
+    def search
 
-    def run
       url = 'kibergrad.fm/search'
-      params = { :q => "#{self.artist} - #{self.album}", :p => "albums" }
-      album_info = get_album_info url, params
+
+      params = { q: "#{self.artist} - #{self.album}", p: "albums" }
+
+      response = go_to(url, params) { |r| r.follow_location = true }
+      doc = Nokogiri::HTML.parse(response)
+
+      album_info = doc.css('div.album-info')
 
       unless album_info.nil?
         begin
           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 }
+            full_match_index = album_info.css('h3').find_index { |element| element.at('a').children.to_s === @album }
             result = album_info.css('h3')[full_match_index]
             download_page = result.at('a').attr('href')
           end
-            get_direct_link download_page
+            @direct_link = get_direct_link(download_page)
         rescue
         end
       end
+
     end
 
-    def get_album
-      url = obtain_final_url @direct_link
-      create_work_dir
-      outfile = File.join(@work_dir, "#{self.artist} - #{self.album}.zip")
-      content_length = get_content_length url
+    def download_album
+
+        create_work_dir()
+        url = obtain_final_url(@direct_link)
+
+        outfile = File.join(@@work_dir, "#{@artist} - #{@album}.zip")
+        content_length = get_content_length url
+
+        File.open(outfile, 'ab') do |f|
 
-      begin
-        File.open(outfile, 'ab+') do |f|
           fsize = File.size(outfile)
-          c = Curl::Easy.new url do |curl|
-            curl.set(:resume_from, fsize) if fsize > 0
-            curl.on_body { |body| f.write body }
-          end
-          c.on_progress do |dlt, dln, ult, uln|
-            printf("\r %i of %i MBytes received ...", (dln / 1_000_000), (dlt / 1_000_000))
-            true
-          end
-          c.perform if content_length > fsize
-        end
-      rescue => ex
-        puts ex.message
-      end
-        nil
-    end
 
-    public
+          req = __build_request(url) do |r|
+          
+            r.set(:resume_from, fsize) if fsize > 0
+          
+            r.on_body { |body| f.write(body) }
+          
+            r.on_progress do |dlt, dln, _, _|
+              printf("\r %i of %i MBytes received ...", (dln / 1_000_000), (dlt / 1_000_000))
+              true
+            end
+          
+          end
+          
+          req.perform if content_length > fsize
 
-    def search
-      run
-    end
+        end
 
-    def download_album
-      get_album
+      nil
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kgmusic
 version: !ruby/object:Gem::Version
-  version: 0.1.0pre20160614
+  version: 0.1.0pre20160714
 platform: ruby
 authors:
 - vitvegl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curb