viddl-rb 0.98 → 0.99

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  data.tar.gz: 8a400ba81f44686ac1d23b19efaa1e37e76c98b1
-  metadata.gz: f8dc72f7877933446a2a0c243e5ea6205a8a13c5
+  metadata.gz: 869f88d6332b09dea9e9c01d3205a1965b9c8c48
+  data.tar.gz: f208de4df1e7fb57d66e2e005aee7f1dbda147f6
 SHA512: 
-  data.tar.gz: 868498697d3850fe3d11071e6a4375a4215e6313a685cba072ac9f1318dbf6fe34b3fbdc3067bce13454697ce1720b94081442c552d5f2a8d630d67d81a4695c
-  metadata.gz: f0d977af3eb3a90ecdf5dbdc82e411051dba179807adeafc8cb8a3a5f07addd77ed9550fb9aa2af18379537678a98a754d24c258151fe6d70a85b97f63e3356d
+  metadata.gz: c656fa95771d40f473c698a46fa6395129b6ad5100794479a245d1ade7c51d7d0131077baae825ecf120925abc67c62a24a3924d0470b91b26e5b92d8b165784
+  data.tar.gz: 01be0e2e4510fc211f8661999e5d34f2e74c4582a57ce05619babb2f80b9c48c34a448c669e5f873db5ef250e1f27789932e658e3400ac4fd03019c32dd4c404

data/README.md

@@ -119,9 +119,8 @@ end
 
 __Requirements:__
 
-* curl/wget or the [progress bar](http://github.com/nex3/ruby-progressbar/) gem
+* curl/wget/aria2c 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
 
 __Co Maintainers:__

data/Rakefile

@@ -2,8 +2,8 @@ require 'rubygems'
 require 'bundler/setup'
 require 'rake/testtask'
 
-ALL_INTEGRATION = FileList["spec/integration/*.rb"]
-ALL_UNIT 		= FileList["spec/unit/*/*.rb"]
+ALL_INTEGRATION = FileList["spec/integration/*.rb", "spec/integration/*/*.rb"]
+ALL_UNIT        = FileList["spec/unit/*/*.rb"]
 
 task :default => [:all]
 
@@ -30,3 +30,7 @@ end
 Rake::TestTask.new(:test_download) do |t|
   t.test_files = FileList["spec/integration/download_spec.rb"]
 end
+
+Rake::TestTask.new(:test_cipher_loader) do |t|
+  t.test_files = FileList["spec/integration/youtube/cipher_loader_spec.rb"]
+end

data/helper/utility-helper.rb

@@ -48,6 +48,10 @@ module ViddlRb
       end
     end
 
+    def self.base_path
+      File.join(File.dirname(File.expand_path(__FILE__)), "..")
+    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.rb

@@ -9,7 +9,7 @@ class Youtube < PluginBase
   def self.get_urls_and_filenames(url, options = {})
 
     @url_resolver   = UrlResolver.new
-    @video_resolver = VideoResolver.new(Decipherer.new)
+    @video_resolver = VideoResolver.new(Decipherer.new(CipherLoader.new))
     @format_picker  = FormatPicker.new(options)
 
     urls = @url_resolver.get_all_urls(url, options[:filter])

data/plugins/youtube/cipher_loader.rb

@@ -0,0 +1,62 @@
+
+require 'open-uri'
+require 'net/http'
+require 'openssl'
+require 'yaml'
+
+class CipherLoader
+
+  CIPHER_YAML_URL = "https://raw.github.com/rb2k/viddl-rb/master/plugins/youtube/ciphers.yml"
+  CIPHER_YAML_PATH = File.join(ViddlRb::UtilityHelper.base_path, "plugins/youtube/ciphers.yml")
+
+  def initialize
+    @ciphers = YAML.load_file(CIPHER_YAML_PATH)
+  end
+
+  def load_ciphers
+    begin
+      update_ciphers
+    rescue => e
+      Youtube.notify "Error updating ciphers: #{e.message}. Continuing..."
+    end
+
+    @ciphers.dup
+  end
+
+  private
+
+  def update_ciphers
+    return if get_server_file_size == get_local_file_size
+
+    @ciphers.merge!(download_server_ciphers)
+    save_local_ciphers(@ciphers)
+  end
+
+  def get_local_file_size
+    File.size(CIPHER_YAML_PATH)
+  end
+
+  def get_server_file_size 
+    uri = URI.parse(CIPHER_YAML_URL)
+    http = make_http(uri)
+    head = Net::HTTP::Head.new(uri.request_uri)
+    http.request(head)["Content-Length"].to_i
+  end
+
+  def make_http(uri)
+    http = Net::HTTP.new(uri.host, uri.port)
+    http.use_ssl = true
+    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    http.open_timeout = 2
+    http.read_timeout = 2
+    http
+  end
+
+  def download_server_ciphers
+    YAML.load(open(CIPHER_YAML_URL).read)
+  end
+
+  def save_local_ciphers(ciphers)
+    File.write(CIPHER_YAML_PATH, ciphers.to_yaml)
+  end
+end

data/plugins/youtube/ciphers.yml

@@ -0,0 +1,86 @@
+---
+vflNzKG7n: s3 r s2 r s1 r w67
+vfllMCQWM: s2 w46 r w27 s2 w43 s2 r
+vflJv8FA8: s1 w51 w52 r
+vflR_cX32: s2 w64 s3
+vflveGye9: w21 w3 s1 r w44 w36 r w41 s1
+vflj7Fxxt: r s3 w3 r w17 r w41 r s2
+vfltM3odl: w60 s1 w49 r s1 w7 r s2 r
+vflDG7-a-: w52 r s3 w21 r s3 r
+vfl39KBj1: w52 r s3 w21 r s3 r
+vflmOfVEX: w52 r s3 w21 r s3 r
+vflJwJuHJ: r s3 w19 r s2
+vfl_ymO4Z: r s3 w19 r s2
+vfl26ng3K: r s2 r
+vflcaqGO8: w24 w53 s2 w31 w4
+vflQw-fB4: s2 r s3 w9 s3 w43 s3 r w23
+vflSAFCP9: r s2 w17 w61 r s1 w7 s1
+vflART1Nf: s3 r w63 s2 r s1
+vflLC8JvQ: w34 w29 w9 r w39 w24
+vflm_D8eE: s2 r w39 w55 w49 s3 w56 w2
+vflTWC9KW: r s2 w65 r
+vflRFcHMl: s3 w24 r
+vflM2EmfJ: w10 r s1 w45 s2 r s3 w50 r
+vflz8giW0: s2 w18 s3
+vfl_wGgYV: w60 s1 r s1 w9 s3 r s3 r
+vfl1HXdPb: w52 r w18 r s1 w44 w51 r s1
+vflkn6DAl: w39 s2 w57 s2 w23 w35 s2
+vfl2LOvBh: w34 w19 r s1 r s3 w24 r
+vfl-bxy_m: w48 s3 w37 s2
+vflZK4ZYR: w19 w68 s1
+vflh9ybst: w48 s3 w37 s2
+vflapUV9V: s2 w53 r w59 r s2 w41 s3
+vflg0g8PQ: w36 s3 r s2
+vflHOr_nV: w58 r w50 s1 r s1 r w11 s3
+vfluy6kdb: r w12 w32 r w34 s3 w35 w42 s2
+vflkuzxcs: w22 w43 s3 r s1 w43
+vflGNjMhJ: w43 w2 w54 r w8 s1
+vfldJ8xgI: w11 r w29 s1 r s3
+vfl79wBKW: s3 r s1 r s3 r s3 w59 s2
+vflg3FZfr: r s3 w66 w10 w43 s2
+vflUKrNpT: r s2 r w63 r
+vfldWnjUz: r s1 w68
+vflP7iCEe: w7 w37 r s1
+vflzVne63: w59 s2 r
+vflO-N-9M: w9 s1 w67 r s3
+vflZ4JlpT: s3 r s1 r w28 s1
+vflDgXSDS: s3 r s1 r w28 s1
+vflW444Sr: r w9 r s1 w51 w27 r s1 r
+vflK7RoTQ: w44 r w36 r w45
+vflKOCFq2: s1 r w41 r w41 s1 w15
+vflcLL31E: s1 r w41 r w41 s1 w15
+vflz9bT3N: s1 r w41 r w41 s1 w15
+vfliZsE79: r s3 w49 s3 r w58 s2 r s2
+vfljOFtAt: r s3 r s1 r w69 r
+vflqSl9GX: w32 r s2 w65 w26 w45 w24 w40 s2
+vflFrKymJ: w32 r s2 w65 w26 w45 w24 w40 s2
+vflKz4WoM: w50 w17 r w7 w65
+vflhdWW8S: s2 w55 w10 s3 w57 r w25 w41
+vfl66X2C5: r s2 w34 s2 w39
+vflCXG8Sm: r s2 w34 s2 w39
+vfl_3Uag6: w3 w7 r s2 w27 s2 w42 r
+vflQdXVwM: s1 r w66 s2 r w12
+vflCtc3aO: s2 r w11 r s3 w28
+vflCt6YZX: s2 r w11 r s3 w28
+vflG49soT: w32 r s3 r s1 r w19 w24 s3
+vfl4cHApe: w25 s1 r s1 w27 w21 s1 w39
+vflwMrwdI: w3 r w39 r w51 s1 w36 w14
+vfl4AMHqP: r s1 w1 r w43 r s1 r
+vfln8xPyM: w36 w14 s1 r s1 w54
+vflVSLmnY: s3 w56 w10 r s2 r w28 w35
+vflkLvpg7: w4 s3 w53 s2
+vflbxes4n: w4 s3 w53 s2
+vflmXMtFI: w57 s3 w62 w41 s3 r w60 r
+vflYDqEW1: w24 s1 r s2 w31 w4 w11 r
+vflapGX6Q: s3 w2 w59 s2 w68 r s3 r s1
+vflLCYwkM: s3 w2 w59 s2 w68 r s3 r s1
+vflcY_8N0: s2 w36 s1 r w18 r w19 r
+vfl9qWoOL: w68 w64 w28 r
+vfle-mVwz: s3 w7 r s3 r w14 w59 s3 r
+vfltdb6U3: w61 w5 r s2 w69 s2 r
+vflLjFx3B: w40 w62 r s2 w21 s3 r w7 s3
+vfliqjKfF: w40 w62 r s2 w21 s3 r w7 s3
+ima-vflxBu-5R: w40 w62 r s2 w21 s3 r w7 s3
+ima-vflrGwWV9: w36 w45 r s2 r
+ima-vflCME3y0: w8 s2 r w52
+ima-vfl1LZyZ5: w8 s2 r w52

data/plugins/youtube/decipherer.rb

@@ -2,97 +2,14 @@
 class Decipherer
 
   class UnknownCipherVersionError < StandardError; end 
-  class UnknownCipherOperationError < StandardError; end 
+  class UnknownCipherOperationError < StandardError; end
 
-  CIPHERS = {
-    'vflNzKG7n' => 's3 r s2 r s1 r w67',              # 30 Jan 2013, untested
-    'vfllMCQWM' => 's2 w46 r w27 s2 w43 s2 r',        # 15 Feb 2013, untested
-    'vflJv8FA8' => 's1 w51 w52 r',                    # 12 Mar 2013, untested
-    'vflR_cX32' => 's2 w64 s3',                       # 11 Apr 2013, untested
-    'vflveGye9' => 'w21 w3 s1 r w44 w36 r w41 s1',    # 02 May 2013, untested
-    'vflj7Fxxt' => 'r s3 w3 r w17 r w41 r s2',        # 14 May 2013, untested
-    'vfltM3odl' => 'w60 s1 w49 r s1 w7 r s2 r',       # 23 May 2013
-    'vflDG7-a-' => 'w52 r s3 w21 r s3 r',             # 06 Jun 2013
-    'vfl39KBj1' => 'w52 r s3 w21 r s3 r',             # 12 Jun 2013
-    'vflmOfVEX' => 'w52 r s3 w21 r s3 r',             # 21 Jun 2013
-    'vflJwJuHJ' => 'r s3 w19 r s2',                   # 25 Jun 2013
-    'vfl_ymO4Z' => 'r s3 w19 r s2',                   # 26 Jun 2013
-    'vfl26ng3K' => 'r s2 r',                          # 08 Jul 2013
-    'vflcaqGO8' => 'w24 w53 s2 w31 w4',               # 11 Jul 2013
-    'vflQw-fB4' => 's2 r s3 w9 s3 w43 s3 r w23',      # 16 Jul 2013
-    'vflSAFCP9' => 'r s2 w17 w61 r s1 w7 s1',         # 18 Jul 2013
-    'vflART1Nf' => 's3 r w63 s2 r s1',                # 22 Jul 2013
-    'vflLC8JvQ' => 'w34 w29 w9 r w39 w24',            # 25 Jul 2013
-    'vflm_D8eE' => 's2 r w39 w55 w49 s3 w56 w2',      # 30 Jul 2013
-    'vflTWC9KW' => 'r s2 w65 r',                      # 31 Jul 2013
-    'vflRFcHMl' => 's3 w24 r',                        # 04 Aug 2013
-    'vflM2EmfJ' => 'w10 r s1 w45 s2 r s3 w50 r',      # 06 Aug 2013
-    'vflz8giW0' => 's2 w18 s3',                       # 07 Aug 2013
-    'vfl_wGgYV' => 'w60 s1 r s1 w9 s3 r s3 r',        # 08 Aug 2013
-    'vfl1HXdPb' => 'w52 r w18 r s1 w44 w51 r s1',     # 12 Aug 2013
-    'vflkn6DAl' => 'w39 s2 w57 s2 w23 w35 s2',        # 15 Aug 2013
-    'vfl2LOvBh' => 'w34 w19 r s1 r s3 w24 r',         # 16 Aug 2013
-    'vfl-bxy_m' => 'w48 s3 w37 s2',                   # 20 Aug 2013
-    'vflZK4ZYR' => 'w19 w68 s1',                      # 21 Aug 2013
-    'vflh9ybst' => 'w48 s3 w37 s2',                   # 21 Aug 2013
-    'vflapUV9V' => 's2 w53 r w59 r s2 w41 s3',        # 27 Aug 2013
-    'vflg0g8PQ' => 'w36 s3 r s2',                     # 28 Aug 2013
-    'vflHOr_nV' => 'w58 r w50 s1 r s1 r w11 s3',      # 30 Aug 2013
-    'vfluy6kdb' => 'r w12 w32 r w34 s3 w35 w42 s2',   # 05 Sep 2013
-    'vflkuzxcs' => 'w22 w43 s3 r s1 w43',             # 10 Sep 2013
-    'vflGNjMhJ' => 'w43 w2 w54 r w8 s1',              # 12 Sep 2013
-    'vfldJ8xgI' => 'w11 r w29 s1 r s3',               # 17 Sep 2013
-    'vfl79wBKW' => 's3 r s1 r s3 r s3 w59 s2',        # 19 Sep 2013
-    'vflg3FZfr' => 'r s3 w66 w10 w43 s2',             # 24 Sep 2013
-    'vflUKrNpT' => 'r s2 r w63 r',                    # 25 Sep 2013
-    'vfldWnjUz' => 'r s1 w68',                        # 30 Sep 2013
-    'vflP7iCEe' => 'w7 w37 r s1',                     # 03 Oct 2013
-    'vflzVne63' => 'w59 s2 r',                        # 07 Oct 2013
-    'vflO-N-9M' => 'w9 s1 w67 r s3',                  # 09 Oct 2013
-    'vflZ4JlpT' => 's3 r s1 r w28 s1',                # 11 Oct 2013
-    'vflDgXSDS' => 's3 r s1 r w28 s1',                # 15 Oct 2013
-    'vflW444Sr' => 'r w9 r s1 w51 w27 r s1 r',        # 17 Oct 2013
-    'vflK7RoTQ' => 'w44 r w36 r w45',                 # 21 Oct 2013
-    'vflKOCFq2' => 's1 r w41 r w41 s1 w15',           # 23 Oct 2013
-    'vflcLL31E' => 's1 r w41 r w41 s1 w15',           # 28 Oct 2013
-    'vflz9bT3N' => 's1 r w41 r w41 s1 w15',           # 31 Oct 2013
-    'vfliZsE79' => 'r s3 w49 s3 r w58 s2 r s2',       # 05 Nov 2013
-    'vfljOFtAt' => 'r s3 r s1 r w69 r',               # 07 Nov 2013
-    'vflqSl9GX' => 'w32 r s2 w65 w26 w45 w24 w40 s2', # 14 Nov 2013
-    'vflFrKymJ' => 'w32 r s2 w65 w26 w45 w24 w40 s2', # 15 Nov 2013
-    'vflKz4WoM' => 'w50 w17 r w7 w65',                # 19 Nov 2013
-    'vflhdWW8S' => 's2 w55 w10 s3 w57 r w25 w41',     # 21 Nov 2013
-    'vfl66X2C5' => 'r s2 w34 s2 w39',                 # 26 Nov 2013
-    'vflCXG8Sm' => 'r s2 w34 s2 w39',                 # 02 Dec 2013
-    'vfl_3Uag6' => 'w3 w7 r s2 w27 s2 w42 r',         # 04 Dec 2013
-    'vflQdXVwM' => 's1 r w66 s2 r w12',               # 10 Dec 2013
-    'vflCtc3aO' => 's2 r w11 r s3 w28',               # 12 Dec 2013
-    'vflCt6YZX' => 's2 r w11 r s3 w28',               # 17 Dec 2013
-    'vflG49soT' => 'w32 r s3 r s1 r w19 w24 s3',      # 18 Dec 2013
-    'vfl4cHApe' => 'w25 s1 r s1 w27 w21 s1 w39',      # 06 Jan 2014
-    'vflwMrwdI' => 'w3 r w39 r w51 s1 w36 w14',       # 06 Jan 2014
-    'vfl4AMHqP' => 'r s1 w1 r w43 r s1 r',            # 09 Jan 2014
-    'vfln8xPyM' => 'w36 w14 s1 r s1 w54',             # 10 Jan 2014
-    'vflVSLmnY' => 's3 w56 w10 r s2 r w28 w35',       # 13 Jan 2014
-    'vflkLvpg7' => 'w4 s3 w53 s2',                    # 15 Jan 2014
-    'vflbxes4n' => 'w4 s3 w53 s2',                    # 15 Jan 2014
-    'vflmXMtFI' => 'w57 s3 w62 w41 s3 r w60 r',       # 23 Jan 2014
-    'vflYDqEW1' => 'w24 s1 r s2 w31 w4 w11 r',        # 24 Jan 2014
-    'vflapGX6Q' => 's3 w2 w59 s2 w68 r s3 r s1',      # 28 Jan 2014
-    'vflLCYwkM' => 's3 w2 w59 s2 w68 r s3 r s1',      # 29 Jan 2014
-    'vflcY_8N0' => 's2 w36 s1 r w18 r w19 r',         # 30 Jan 2014
-    'vfl9qWoOL' => 'w68 w64 w28 r',                   # 03 Feb 2014
-    'vfle-mVwz' => 's3 w7 r s3 r w14 w59 s3 r',       # 04 Feb 2014
-    'vfltdb6U3' => 'w61 w5 r s2 w69 s2 r',            # 05 Feb 2014
-    '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-vflCME3y0' => 'w8 s2 r w52'                  # 27 Feb 2014
-  }
+  def initialize(loader)
+    @ciphers = loader.load_ciphers
+  end
 
   def decipher_with_version(cipher, cipher_version)
-    operations = CIPHERS[cipher_version] 
+    operations = @ciphers[cipher_version] 
     raise UnknownCipherVersionError.new("Unknown cipher version: #{cipher_version}") unless operations
 
     decipher_with_operations(cipher, operations.split)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: viddl-rb
 version: !ruby/object:Gem::Version 
-  version: "0.98"
+  version: "0.99"
 platform: ruby
 authors: 
 - Marc Seeger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-02-27 00:00:00 Z
+date: 2014-03-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mime-types
@@ -95,6 +95,8 @@ files:
 - plugins/soundcloud.rb
 - plugins/veoh.rb
 - plugins/vimeo.rb
+- plugins/youtube/cipher_loader.rb
+- plugins/youtube/ciphers.yml
 - plugins/youtube/decipherer.rb
 - plugins/youtube/format_picker.rb
 - plugins/youtube/url_resolver.rb