viddl-rb 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e36d0776aad4ecbf56dad9546a7f3a0236deef45
-  data.tar.gz: a80850fff961a4fe51021e3b30729640ba25d960
+  metadata.gz: 6e6d7c34a048f529044ad34e45e5a0cbd7c8bb40
+  data.tar.gz: d8b4e60fd73ca136332b77f2c7b7b51035f4f584
 SHA512:
-  metadata.gz: aed20ff2a353ca907dac6b576f1c84f975a9fc28db5333b48d683e1b27bb5b997f5ade8fce3d7fca2ddcb76ec13d2595979de08768cd4b10abfbe4c14afba9de
-  data.tar.gz: 00460cb0524433f00653f10be86b773510d8afc0c0c847b82dd8f385ce37445de72ddec79786838e75e00a1ea54b5e006fc0d294777fa3d97c48125b74c4d3d4
+  metadata.gz: cf74b3c11632db917939a39bb1b4658beb964f846bca0919e097a6ddaece1e75d97f36e3bf27deaaee803213c537a70b74c1ee97bee3e3493f2bffbdeac32387
+  data.tar.gz: 41f831d26aa16948e1b9dd6a529b5f56b247f664a08aef4022591f3a53f2def1e6ccbf7e5000c2358315ceaf946a255968f38df712ddb6fc7332f40352ee1589

data/bin/helper/driver.rb

@@ -5,21 +5,31 @@
 class Driver
 
   def initialize(param_hash)
+    @urls = param_hash[:urls]
+    param_hash.delete :urls
     @params = param_hash
     @downloader = Downloader.new
   end
 
   #starts the downloading process or print just the urls or names.
   def start
-    queue = get_download_queue
+    @urls.each do |url|
+      @params[:url] = url
+      puts "\nAnalyzing URL: #{url}"
+      begin
+        queue = get_download_queue
 
-    if @params[:url_only]
-      queue.each { |url_name| puts url_name[:url] }
-    elsif @params[:title_only]
-      queue.each { |url_name| puts url_name[:name] }
-    else
-      @downloader.download(queue, @params)
-    end
+        if @params[:url_only]
+          queue.each { |url_name| puts url_name[:url] }
+        elsif @params[:title_only]
+          queue.each { |url_name| puts url_name[:name] }
+        else
+          @downloader.download(queue, @params)
+        end
+      rescue => e
+        puts e.message
+      end
+   end
   end
 
   private

data/bin/helper/parameter-parser.rb

@@ -8,7 +8,7 @@ class ParameterParser
   DEFAULT_SAVE_DIR = "."
 
   #returns a hash with the parameters in it:
-  # :url              => the video url
+  # :urls             => array of the video urls
   # :extract_audio    => should attempt to extract audio? (true/false)
   # :skip_failed      => should skip failed downloads? (true/false)
   # :url_only         => do not download, only print the urls to stdout
@@ -98,13 +98,8 @@ class ParameterParser
     optparse.parse!(args)
     # exit if no video url
     print_help_and_exit(optparse) if args.empty?
-    # the url is the only element left
-    url = args.first
-    # Seems like some users like to pass non protocol prefixed URIs
-    url = "http://#{url}" unless url.start_with?('http')
-    # raise exception if invalid url
-    validate_url!(url)
-    options[:url] = url
+    # remaining elements in args will be urls
+    options[:urls] = validate_urls args
     options
   end
 
@@ -113,11 +108,8 @@ class ParameterParser
     exit(0)
   end
 
-  def self.validate_url!(url)
-    unless url =~ /^http/
-      raise OptionParser::InvalidArgument.new(
-          "please include 'http' with your URL e.g. http://www.youtube.com/watch?v=QH2-TGUlwu4")
-    end
+  def self.validate_urls(urls)
+    urls.map {|url| url.start_with?("http") ? url : "http://#{url}"}
   end
 
   def self.validate_quality_options!(width, height, extension, quality)

data/bin/viddl-rb

@@ -26,7 +26,6 @@ begin
   puts "Plugins loaded: #{ViddlRb::PluginBase.registered_plugins.inspect}"
 
   puts "Will try to extract audio: #{params[:extract_audio] == true}."
-  puts "Analyzing URL: #{params[:url]}"
 
   driver = Driver.new(params)   
   driver.start                  # starts the download process

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: viddl-rb
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Marc Seeger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-01 00:00:00.000000000 Z
+date: 2015-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri