xmfun 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc921b2d64b591315ce9b88105e859b3bf335423
-  data.tar.gz: b7fffd8bf10c34c3cb85ecc217d2ff138d61a8a3
+  metadata.gz: df82d030462552e3c7a46301507d42156b89637a
+  data.tar.gz: 39ba675bbb2705abe84821eea975a7ee0d79bd5e
 SHA512:
-  metadata.gz: d69e949c50bd95c4ba5514170f530fdbe75be3d24e2a69956a839a2670807abc27e72e31a94da0b8ffc5cb39caf2005384efc8cda5af7b5549e2a4b95de294e3
-  data.tar.gz: 26d013a9edfef57fe389764de991f4c144bc316f557b3883a96f36f529e1803b7b39e7b951825a402eb4e21698be1c43979ff29cd048be5d9b26e2ead9924958
+  metadata.gz: 72e7421684f5b9373b24991f6b25d02deb136bbdc2320c5aa407e9dc9523c69bb3bc7ff7670ff8f806e47b2ee01b73a783bda09a3f7b706d3a23dc440fd2e8dd
+  data.tar.gz: 635a174bd39ee90121e14359384a65f6c66c08288a0b57c6b8dc64bcd12c3de4c73175283bbb1b157b16ee9535c2a02ad02a3b64a77d717747f17931f204c48b

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 2.1.2
+  - 2.0.0
+  - 1.9.3

data/README.md

@@ -1,4 +1,8 @@
 # XMfun
+[![Build
+Status](https://travis-ci.org/ipmsteven/xmfun.svg?branch=master)](https://travis-ci.org/ipmsteven/xmfun)
+[![Code
+Climate](https://codeclimate.com/github/ipmsteven/xmfun/badges/gpa.svg)](https://codeclimate.com/github/ipmsteven/xmfun)
 
 Yet Another Xiami Music Downloader
 

data/bin/xmfun

@@ -7,8 +7,9 @@ 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" },
+  #"-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) },
   "-d" => lambda { |d| dst = d },
   "-v" => lambda { puts Xmfun::VERSION },
   "-h" => lambda { puts Xmfun.help }

data/lib/xmfun.rb

@@ -1,4 +1,6 @@
+# -*- encoding : utf-8 -*-
 require 'xmfun/version'
+require 'xmfun/url_parser'
 require 'xmfun/decoder'
 require 'xmfun/downloader'
 
@@ -8,14 +10,13 @@ module Xmfun
   def self.help
 <<-HELP
 Usage: ruby xmfun.rb
-  -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
 
-Example:  Download Collect with ID 10181268 and save to current path
-          xmfun -c 10181268 -d .
+Example:  Download song from "http://www.xiami.com/song/383221" and save to 'xuwei' folder
+          xmfun -u http://www.xiami.com/song/383221 -d xuwei
 HELP
   end
 end

data/lib/xmfun/decoder.rb

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

data/lib/xmfun/downloader.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'open-uri'
 require 'nokogiri'
 require 'clap'
@@ -18,8 +19,13 @@ module Xmfun
       end
 
       f = Nokogiri::XML(open(url, "Client-IP" => "220.181.111.168"))
-      progress = ProgressBar.create(:title => "The Progress", :total => f.css("track").size )
-      Parallel.map(f.css("track"), :finish => lambda { |item, i, result| progress.increment }) do |track|
+      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

data/lib/xmfun/url_parser.rb

@@ -0,0 +1,26 @@
+# -*- 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

data/lib/xmfun/version.rb

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

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'xmfun'
 
 # This file was generated by the `rspec --init` command. Conventionally, all

data/spec/xmfun/decode_spec.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xmfun
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - ipmsteven
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2014-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clap
@@ -146,6 +146,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -154,6 +155,7 @@ files:
 - lib/xmfun.rb
 - lib/xmfun/decoder.rb
 - lib/xmfun/downloader.rb
+- lib/xmfun/url_parser.rb
 - lib/xmfun/version.rb
 - spec/spec_helper.rb
 - spec/xmfun/decode_spec.rb