viddl-rb 0.88 → 0.89

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA512: 
-  metadata.gz: cf812cece7ef8e7eebc091e815bddb2582a8359ea0cedbb78bf6805a869540e79d794e22c7925c9bc760e472596be5e2803bc0a8c127ec197fdb2115ca88c9fe
-  data.tar.gz: 11dd9c9a0efd88776dd7e98ea74e82bc5d99cdf2772c61ab115104104381a62fec10525a80bf7f2a4b55ced8e517857a4b96a0ba51145b347975157e2cb328a3
 SHA1: 
-  metadata.gz: e33af67bee8c6f53ae12de3c1ae1032fe12824af
-  data.tar.gz: 9522835d1a341f931dc4de88cc56fe9e508b702d
+  data.tar.gz: 7de5023703da26be9d242da04ec58925b843575e
+  metadata.gz: dfb1edf7260c4c6e5606a8cd27e5f9bfad7f6a79
+SHA512: 
+  data.tar.gz: 7d81c1e71aa8b04eddc36c624b6ed619367be48ce3fccc1adeb2a76310dda35f0a30dd1174c2a85753f6b78c52bfea6665477eec6af79f16255503ff9af2deb2
+  metadata.gz: 934b156a9bce149f474e9c6da09c5f454168ecdab0119cc0849bcc5e1351299c3bc35ad55d2ab5d5f7bd1fbdcb8a3e083fa3ddaa2bf9dcd32e5698d6f613b2b4

data/Gemfile

@@ -1,2 +1,8 @@
 source 'http://rubygems.org'
+
+platforms :rbx do
+  gem 'racc'
+  gem 'rubysl', '~> 2.0'
+end
+
 gemspec

data/bin/helper/downloader.rb

@@ -8,7 +8,10 @@ class Downloader
       url = url_name[:url]
       name = url_name[:name]
 
-      result = ViddlRb::DownloadHelper.save_file(url, name, :save_dir => params[:save_dir], :tool => params[:tool])
+      result = ViddlRb::DownloadHelper.save_file url,
+                                                 name,
+                                                 :save_dir => params[:save_dir],
+                                                 :tool => params[:tool] && params[:tool].to_sym
       unless result
         if params[:abort_on_failure]
           raise DownloadFailedError, "Download for #{name} failed."

data/bin/helper/parameter-parser.rb

@@ -67,7 +67,7 @@ class ParameterParser
       end
 
       opts.on("-d", "--downloader TOOL", "Specifies the tool to download with. Supports 'wget', 'curl' and 'net-http'") do |tool|
-        if tool =~ /(^wget$)|(^curl$)|(^net-http$)/
+        if tool =~ /(^wget$)|(^curl$)|(^net-http$)|(^aria2c$)/
           options[:tool] = tool
         else
           raise OptionParser::InvalidArgument.new("'#{tool}' is not a valid tool.")

data/helper/download-helper.rb

@@ -4,39 +4,65 @@ module ViddlRb
 
   class DownloadHelper
 
-    #viddl will use the first of these tools it finds on the system to download the video.
-    #if the system does not have any of these tools, net/http is used instead.
-    TOOLS_PRIORITY_LIST = [:wget, :curl]
+    class Tool
+      attr_reader :name
+
+      def initialize(name, &command_proc)
+        @name = name
+        @command_proc = command_proc
+      end
+
+      def get_command(download_url, save_path)
+        @command_proc.call(download_url, save_path)
+      end
+    end
+
+    # This array specifies the order of and how to invoke the different download tools.
+    # A Tool is created with a name and block, where the block should evaluate to the cmd call
+    # given a download url and a full file save path.
+    TOOLS_PRIORITY_LIST = [
+
+      Tool.new(:aria2c) do |url, path|
+        "aria2c #{url.inspect} -x4 -d #{File.dirname(path).inspect} -o #{File.basename(path).inspect}"
+      end,
+
+      Tool.new(:wget) do |url, path|
+        "wget #{url.inspect} -O #{path.inspect}"
+      end,
+
+      Tool.new(:curl) do |url, path|
+        "curl -A 'Wget/1.8.1' --retry 10 --retry-delay 5 --retry-max-time 4  -L #{url.inspect} -o #{path.inspect}"
+      end
+    ]
 
     #simple helper that will save a file from the web and save it with a progress bar
-    def self.save_file(file_url, file_name, opts = {})
+    def self.save_file(file_url, file_name, user_opts = {})
       trap("SIGINT") { puts "goodbye"; exit }
 
-      #default options
-      options = {:save_dir => ".",
-                 :amount_of_retries => 6,
-                 :tool => get_tool}
+      default_opts = {:save_dir => ".",
+                      :amount_of_retries => 6,
+                      :tool => get_default_tool}
 
-      opts[:tool] = options[:tool] if opts[:tool].nil?
-      options.merge!(opts)
+      if user_tool = user_opts[:tool]
+        user_opts[:tool] = TOOLS_PRIORITY_LIST.find { |tool| tool.name == user_tool } unless user_tool == :"net-http"
+      else
+        user_opts[:tool] = default_opts[:tool]
+      end
 
+      options = default_opts.merge(user_opts)
       file_path = File.expand_path(File.join(options[:save_dir], file_name))
       success = false
 
       #Some providers seem to flake out every now end then
       options[:amount_of_retries].times do |i|
-        case options[:tool].to_sym
-        when :wget
-          puts "Using wget"
-          success = system "wget \"#{file_url}\" -O #{file_path.inspect}"
-        when :curl
-          puts "Using curl"
-          #-L means: follow redirects, We set an agent because Vimeo seems to want one
-          success = system "curl -A 'Wget/1.8.1' --retry 10 --retry-delay 5 --retry-max-time 4  -L \"#{file_url}\" -o #{file_path.inspect}"
-        else
+        if options[:tool] == :"net-http"
           require_progressbar
           puts "Using net/http"
           success = download_and_save_file(file_url, file_path)
+        else
+          tool = options[:tool]
+          puts "Using #{tool.name}"
+          success = system tool.get_command(file_url, file_path)
         end
         #we were successful, we're outta here
         if success
@@ -46,11 +72,12 @@ module ViddlRb
           sleep 2
         end
       end
+
       success
     end
 
-    def self.get_tool
-      tool = TOOLS_PRIORITY_LIST.find { |tool| ViddlRb::UtilityHelper.os_has?(tool) }
+    def self.get_default_tool
+      tool = TOOLS_PRIORITY_LIST.find { |tool| ViddlRb::UtilityHelper.os_has?(tool.name) }
       tool || :net_http
     end
 
@@ -59,11 +86,10 @@ module ViddlRb
         require "progressbar"
       rescue LoadError
         raise RequirementError,
-          "you don't seem to have curl or wget on your system. In this case you'll need to install the 'progressbar' gem."
+          "you don't seem to have aria2, curl or wget on your system. In this case you'll need to install the 'progressbar' gem."
       end
     end
 
-    # downloads and saves a file using the net/http streaming api
     # return true if the download was successful, else returns false
     def self.download_and_save_file(download_url, full_path)
       final_url = UtilityHelper.get_final_location(download_url)    # follow all redirects

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: viddl-rb
 version: !ruby/object:Gem::Version 
-  version: "0.88"
+  version: "0.89"
 platform: ruby
 authors: 
 - Marc Seeger
@@ -32,7 +32,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: mechanize
+  name: progressbar
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
@@ -43,7 +43,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: progressbar
+  name: multi_json
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
@@ -51,15 +51,15 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: multi_json
+  name: rake
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - *id004
-  type: :runtime
+  type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: rest-client
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
@@ -67,21 +67,13 @@ dependencies:
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rest-client
+  name: minitest
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
     - *id004
   type: :development
   version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: minitest
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id004
-  type: :development
-  version_requirements: *id009
 description: An extendable commandline video downloader for flash video sites. Includes plugins for vimeo, youtube, dailymotion and more
 email: mail@marc-seeger.de
 executables: