viddl-rb 0.96 → 0.98

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA512: 
-  data.tar.gz: ff67e34025fae7f2799db8f7fcde11485942e5a7971d8f915bff66ec9ed49d20a0d8013f14268765dade6adc24c6c80320306fef363b78c876076942071d11eb
-  metadata.gz: d77571b6da60ad4fdb6c235232c19c528ce7e3f03f290c580d89953ee4dc24d04d77fc02d9e5422007c4902a8263fa0c5fccf47e5329ca37c9970fa82ccbd462
 SHA1: 
-  data.tar.gz: fafe08cbf9074f38e92dcb632f397e45f86d2c00
-  metadata.gz: 2019cc2be56479dd8827a2979641b8b14bc6cd08
+  data.tar.gz: 8a400ba81f44686ac1d23b19efaa1e37e76c98b1
+  metadata.gz: f8dc72f7877933446a2a0c243e5ea6205a8a13c5
+SHA512: 
+  data.tar.gz: 868498697d3850fe3d11071e6a4375a4215e6313a685cba072ac9f1318dbf6fe34b3fbdc3067bce13454697ce1720b94081442c552d5f2a8d630d67d81a4695c
+  metadata.gz: f0d977af3eb3a90ecdf5dbdc82e411051dba179807adeafc8cb8a3a5f07addd77ed9550fb9aa2af18379537678a98a754d24c258151fe6d70a85b97f63e3356d

data/README.md

@@ -25,7 +25,7 @@ Viddl-rb supports the following command line options:
 -d, --downloader TOOL            Specifies the tool to download with. Supports 'wget', 'curl' and 'net-http'
 -q, --quality QUALITY            Specifies the video format and resolution in the following way: width:height:res (e.g. 1280:720:mp4)
                                  The width, height and resolution may be omitted with a *.
-                                 For example, to match any quality with a width of 720 pixels in any format specify --quality *:720:*
+                                 For example, to match any quality with a height of 720 pixels in any format specify --quality *:720:*
 -h, --help                       Displays the help screen
 ```
 

data/helper/audio-helper.rb

@@ -1,4 +1,3 @@
-require 'shellwords'
 
 module ViddlRb
 
@@ -8,7 +7,7 @@ module ViddlRb
     def self.extract(file_name, save_dir)
       # capture stderr because ffmpeg expects an output param and will error out
       puts "Gathering information about the downloaded file."
-      escaped_input_file_path = Shellwords.escape(File.join(save_dir, file_name))
+      escaped_input_file_path = UtilityHelper.make_shellsafe_path(File.join(save_dir, file_name))
       file_info = Open3.popen3("ffmpeg -i #{escaped_input_file_path}") {|stdin, stdout, stderr, wait_thr| stderr.read }
       puts "Done gathering information about the downloaded file."
 

data/helper/utility-helper.rb

@@ -1,7 +1,9 @@
-# This class contains utility methods that are used by both the bin utility and the library.
+
+require 'shellwords'
 
 module ViddlRb
 
+  # This class contains utility methods that are used by both the bin utility and the library.
   class UtilityHelper
 
     # Loads all plugins in the plugin directory.
@@ -33,6 +35,19 @@ module ViddlRb
       (RbConfig::CONFIG["host_os"] =~ /windows|mingw/i) != nil
     end
 
+    def self.jruby?
+      ENV["RUBY_VERSION"].downcase.include?("jruby")
+    end
+
+    def self.make_shellsafe_path(path)
+      # JRuby cannot open some paths that are escaped with Shellwords.escape so this is a workaround.
+      if jruby?
+        '"' + path + '"'
+      else
+        Shellwords.escape(path)
+      end
+    end
+
     #checks to see whether the os has a certain utility like wget or curl
     #`` returns the standard output of the process
     #system returns the exit code of the process

data/plugins/youtube/decipherer.rb

@@ -87,7 +87,8 @@ class Decipherer
     'vflLjFx3B' => 'w40 w62 r s2 w21 s3 r w7 s3',     # 10 Feb 2014
     'vfliqjKfF' => 'w40 w62 r s2 w21 s3 r w7 s3',     # 13 Feb 2014
     'ima-vflxBu-5R' => 'w40 w62 r s2 w21 s3 r w7 s3', # 13 Feb 2014
-    'ima-vflrGwWV9' => 'w36 w45 r s2 r'               # 20 Feb 2014
+    'ima-vflrGwWV9' => 'w36 w45 r s2 r',              # 20 Feb 2014
+    'ima-vflCME3y0' => 'w8 s2 r w52'                  # 27 Feb 2014
   }
 
   def decipher_with_version(cipher, cipher_version)

data/plugins/youtube/url_resolver.rb

@@ -22,7 +22,7 @@ class UrlResolver
     #http://www.youtube.com/watch?v=9WEP5nCxkEY&videos=jKY836_WMhE&playnext_from=TL&playnext=1
     #http://www.youtube.com/watch?v=Tk78sr5JMIU&videos=jKY836_WMhE
 
-    playlist_ID = url[/(?:list=PL|p=)(.+?)(?:&|\/|$)/, 1]
+    playlist_ID = url[/(?:list=PL|p=|list=)(.+?)(?:&|\/|$)/, 1]
     Youtube.notify "Playlist ID: #{playlist_ID}"
     feed_url = PLAYLIST_FEED % playlist_ID
     url_array = get_video_urls(feed_url)

data/plugins/youtube/video_resolver.rb

@@ -87,7 +87,6 @@ class VideoResolver
 
   def get_deciphered_sig(sig)
     return sig if sig.length == CORRECT_SIGNATURE_LENGTH
-    #crequire 'pry'; binding.pry; exit
     @decipherer.decipher_with_version(sig, get_html5player_version)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: viddl-rb
 version: !ruby/object:Gem::Version 
-  version: "0.96"
+  version: "0.98"
 platform: ruby
 authors: 
 - Marc Seeger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-02-25 00:00:00 Z
+date: 2014-02-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mime-types