xmfun 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df82d030462552e3c7a46301507d42156b89637a
-  data.tar.gz: 39ba675bbb2705abe84821eea975a7ee0d79bd5e
+  metadata.gz: 57e6f8c8ed8e94b3301e745df32a1be299c35adc
+  data.tar.gz: 114ed2d3d93e2143d22e39cce59e708c9813a8f0
 SHA512:
-  metadata.gz: 72e7421684f5b9373b24991f6b25d02deb136bbdc2320c5aa407e9dc9523c69bb3bc7ff7670ff8f806e47b2ee01b73a783bda09a3f7b706d3a23dc440fd2e8dd
-  data.tar.gz: 635a174bd39ee90121e14359384a65f6c66c08288a0b57c6b8dc64bcd12c3de4c73175283bbb1b157b16ee9535c2a02ad02a3b64a77d717747f17931f204c48b
+  metadata.gz: 812327659aaca61580bf2f841cc0fe84eb3e57c7ae6c8f57d334c0043df6b3958a7989bff9e3f80e18089cc69d203f3e348ee0082b622df6e50ad4a9a90704b1
+  data.tar.gz: 3f249647c5051ad5d22ab1c18c514008c3954022928720ee7c0ec02528ddb1d48e3f89d0f1fe0495e0c0c55cbd9470395484aba6a7434ab08a0b9477e899a3b9

data/README.md

@@ -1,4 +1,6 @@
 # XMfun
+[![Gem
+Version](https://badge.fury.io/rb/xmfun.svg)](http://badge.fury.io/rb/xmfun)
 [![Build
 Status](https://travis-ci.org/ipmsteven/xmfun.svg?branch=master)](https://travis-ci.org/ipmsteven/xmfun)
 [![Code
@@ -26,8 +28,7 @@ Or install it yourself as:
 
 ```
 xmfun
-  -c cid  -- download a music collect
-  -s sid  -- download a single song
+  -u url  -- url on xiami website
   -d path -- path to save your music
   -v      -- show version
   -h      -- show help message

data/lib/xmfun.rb

@@ -1,5 +1,8 @@
 # -*- encoding : utf-8 -*-
+
 require 'xmfun/version'
+require 'xmfun/mp3/track'
+require 'xmfun/mp3/mp3_tagger'
 require 'xmfun/url_parser'
 require 'xmfun/decoder'
 require 'xmfun/downloader'

data/lib/xmfun/decoder.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 require 'cgi'
 
 module Xmfun

data/lib/xmfun/downloader.rb

@@ -1,11 +1,12 @@
 # -*- encoding : utf-8 -*-
+
 require 'open-uri'
 require 'nokogiri'
+require 'nori'
 require 'clap'
-require 'mp3info'
 require 'parallel'
 require 'ruby-progressbar'
-require 'xmfun/decoder'
+
 
 module Xmfun
   class Downloader
@@ -17,38 +18,57 @@ module Xmfun
         Dir.mkdir(dst)
         Dir.chdir(dst)
       end
-
       f = Nokogiri::XML(open(url, "Client-IP" => "220.181.111.168"))
-      progress = ProgressBar.create( :title => "Progress",
-                                     :total => f.css("track").size,
-                                     :format => '%a %bᗧ%i %p%% %t',
-                                     :progress_mark  => ' ',
-                                     :remainder_mark => '･'
-                                   )
-      Parallel.map( f.css("track"), :in_threads => Parallel.processor_count, :finish => lambda { |item, i, result| progress.increment } ) do |track|
-        album     = track.css('album_name').text
-        artist    = track.css('artist').text
-        lyric     = track.css('lyric').text
-        title     = track.css('title').text
-        location  = track.css('location').text
-        album_pic = track.css('album_pic').text
-        mp3 = Decoder.decode(location)
-
-        URI.parse(mp3).open do |f|
-          File.open("#{title}_#{artist}.mp3", 'w') { |mp3| mp3.write(f.read) }
+
+      tracks = f.css("track")
+
+      if tracks.size > 1
+        # progress
+        progress = ProgressBar.create( :title => "Progress",
+                                      :total => tracks.size,
+                                      :format => '%a %bᗧ%i %p%% %t',
+                                      :progress_mark  => ' ',
+                                      :remainder_mark => '･'
+                                     )
+
+        #download collect
+        Parallel.map( tracks, :in_threads => Parallel.processor_count, :finish => lambda { |item, i, result| progress.increment } ) do |track|
+
+          track = Xmfun::Mp3::Track.new(Nori.new.parse(track.to_s)['track'])
+
+          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
+      else
+        #download single sone
+        song = tracks[0]
+        track = Xmfun::Mp3::Track.new(Nori.new.parse(song.to_s)['track'])
 
-        # add mp3 meta info
-        Mp3Info.open "#{title}_#{artist}.mp3" do |m|
-          m.tag.artist = artist
-          m.tag.title  = title
-          m.tag.album  = album
+        uri = URI.parse(track.location)
+
+        progress = nil
 
-          m.tag2.remove_pictures
-          m.tag2.add_picture(open(album_pic).read)
+        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|
+          File.open(track.file_name, 'w') { |mp3| mp3.write(f.read) }
         end
+
+        # add mp3 meta info
+        Xmfun::Mp3::Mp3Tagger.tag(track)
       end
-    end
 
+    end
   end
 end

data/lib/xmfun/mp3/mp3_tagger.rb

@@ -0,0 +1,21 @@
+# -*- encoding : utf-8 -*-
+
+require 'open-uri'
+require 'mp3info'
+
+module Xmfun
+  module Mp3
+    class Mp3Tagger
+      def self.tag(track)
+        Mp3Info.open track.file_name do |m|
+          m.tag.artist = track.artist
+          m.tag.title  = track.title
+          m.tag.album  = track.album
+
+          m.tag2.remove_pictures
+          m.tag2.add_picture(open(track.album_pic).read)
+        end
+      end
+    end
+  end
+end

data/lib/xmfun/mp3/track.rb

@@ -0,0 +1,19 @@
+# -*- 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["file_name"] = "#{track_hash["title"]}_#{track_hash["artist"]}.mp3"
+        OpenStruct.new track_hash
+      end
+    end
+  end
+end
+
+
+

data/lib/xmfun/version.rb

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

data/xmfun.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   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 "parallel", "~> 1.2.2"
   spec.add_dependency "ruby-mp3info", "~> 0.8.4"
   spec.add_dependency "ruby-progressbar", "~> 1.5.1"
@@ -28,4 +29,5 @@ Gem::Specification.new do |spec|
   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"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xmfun
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - ipmsteven
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clap
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.3.1
+- !ruby/object:Gem::Dependency
+  name: nori
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +150,20 @@ dependencies:
     - - "~>"
       - !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
@@ -155,6 +183,8 @@ files:
 - 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/version.rb
 - spec/spec_helper.rb