xmfun 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 57e6f8c8ed8e94b3301e745df32a1be299c35adc
-  data.tar.gz: 114ed2d3d93e2143d22e39cce59e708c9813a8f0
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NGY4NmI2ODczZjRkY2M4MmM5ZTdkMDY5MTk0NGJjMzQyMDA0YzA2ZA==
+  data.tar.gz: !binary |-
+    YTQxNjk4YjgyYTZiNzdlZTFkNmNhMzY2YTczYjQzNWUyY2I1NmExNg==
 SHA512:
-  metadata.gz: 812327659aaca61580bf2f841cc0fe84eb3e57c7ae6c8f57d334c0043df6b3958a7989bff9e3f80e18089cc69d203f3e348ee0082b622df6e50ad4a9a90704b1
-  data.tar.gz: 3f249647c5051ad5d22ab1c18c514008c3954022928720ee7c0ec02528ddb1d48e3f89d0f1fe0495e0c0c55cbd9470395484aba6a7434ab08a0b9477e899a3b9
+  metadata.gz: !binary |-
+    ZDhlOGI2YTE2ZjAyZDVhYWJkYzZlZDMyZWNkM2U2N2NkZTNhYmJjYjQwMmNl
+    ZTM0MjY2ZGUyOTA3NGFhNGQ4MTU2YTViNzI3YjViOTM5ZTYzZmRkYzZjNGQx
+    NDM2NmY2NmRmZDMzZTRlYTk2NjdiNTliYWI3ODM1MDUzYjM0MGQ=
+  data.tar.gz: !binary |-
+    Mzg2NGFiYTU0MjAwY2YwM2ZlNzM2YmIyODBiODE0N2Q5ZDVlZWJmOTFiODc2
+    NzgxZWQ2OTkwMzYwYTdlMDNmYjM4NDE1YzgxNDY1YTUzZmYxODA4ZGYzNWQ0
+    ZjEzZDFhNDExMWIyYWE3ZTYyZGYzYjBkYjk4OGJlMTUwYTQwMDg=

data/bin/xmfun

@@ -7,9 +7,7 @@ url = ''
 dst = '.'
 
 Clap.run ARGV,
-  #"-c" => lambda { |collect_id| url = "http://www.xiami.com/song/playlist/id/#{collect_id}/type/3" },
-  #"-s" => lambda { |song_id| url = "http://www.xiami.com/song/playlist/id/#{song_id}/object_name/default/object_id/0" },
-  "-u" => lambda { |xm_url| url = Xmfun::UrlParser.parse(xm_url) },
+  "-u" => lambda { |xm_url| url = Xmfun::Util::UrlParser.parse(xm_url) },
   "-d" => lambda { |d| dst = d },
   "-v" => lambda { puts Xmfun::VERSION },
   "-h" => lambda { puts Xmfun.help }

data/lib/xmfun.rb

@@ -3,8 +3,8 @@
 require 'xmfun/version'
 require 'xmfun/mp3/track'
 require 'xmfun/mp3/mp3_tagger'
-require 'xmfun/url_parser'
-require 'xmfun/decoder'
+require 'xmfun/util/url_parser'
+require 'xmfun/util/decoder'
 require 'xmfun/downloader'
 
 

data/lib/xmfun/downloader.rb

@@ -3,72 +3,76 @@
 require 'open-uri'
 require 'nokogiri'
 require 'nori'
-require 'clap'
 require 'parallel'
 require 'ruby-progressbar'
 
-
 module Xmfun
   class Downloader
     def self.download(url, dst)
+      make_dst(dst)
+
+      tracks = Nokogiri::XML(open(url, "Client-IP" => "220.181.111.168")).css("track")
 
+      if tracks.size > 1
+        download_collect(tracks)
+      else
+        download_song(tracks[0])
+      end
+    end
+
+    private
+    def self.make_dst(dst)
       if Dir.exist?(dst)
         Dir.chdir(dst)
       else
         Dir.mkdir(dst)
         Dir.chdir(dst)
       end
-      f = Nokogiri::XML(open(url, "Client-IP" => "220.181.111.168"))
-
-      tracks = f.css("track")
+    end
 
-      if tracks.size > 1
-        # progress
-        progress = ProgressBar.create( :title => "Progress",
-                                      :total => tracks.size,
-                                      :format => '%a %bᗧ%i %p%% %t',
-                                      :progress_mark  => ' ',
-                                      :remainder_mark => '･'
-                                     )
+    def self.make_progress_bar(size)
+      ProgressBar.create( :title => "Progress",
+                         :total => size,
+                         :format => '%a %bᗧ%i %p%% %t',
+                         :progress_mark  => ' ',
+                         :remainder_mark => '･' )
+    end
 
-        #download collect
-        Parallel.map( tracks, :in_threads => Parallel.processor_count, :finish => lambda { |item, i, result| progress.increment } ) do |track|
+    def self.download_collect(collect)
+      progress = make_progress_bar(collect.size)
 
-          track = Xmfun::Mp3::Track.new(Nori.new.parse(track.to_s)['track'])
+      Parallel.map( collect, :in_threads => Parallel.processor_count, :finish => lambda { |item, i, result| progress.increment } ) do |track|
 
-          URI.parse(track.location).open do |f|
-            File.open(track.file_name, 'w') { |mp3| mp3.write(f.read) }
-          end
+        track = Xmfun::Mp3::Track.new(Nori.new.parse(track.to_s)['track'])
 
-          # add mp3 meta info
-          Xmfun::Mp3::Mp3Tagger.tag(track)
-        end
-      else
-        #download single sone
-        song = tracks[0]
-        track = Xmfun::Mp3::Track.new(Nori.new.parse(song.to_s)['track'])
-
-        uri = URI.parse(track.location)
-
-        progress = nil
-
-        uri.open(:content_length_proc => lambda do |content_length|
-          if content_length && 0 < content_length
-            progress = ProgressBar.create( :title => "Progress",
-                                          :total => content_length,
-                                          :format => '%a %bᗧ%i %p%% %t',
-                                          :progress_mark  => ' ',
-                                          :remainder_mark => '･')
-          end
-        end,
-        :progress_proc => lambda {|size| progress.progress = size if progress}) do |f|
+        URI.parse(track.location).open do |f|
           File.open(track.file_name, 'w') { |mp3| mp3.write(f.read) }
         end
 
-        # add mp3 meta info
         Xmfun::Mp3::Mp3Tagger.tag(track)
       end
+    end
+
+    def self.download_song(song)
+      track = Xmfun::Mp3::Track.new(Nori.new.parse(song.to_s)['track'])
+      progress = nil
+
+      content_length_lambda = lambda do |content_length|
+        if content_length && 0 < content_length
+          progress = make_progress_bar content_length
+        end
+      end
+
+      progress_lambda = lambda { |size| progress.progress = size if progress }
+
+      uri = URI.parse(track.location)
+
+      uri.open( :content_length_proc => content_length_lambda,
+               :progress_proc       => progress_lambda ) do |f|
+        File.open(track.file_name, 'w') { |mp3| mp3.write(f.read) }
+      end
 
+      Xmfun::Mp3::Mp3Tagger.tag(track)
     end
   end
 end

data/lib/xmfun/mp3/track.rb

@@ -1,13 +1,12 @@
 # -*- encoding : utf-8 -*-
 
 require 'ostruct'
-require 'xmfun/decoder'
 
 module Xmfun
   module Mp3
     class Track
       def self.new(track_hash)
-        track_hash["location"] = Xmfun::Decoder.decode(track_hash["location"])
+        track_hash["location"] = Xmfun::Util::Decoder.decode(track_hash["location"])
         track_hash["file_name"] = "#{track_hash["title"]}_#{track_hash["artist"]}.mp3"
         OpenStruct.new track_hash
       end
@@ -15,5 +14,3 @@ module Xmfun
   end
 end
 
-
-

data/lib/xmfun/util/decoder.rb

@@ -0,0 +1,18 @@
+# -*- encoding : utf-8 -*-
+
+require 'cgi'
+require 'active_support/core_ext/array/grouping'
+
+module Xmfun
+  module Util
+    class Decoder
+      def self.decode(input)
+        text = input[1..-1].chars.to_a
+        row = input[0].to_i
+
+        tmp = text.in_groups(row).transpose.join
+        CGI::unescape(tmp).gsub('^', '0')
+      end
+    end
+  end
+end

data/lib/xmfun/util/url_parser.rb

@@ -0,0 +1,28 @@
+# -*- encoding : utf-8 -*-
+
+module Xmfun
+  module Util
+    class UrlParser
+      def self.parse(url)
+        if uri? url
+          url_array = url.split("//").last.split(/(\/|\?)/)
+          type, id = url_array[2], url_array[4]
+
+          case type
+           when "album"   then "http://www.xiami.com/song/playlist/id/#{id}/type/1"
+           when "artist"  then "http://www.xiami.com/song/playlist/id/#{id}/type/2"
+           when "collect" then "http://www.xiami.com/song/playlist/id/#{id}/type/3"
+           when "song"    then "http://www.xiami.com/song/playlist/id/#{id}/object_name/default/object_id/0"
+           else ""
+          end
+        else
+         false
+        end
+      end
+
+      def self.uri?(uri)
+        uri =~ /\A#{URI::regexp(['http', 'https'])}\z/
+      end
+    end
+  end
+end

data/lib/xmfun/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 
 module Xmfun
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/xmfun/decode_spec.rb

@@ -2,9 +2,9 @@
 require 'spec_helper'
 
 module Xmfun
-  describe Decoder do
+  describe Util::Decoder do
     before do
-      @decoder  = Xmfun::Decoder
+      @decoder  = Xmfun::Util::Decoder
       @location = "8h2fmF%2956mtDe%fc185utFii12F%65ph3e5d24%Elt%l.%F35233_%4Ece%5-lp2ec272E74%k57e235E%%F.oF1%%123eE2eefE%53mxm16527_Fyd%6ab75EA5i%69EF_la%c52d88E-%.a29%333.u38E6a-8%n"
       @url      = "http://m5.file.xiami.com/1/169/7169/320390/3562717_365342_l.mp3?auth_key=30dc8ee47200ee626fdc2eadac2e3fb8-1407888000-0-null"
     end

data/xmfun.gemspec

@@ -19,15 +19,18 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "clap", "~> 1.0.0"
-  spec.add_dependency "nokogiri", "~> 1.6.3.1"
   spec.add_dependency "nori", "~> 2.4.0"
+  spec.add_dependency "nokogiri", "~> 1.6.3.1"
   spec.add_dependency "parallel", "~> 1.2.2"
   spec.add_dependency "ruby-mp3info", "~> 0.8.4"
+  spec.add_dependency "activesupport", "~> 4.1.5"
   spec.add_dependency "ruby-progressbar", "~> 1.5.1"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.3.2"
   spec.add_development_dependency "rspec", "~> 3.0.0"
   spec.add_development_dependency "pry", "~> 0.10.0"
-  spec.add_development_dependency "pry-byebug", "~> 1.3.3"
+  if RUBY_VERSION =~ /^2\./
+    spec.add_development_dependency "pry-byebug", "~> 1.3.3"
+  end
 end

metadata

@@ -1,169 +1,169 @@
 --- !ruby/object:Gem::Specification
 name: xmfun
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - ipmsteven
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2014-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: nori
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.3.1
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.3.1
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
-  name: nori
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 1.6.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 1.6.3.1
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: ruby-mp3info
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.4
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.1.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.1.5
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 10.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 10.3.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.10.0
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.3
 description: Yet another xiami music downloader
 email:
 - steven.lyl147@gmail.com
@@ -172,20 +172,20 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/xmfun
 - lib/xmfun.rb
-- lib/xmfun/decoder.rb
 - lib/xmfun/downloader.rb
 - lib/xmfun/mp3/mp3_tagger.rb
 - lib/xmfun/mp3/track.rb
-- lib/xmfun/url_parser.rb
+- lib/xmfun/util/decoder.rb
+- lib/xmfun/util/url_parser.rb
 - lib/xmfun/version.rb
 - spec/spec_helper.rb
 - spec/xmfun/decode_spec.rb
@@ -200,12 +200,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []

data/lib/xmfun/decoder.rb

@@ -1,36 +0,0 @@
-# -*- encoding : utf-8 -*-
-
-require 'cgi'
-
-module Xmfun
-  class Decoder
-    def self.decode(input)
-      text = input[1..-1]
-      row = input[0].to_i
-      col = text.size / row - 1
-      reminder = text.size % row
-      result = []
-      start = 0
-
-      row.times do |r|
-        if reminder == 0
-          result << text[start..(start+col)]
-          start = start + col + 1
-        else
-          result << text[start..(start+col+1)]
-          start = start + col + 2
-        end
-        if reminder != 0
-          reminder = reminder - 1
-        end
-      end
-
-      tmp = (0..(result[0].size-1)).to_a.map do |n|
-        result.map{|i| i[n]}.join
-      end.join
-
-      CGI::unescape(tmp).gsub('^', '0')
-    end
-
-  end
-end

data/lib/xmfun/url_parser.rb

@@ -1,26 +0,0 @@
-# -*- encoding : utf-8 -*-
-
-module Xmfun
-  class UrlParser
-    def self.parse(url)
-      if uri? url
-        url_array = url.split("//").last.split(/(\/|\?)/)
-        type, id = url_array[2], url_array[4]
-
-        case type
-         when "album"   then "http://www.xiami.com/song/playlist/id/#{id}/type/1"
-         when "artist"  then "http://www.xiami.com/song/playlist/id/#{id}/type/2"
-         when "collect" then "http://www.xiami.com/song/playlist/id/#{id}/type/3"
-         when "song"    then "http://www.xiami.com/song/playlist/id/#{id}/object_name/default/object_id/0"
-         else ""
-        end
-      else
-       false
-      end
-    end
-
-    def self.uri?(uri)
-      uri =~ /\A#{URI::regexp(['http', 'https'])}\z/
-    end
-  end
-end