viddl-rb 0.82 → 0.84

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    viddl-rb (0.81)
+    viddl-rb (0.82)
       mechanize
       nokogiri (~> 1.5.0)
       progressbar

data/README.md

@@ -1,20 +1,23 @@
-__viddl-rb:__ 
-Initially created by Marc Seeger (@rb2k)  
-Repo: http://github.com/rb2k/viddl-rb  
+__viddl-rb:__
+Initially created by Marc Seeger ([@rb2k](github.com/rb2k))
+
+Repo: http://github.com/rb2k/viddl-rb
+
 [![Gem Version](https://badge.fury.io/rb/viddl-rb.png)](http://badge.fury.io/rb/viddl-rb)[![Build Status](https://secure.travis-ci.org/rb2k/viddl-rb.png)](http://travis-ci.org/rb2k/viddl-rb) [![Dependency Status](https://gemnasium.com/rb2k/viddl-rb.png)](https://gemnasium.com/rb2k/viddl-rb)
 
 __Installation:__
 
-gem install viddl-rb
+`gem install viddl-rb`
 
 __Usage:__
 
-Download a video:  
+Download a video:
     ```viddl-rb http://www.youtube.com/watch?v=QH2-TGUlwu4```
 
 Viddl-rb supports the following command line options:
 ```
 -e, --extract-audio              Save video audio to file
+-a, --abort-on-failure           Abort download queue if one of the videos fail to download
 -u, --url-only                   Prints url without downloading
 -t, --title-only                 Prints title without downloading
 -f, --filter REGEX               Filters a video playlist according to the regex (Youtube only right now)
@@ -24,26 +27,26 @@ Viddl-rb supports the following command line options:
 -h, --help                       Displays the help screen
 ```
 
-Download a video and extract the audio:  
+Download a video and extract the audio:
     ```viddl-rb http://www.youtube.com/watch?v=QH2-TGUlwu4 --extract-audio```
 
 In both cases we'll name the output file according to the video title.
 
-Setting the video save directory:  
+Setting the video save directory:
     ```viddl-rb http://vimeo.com/38372260 --save-dir C:/myvideos```
 
 The --save-dir option works with both absolute and relative paths (relative based on the directory viddl-rb is run from).
 If you want to save to a folder with spaces in it, you have to quote the path like this: --save-dir "C:/my videos"
 
-__Youtube plugin specifics:__  
+__Youtube plugin specifics:__
 
-Download all videos on a playlist:  
+Download all videos on a playlist:
     ```viddl-rb http://www.youtube.com/playlist?list=PL7E8DA0A515924126```
 
-Download all videos from a user:  
+Download all videos from a user:
     ```viddl-rb http://www.youtube.com/user/tedtalksdirector```
 
-Filter videos to download from a user/playlist:  
+Filter videos to download from a user/playlist:
     ```viddl-rb http://www.youtube.com/user/tedtalksdirector --filter /internet/i```
 
 The --filter argument accepts a regular expression and will only download videos where the title matches the regex.
@@ -62,7 +65,7 @@ The ViddlRb module has the following module public methods:
 
 * __get_urls_names(url)__
 -- Returns an array of one or more hashes that has the keys :url which
-points to the download url and :name which points to the name 
+points to the download url and :name which points to the name
 (which is a filename safe version of the video title with a file extension).
 Returns nil if the url is not recognized by any plugins.
 
@@ -90,8 +93,8 @@ require 'viddl-rb'
 ViddlRb.io = $stdout     # plugins will now write their output to $stdout
 ```
 
-All the __get__ methods in the ViddlRb module will raise either a ViddlRb::PluginError or a ViddlRb::DownloadError if the plugin fails. 
-A ViddlRb::PluginError is raised if the plugin fails in an unexpected way, and a ViddlRb::DownloadError is raised if the video could not be downloaded for some reason. 
+All the __get__ methods in the ViddlRb module will raise either a ViddlRb::PluginError or a ViddlRb::DownloadError if the plugin fails.
+A ViddlRb::PluginError is raised if the plugin fails in an unexpected way, and a ViddlRb::DownloadError is raised if the video could not be downloaded for some reason.
 An example of that is if a Youtube video is not embeddable - then it can't be downloaded.
 
 ```ruby
@@ -107,7 +110,7 @@ end
 
 __Requirements:__
 
-* curl/wget or the [progress bar](http://github.com/nex3/ruby-progressbar/) gem  
+* curl/wget or the [progress bar](http://github.com/nex3/ruby-progressbar/) gem
 * [Nokogiri](http://nokogiri.org/)
 * [Mechanize](http://mechanize.rubyforge.org/)
 * ffmpeg if you want to extract audio tracks from the videos
@@ -115,8 +118,9 @@ __Requirements:__
 __Co Maintainer:__
 * [kl](https://github.com/kl): Windows support (who knew!), bug fixes, veoh plugin, metacafe plugin, refactoring it into a library, ...
 
-__Contributors:__  
+__Contributors:__
 * [divout](https://github.com/divout) aka Ivan K: blip.tv plugin, bugfixes
 * Sniper: bugfixes
 * [Serabe](https://github.com/Serabe) aka Sergio Arbeo: packaging viddl as a binary
 * [laserlemon](https://github.com/laserlemon): Adding gemnasium images to readme
+* [farleyknight](https://github.com/farleyknight): Various small fixes and improvements

data/bin/helper/downloader.rb

@@ -10,7 +10,11 @@ class Downloader
 
       result = ViddlRb::DownloadHelper.save_file(url, name, :save_dir => params[:save_dir], :tool => params[:tool])
       unless result
-        raise DownloadFailedError, "Download for #{name} failed."
+        if params[:abort_on_failure]
+          raise DownloadFailedError, "Download for #{name} failed."
+        else
+          puts "Download for #{name} failed. Moving onto next file."
+        end
       else
         puts "Download for #{name} successful."
         ViddlRb::AudioHelper.extract(name, params[:save_dir]) if params[:extract_audio]

data/bin/helper/parameter-parser.rb

@@ -10,6 +10,7 @@ class ParameterParser
   #returns a hash with the parameters in it:
   # :url              => the video url
   # :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
   # :title_only       => do not download, only print the titles to stdout
   # :playlist_filter  => a regular expression used to filter playlists
@@ -21,6 +22,7 @@ class ParameterParser
     # Default option values are set here
     options = {
       :extract_audio    => false,
+      :abort_on_failure => false,
       :url_only         => false,
       :title_only       => false,
       :playlist_filter  => nil,
@@ -40,6 +42,10 @@ class ParameterParser
         end
       end
 
+      opts.on("-a", "--abort-on-failure", "Abort download queue if one of the videos fail to download") do
+        options[:abort_on_failure] = true
+      end
+
       opts.on("-u", "--url-only", "Prints url without downloading") do
         options[:url_only] = true
       end
@@ -68,8 +74,8 @@ class ParameterParser
         end
       end
 
-      opts.on("-q", "--quality QUALITY", 
-          "Specifies the video format and resolution in the following way => resolution:extension (e.g. 720:mp4)") do |quality|
+      opts.on("-q", "--quality QUALITY",
+              "Specifies the video format and resolution in the following way => resolution:extension (e.g. 720:mp4)") do |quality|
         if match = quality.match(/(\d+):(.*)/)
           res = match[1]
           ext = match[2]
@@ -91,7 +97,7 @@ class ParameterParser
     print_help_and_exit(optparse) if args.empty?    # exit if no video url
     url = args.first                                # the url is the only element left
     validate_url!(url)                              # raise exception if invalid url
-    options[:url] = url                     
+    options[:url] = url
     options
   end
 
@@ -103,7 +109,7 @@ class ParameterParser
   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")
+                                              "please include 'http' with your URL e.g. http://www.youtube.com/watch?v=QH2-TGUlwu4")
     end
   end
 end

data/helper/audio-helper.rb

@@ -7,7 +7,7 @@ module ViddlRb
       no_ext_filename = file_path.split('.')[0..-1][0]
       #capture stderr because ffmpeg expects an output param and will error out
       puts "Gathering information about the downloaded file."
-      file_info = Open3.popen3("ffmpeg -i #{file_path}") {|stdin, stdout, stderr, wait_thr| stderr.read }
+      file_info = Open3.popen3("ffmpeg -i #{File.join(save_dir, file_path)}") {|stdin, stdout, stderr, wait_thr| stderr.read }
       puts "Done gathering information about the downloaded file."
 
       if !file_info.to_s.empty?
@@ -18,11 +18,11 @@ module ViddlRb
         else
           raise "ERROR: Couldn't find any audio:\n#{file_info.inspect}"
         end
-        
+
         extension_mapper = {
-        'aac' => 'm4a',
-        'mp3' => 'mp3',
-        'vorbis' => 'ogg'
+          'aac' => 'm4a',
+          'mp3' => 'mp3',
+          'vorbis' => 'ogg'
         }
 
         if extension_mapper.key?(audio_format)
@@ -37,7 +37,7 @@ module ViddlRb
           puts "Audio file seems to exist already, removing it before extraction."
           File.delete(output_filename)
         end
-        Open3.popen3("ffmpeg -i #{file_path} -vn -acodec copy #{output_filename}") { |stdin, stdout, stderr, wait_thr| stdout.read }
+        Open3.popen3("ffmpeg -i #{File.join(save_dir, file_path)} -vn -acodec copy #{output_filename}") { |stdin, stdout, stderr, wait_thr| stdout.read }
         puts "Done extracting audio to #{output_filename}"
       else
         raise "ERROR: Error while checking audio track of #{file_path}"

data/helper/utility-helper.rb

@@ -34,7 +34,7 @@ module ViddlRb
 
     #recursively get the final location (after following all redirects) for an url.
     def self.get_final_location(url)
-      Net::HTTP.get_response(URI(url)) do |res|
+      Net::HTTP.get_response(URI.parse(url)) do |res|
         location = res["location"]
         return url if location.nil?
         return get_final_location(location)

data/plugins/youtube.rb

@@ -81,8 +81,7 @@ class Youtube < PluginBase
     file_name = PluginBase.make_filename_safe(title) + "." + VIDEO_FORMATS[selected_format][:extension]
 
     # cleaning
-    clean_url = urls_formats[selected_format].gsub(/\\u0026[^&]*/, "")
-
+    clean_url = urls_formats[selected_format].gsub(/\\u0026[^&]*/, "").split(',type=video').first
     {:url => clean_url, :name => file_name}
   end
 

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: viddl-rb
 version: !ruby/object:Gem::Version 
-  hash: 175
+  hash: 163
   prerelease: 
   segments: 
   - 0
-  - 82
-  version: "0.82"
+  - 84
+  version: "0.84"
 platform: ruby
 authors: 
 - Marc Seeger
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-21 00:00:00 Z
+date: 2013-09-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri