rmd 0.1.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 067b842cf92f0aa47fd788df9be9ec098ba8ff8c
-  data.tar.gz: a08076b6ca0964cdeab82cd2d1afa4e4e0cf9cb9
+  metadata.gz: f3ddcad37e5cdac99c411e76c0cfb9ce51ef15ad
+  data.tar.gz: b59e8e7e27ce5f1e070bbcb23a31a89a9599d026
 SHA512:
-  metadata.gz: 8bb42566cae5d64de652e7ecca6b5191e2acc447157e919921fd9e109a855542f9bba0d1477f199ad2c82b5cf410f627ae8f5ba2d2fd5c0f903e94af154398e2
-  data.tar.gz: af17255fe296d64208947df4a4f183e240286d1940e23fc9a9244b63550ffaef82629638233e06694d448398a1c29df1733ae9d3f77ab55dabd935095489d562
+  metadata.gz: a20449ff0ae12d79f9ecf8f88c2a0ab207db78c0cf04fd7775eae332318387b4cb508fe46ec25491525264314a98c949287d126a7b37b945db68856a63c82270
+  data.tar.gz: 955d1c8e5191417aca895fdf5003e850649df4a80c5ffb910d1fed308608f83decc396a1fa92c9ecf80abcd0fc24a0214df122299e5576b9f8b83d1cf254cd00

data/lib/rmd/base/playlist.rb

@@ -32,7 +32,7 @@ module RMD
       end
 
       def calculate_progress
-        if song_elements.count > 0
+        if song_elements != []
           progress_bar = ProgressBar.create(
             starting_at: 0,
             total: song_elements.count,

data/lib/rmd/downloader.rb

@@ -46,9 +46,9 @@ module RMD
     private
 
     def file_path
-      if options[:folder]
-        FileUtils.mkdir_p(options[:folder]) unless File.directory?(options[:folder])
-        File.join(options[:folder], file_name)
+      if folder_path
+        FileUtils.mkdir_p(folder_path) unless File.directory?(folder_path)
+        File.join(folder_path, file_name)
       else
         file_name
       end
@@ -67,5 +67,9 @@ module RMD
         File.basename(uri.path)
       end
     end
+
+    def folder_path
+      options[:folder]
+    end
   end
 end

data/lib/rmd/factory/base.rb

@@ -0,0 +1,37 @@
+require 'rmd/song_playlist_adapter'
+
+module RMD
+  module Factory
+    class Base
+      attr_reader :link
+
+      def initialize(link)
+        @link = link
+      end
+
+      def build
+        case link
+        when song_regex
+          RMD::SongPlaylistAdapter.new(base_class::Song.new(link))
+        when playlist_regex
+          base_class::Playlist.new(link)
+        else
+          raise 'Your url is not valid. Please check again.'
+        end
+      end
+
+      def self.build(link)
+        new(link).build
+      end
+
+      private
+
+      def song_regex
+        /bai-hat/
+      end
+
+      def playlist_regex; end
+      def base_class; end
+    end
+  end
+end

data/lib/rmd/factory/main.rb

@@ -0,0 +1,29 @@
+require 'rmd/factory/nct'
+require 'rmd/factory/zing'
+
+module RMD
+  module Factory
+    class Main
+      attr_reader :link
+
+      def initialize(link)
+        @link = link
+      end
+
+      def build
+        case link
+        when /nhaccuatui/
+          RMD::Factory::NCT.build(link)
+        when /mp3\.zing\.vn/
+          RMD::Factory::Zing.build(link)
+        else
+          raise 'Your url must belong to nhaccuatui/zing.'
+        end
+      end
+
+      def self.build(link)
+        new(link).build
+      end
+    end
+  end
+end

data/lib/rmd/factory/nct.rb

@@ -0,0 +1,19 @@
+require 'rmd/factory/base'
+require 'rmd/nct/song'
+require 'rmd/nct/playlist'
+
+module RMD
+  module Factory
+    class NCT < RMD::Factory::Base
+      private
+
+      def playlist_regex
+        /playlist/
+      end
+
+      def base_class
+        RMD::NCT
+      end
+    end
+  end
+end

data/lib/rmd/factory/zing.rb

@@ -0,0 +1,19 @@
+require 'rmd/factory/base'
+require 'rmd/zing/song'
+require 'rmd/zing/playlist'
+
+module RMD
+  module Factory
+    class Zing < RMD::Factory::Base
+      private
+
+      def playlist_regex
+        /album|playlist/
+      end
+
+      def base_class
+        RMD::Zing
+      end
+    end
+  end
+end

data/lib/rmd/main.rb

@@ -1,10 +1,13 @@
 module RMD
   class Main < Thor
+
     desc 'download [LINK]', "Dowload your music from a specific link"
     method_option :folder, aliases: '-d', desc: 'Choose specific folder to put the downloaded file'
+    method_option :fast, type: :boolean, default: false, desc: 'Use multithread to enable faster download, default: false'
+
     def download(link = nil)
       if link == nil
-        invoke :help
+        invoke(:help, [:download])
       else
         RMD::Processor.process(link, options)
       end

data/lib/rmd/process_strategy/base.rb

@@ -0,0 +1,21 @@
+require 'rmd/downloader'
+
+module RMD
+  module ProcessStrategy
+    class Base
+      attr_reader :options
+
+      def initialize(options)
+        @options = options
+      end
+
+      def process(playlist); end
+
+      private
+
+      def download(link)
+        RMD::Downloader.download(link, options)
+      end
+    end
+  end
+end

data/lib/rmd/process_strategy/multi_thread.rb

@@ -0,0 +1,16 @@
+require 'rmd/process_strategy/base'
+require 'parallel'
+
+module RMD
+  module ProcessStrategy
+    class MultiThread < RMD::ProcessStrategy::Base
+      MAX_PROCESS = 10
+
+      def process(songs)
+        Parallel.each(songs, in_processes: MAX_PROCESS) do |song|
+          download(song)
+        end
+      end
+    end
+  end
+end

data/lib/rmd/process_strategy/single_thread.rb

@@ -0,0 +1,13 @@
+require 'rmd/process_strategy/base'
+
+module RMD
+  module ProcessStrategy
+    class SingleThread < RMD::ProcessStrategy::Base
+      def process(songs)
+        songs.each do |song|
+          download(song)
+        end
+      end
+    end
+  end
+end

data/lib/rmd/processor.rb

@@ -1,6 +1,6 @@
-require 'rmd/downloader'
-require 'rmd/factory'
-require 'ruby-progressbar'
+require 'rmd/factory/main'
+require 'rmd/process_strategy/single_thread'
+require 'rmd/process_strategy/multi_thread'
 
 module RMD
   class Processor
@@ -13,13 +13,11 @@ module RMD
 
     def process
       puts "Start processing #{link}...".green
-      playlist = RMD::Factory.build(link)
+      playlist = RMD::Factory::Main.build(link)
       playlist.fetch
 
       if playlist.success?
-        playlist.songs.each do |song|
-          download(song)
-        end
+        strategy.process(playlist.songs)
       end
 
       playlist.errors.each do |error|
@@ -30,16 +28,20 @@ module RMD
     def self.process(link, options = {})
       begin
         new(link, options).process
-      rescue => e
-        puts e.message.red
+      rescue => error
+        puts error.message.red
         puts 'Errors! Can not continue!'.red
       end
     end
 
     private
 
-    def download(data_link)
-      RMD::Downloader.download(data_link, options)
+    def strategy
+      @strategy ||= if options[:fast]
+                    RMD::ProcessStrategy::MultiThread.new(options)
+                  else
+                    RMD::ProcessStrategy::SingleThread.new(options)
+                  end
     end
   end
 end

data/lib/rmd/song_playlist_adapter.rb

@@ -1,3 +1,5 @@
+require 'forwardable'
+
 module RMD
   class SongPlaylistAdapter
     extend Forwardable

data/lib/rmd/version.rb

@@ -1,3 +1,3 @@
 module Rmd
-  VERSION = "0.1.2"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rmd
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors:
 - Hieu Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-20 00:00:00.000000000 Z
+date: 2015-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -163,13 +177,19 @@ files:
 - lib/rmd/base/playlist.rb
 - lib/rmd/base/song.rb
 - lib/rmd/downloader.rb
-- lib/rmd/factory.rb
+- lib/rmd/factory/base.rb
+- lib/rmd/factory/main.rb
+- lib/rmd/factory/nct.rb
+- lib/rmd/factory/zing.rb
 - lib/rmd/main.rb
 - lib/rmd/nct/getter/base.rb
 - lib/rmd/nct/getter/key_from_page.rb
 - lib/rmd/nct/getter/key_from_url.rb
 - lib/rmd/nct/playlist.rb
 - lib/rmd/nct/song.rb
+- lib/rmd/process_strategy/base.rb
+- lib/rmd/process_strategy/multi_thread.rb
+- lib/rmd/process_strategy/single_thread.rb
 - lib/rmd/processor.rb
 - lib/rmd/song_playlist_adapter.rb
 - lib/rmd/version.rb

data/lib/rmd/factory.rb

@@ -1,40 +0,0 @@
-require 'rmd/song_playlist_adapter'
-require 'rmd/nct/song'
-require 'rmd/nct/playlist'
-require 'rmd/zing/song'
-require 'rmd/zing/playlist'
-
-module RMD
-  class Factory
-    attr_reader :link
-
-    def initialize(link)
-      @link = link
-    end
-
-    def build
-      case link
-      when /nhaccuatui/
-        case link
-        when /bai-hat/
-          RMD::SongPlaylistAdapter.new(RMD::NCT::Song.new(link))
-        when /playlist/
-          RMD::NCT::Playlist.new(link)
-        end
-      when /mp3\.zing\.vn/
-        case link
-        when /bai-hat/
-          RMD::SongPlaylistAdapter.new(RMD::Zing::Song.new(link))
-        when /album|playlist/
-          RMD::Zing::Playlist.new(link)
-        end
-      else
-        raise 'Your url is not valid. Please check again.'
-      end
-    end
-
-    def self.build(link)
-      new(link).build
-    end
-  end
-end