viddl-rb 0.92 → 0.93

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: 853bc3df8900fb25eafdd54f2365aad77436392e
-  data.tar.gz: 7bcf6e8a8150df714e6abf6e61cfed35e38023cc
+  metadata.gz: 8fb50f14d1549e3f6db7dd502c8fc912f3d55f27
+  data.tar.gz: 0a4dcc19bb0d2fc17f28722041aa7ea930c2b6a7
 SHA512: 
-  metadata.gz: a499a5cf2eb7a49833c4f6c9501a482528a5b29558452c63e760004844f89464d2b36ceb3f8174bfe9d3fefadc4257c338ef188ebe6f28fea2fa1d04b6903685
-  data.tar.gz: af6ae26586aa365ea8803c99daf71fa722fd71ff9438cb2fd99e029cd71ce416a9af3830a69c14adc603682627511ba70a76744bd9a19188da7d8d7107a3c7e3
+  metadata.gz: 99fd447ea4287875aca446e1e8fad11cd56d9f2a899d1fa06c53dd964247a8c90c6227e9e0ac8508ddde2af3be4e082abbf85d5ff771dc793ce87c76c84f1073
+  data.tar.gz: 30f6225573ac116c54c04f090b296ffc4eaca2c0f06569d268f3e6834e4315235f775985a95fc1f517c6758b375a3e2748d0825459c44968d0fe06f874ae937c

data/plugins/vimeo.rb

@@ -1,4 +1,6 @@
+
 class Vimeo < PluginBase
+
   #this will be called by the main app to check whether this plugin is responsible for the url passed
   def self.matches_provider?(url)
     url.include?("vimeo.com")
@@ -8,25 +10,29 @@ class Vimeo < PluginBase
     #the vimeo ID consists of 7 decimal numbers in the URL
     vimeo_id = url[/\d{7,8}/]
 
-    agent = Mechanize.new      #use Mechanize for the automatic cookie handeling
-    agent.redirect_ok = false  #don't follow redirects so we do not download the video when we get it's url
+    video_url = "http://player.vimeo.com/v2/video/#{vimeo_id}"
+    video_page = open(video_url).read
 
-    video_page = agent.get("http://vimeo.com/#{vimeo_id}")
-    page_html = video_page.root.inner_html
-    doc = Nokogiri::HTML(page_html)
-    title = doc.at('meta[property="og:title"]').attributes['content'].value
-    puts "[VIMEO] Title: #{title.inspect}"
+    info_json = video_page[/a=(\{.+?);/, 1]
+    parsed = MultiJson.load(info_json)
 
-    #the timestamp and sig info is in the embedded player javascript in the video page
-    timestamp = page_html[/"timestamp":(\d+),/, 1]
-    signature = page_html[/"signature":"([\d\w]+)",/, 1]
+    files = parsed["request"]["files"] 
+    codecs = files["codecs"]
 
-    redirect_url = "http://player.vimeo.com/play_redirect?clip_id=#{vimeo_id}&sig=#{signature}&time=#{timestamp}&quality=hd,sd&codecs=H264,VP8,VP6"
+    unless codecs.include?("h264")
+      raise CouldNotDownloadVideoError, "Unexpected codecs: #{codecs.inspect}\n" +
+          "Please report this bug at github.com/rb2k/viddl-rb so it can be fixed!"
+    end
 
-    #the download url is the value of the location (redirect) header
-    download_url = agent.get(redirect_url).header["location"]
-    file_name = PluginBase.make_filename_safe(title) + ".mp4"
+    h264 = files["h264"]
+    quality = ["hd", "sd"].find { |q| h264.keys.include?(q) }
+    quality = h264.keys.first if quality.nil?
+
+    download_url = h264[quality]["url"]
+    extension = download_url[/.+?(\.[\w\d]+?)\?/, 1]
+    file_name = PluginBase.make_filename_safe(parsed["video"]["title"]) + extension
 
     [{:url => download_url, :name => file_name}]
   end
 end
+

data/plugins/youtube.rb

@@ -5,21 +5,43 @@ class Youtube < PluginBase
   # see http://en.wikipedia.org/wiki/YouTube#Quality_and_codecs
   # TODO: we don't have all the formats from the wiki article here
   VIDEO_FORMATS = {
-    "38" => {:extension => "mp4",  :name => "MP4 Highest Quality 4096x3027 (H.264, AAC)"},
-    "37" => {:extension => "mp4",  :name => "MP4 Highest Quality 1920x1080 (H.264, AAC)"},
-    "22" => {:extension => "mp4",  :name => "MP4 1280x720 (H.264, AAC)"},
-    "46" => {:extension => "webm", :name => "WebM 1920x1080 (VP8, Vorbis)"},
-    "45" => {:extension => "webm", :name => "WebM 1280x720 (VP8, Vorbis)"},
-    "44" => {:extension => "webm", :name => "WebM 854x480 (VP8, Vorbis)"},
-    "43" => {:extension => "webm", :name => "WebM 480x360 (VP8, Vorbis)"},
-    "18" => {:extension => "mp4",  :name => "MP4 640x360 (H.264, AAC)"},
-    "35" => {:extension => "flv",  :name => "FLV 854x480 (H.264, AAC)"},
-    "34" => {:extension => "flv",  :name => "FLV 640x360 (H.264, AAC)"},
-    "5"  => {:extension => "flv",  :name => "FLV 400x240 (Soerenson H.263)"},
-    "17" => {:extension => "3gp",  :name => "3gp"}
+     "38" => {:extension => "mp4",  :name => "MP4 Highest Quality 4096x3027 (H.264, AAC)"},
+     "37" => {:extension => "mp4",  :name => "MP4 Highest Quality 1920x1080 (H.264, AAC)"},
+     "22" => {:extension => "mp4",  :name => "MP4 1280x720 (H.264, AAC)"},
+     "46" => {:extension => "webm", :name => "WebM 1920x1080 (VP8, Vorbis)"},
+     "45" => {:extension => "webm", :name => "WebM 1280x720 (VP8, Vorbis)"},
+     "44" => {:extension => "webm", :name => "WebM 854x480 (VP8, Vorbis)"},
+     "43" => {:extension => "webm", :name => "WebM 480x360 (VP8, Vorbis)"},
+     "18" => {:extension => "mp4",  :name => "MP4 640x360 (H.264, AAC)"},
+     "35" => {:extension => "flv",  :name => "FLV 854x480 (H.264, AAC)"},
+     "34" => {:extension => "flv",  :name => "FLV 640x360 (H.264, AAC)"},
+     "6"  => {:extension => "flv",  :name => "FLV 640x360 (Soerenson H.263)"},
+     "5"  => {:extension => "flv",  :name => "FLV 400x240 (Soerenson H.263)"},
+     "36" => {:extension => "3gp",  :name => "3gp Medium Quality - 320x240 (MPEG-4 Visual, AAC)"},
+     "17" => {:extension => "3gp",  :name => "3gp Medium Quality - 176x144 (MPEG-4 Visual, AAC)"},
+     "13" => {:extension => "3gp",  :name => "3gp Low Quality - 176x144 (MPEG-4 Visual, AAC)"},
+     "82" => {:extension => "mp4",  :name => "MP4 360p (H.264 AAC)"}, 
+     "83" => {:extension => "mp4",  :name => "MP4 240p (H.264 AAC)"}, 
+     "84" => {:extension => "mp4",  :name => "MP4 720p (H.264 AAC)"}, 
+     "85" => {:extension => "mp4",  :name => "MP4 520p (H.264 AAC)"}, 
+    "100" => {:extension => "webm", :name => "WebM 360p (VP8 Vorbis)"}, 
+    "101" => {:extension => "webm", :name => "WebM 360p (VP8 Vorbis)"}, 
+    "102" => {:extension => "webm", :name => "WebM 720p (VP8 Vorbis)"}, 
+    "120" => {:extension => "flv",  :name => "FLV 720p (H.264 AAC)"}, 
+    "133" => {:extension => "mp4",  :name => "MP4 240p (H.264)"}, 
+    "134" => {:extension => "mp4",  :name => "MP4 360p (H.264)"}, 
+    "135" => {:extension => "mp4",  :name => "MP4 480p (H.264)"}, 
+    "136" => {:extension => "mp4",  :name => "MP4 720p (H.264)"}, 
+    "137" => {:extension => "mp4",  :name => "MP4 1080p  (H.264)"}, 
+    "139" => {:extension => "mp4",  :name => "MP4 (AAC)"}, 
+    "140" => {:extension => "mp4",  :name => "MP4 (AAC"}, 
+    "141" => {:extension => "mp4",  :name => "MP4 (AAC)"}, 
+    "160" => {:extension => "mp4",  :name => "MP4 (H.264)"}, 
+    "171" => {:extension => "webm", :name => "WebM (Vorbis)"}, 
+    "172" => {:extension => "webm", :name => "WebM (Vorbis)"}
   }
 
-  DEFAULT_FORMAT_ORDER = %w[38 37 22 46 45 44 43 18 35 34 5 17]
+  DEFAULT_FORMAT_ORDER = %w[38 37 22 46 45 44 43 18 35 34 6 5 36 17 13 82 83 84 85 100 101 102 120 133 134 135 136 137 139 140 141 160 171 172]
   VIDEO_INFO_URL       = "http://www.youtube.com/get_video_info?video_id="
   VIDEO_INFO_PARMS     = "&ps=default&eurl=&gl=US&hl=en"
 
@@ -146,9 +168,9 @@ class Youtube < PluginBase
 
       if @quality                        #if the user specified a format
         ext = @quality[:extension]
-        res = @quality[:resolution]
+        res = @quality[:resolution] || ""
         #gets a nested array with all the formats of the same res as the user wanted
-        requested = VIDEO_FORMATS.select { |id, format| format[:name].include?(res) }.to_a
+        requested = VIDEO_FORMATS.select { |id, format| available_formats.include?(id) && format[:name].include?(res) }.to_a
 
         if requested.empty?
           Youtube.notify "Requested format \"#{res}:#{ext}\" not found. Downloading default format."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: viddl-rb
 version: !ruby/object:Gem::Version 
-  version: "0.92"
+  version: "0.93"
 platform: ruby
 authors: 
 - Marc Seeger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-12-08 00:00:00 Z
+date: 2014-01-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mime-types
@@ -36,26 +36,28 @@ dependencies:
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
-    - &id004 
-      - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.7.2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: progressbar
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
-    - *id004
+    - &id005 
+      - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: multi_json
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
-    - *id004
+    - *id005
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -63,7 +65,7 @@ dependencies:
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
-    - *id004
+    - *id005
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -71,7 +73,7 @@ dependencies:
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
-    - *id004
+    - *id005
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -79,7 +81,7 @@ dependencies:
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     requirements: 
-    - *id004
+    - *id005
   type: :development
   version_requirements: *id009
 description: An extendable commandline video downloader for flash video sites. Includes plugins for vimeo, youtube, dailymotion and more
@@ -109,7 +111,6 @@ files:
 - plugins/vimeo.rb
 - plugins/youtube.rb
 - Gemfile
-- Gemfile.lock
 - Rakefile
 - README.md
 homepage: https://github.com/rb2k/viddl-rb
@@ -124,7 +125,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - *id004
+  - *id005
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
@@ -133,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: viddl-rb
-rubygems_version: 2.0.13
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: An extendable commandline video downloader for flash video sites.

data/Gemfile.lock

@@ -1,49 +0,0 @@
-PATH
-  remote: .
-  specs:
-    viddl-rb (0.84)
-      mechanize
-      multi_json
-      nokogiri (~> 1.5.0)
-      progressbar
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    domain_name (0.5.13)
-      unf (>= 0.0.5, < 1.0.0)
-    http-cookie (1.0.1)
-      domain_name (~> 0.5)
-    mechanize (2.7.2)
-      domain_name (~> 0.5, >= 0.5.1)
-      http-cookie (~> 1.0.0)
-      mime-types (~> 1.17, >= 1.17.2)
-      net-http-digest_auth (~> 1.1, >= 1.1.1)
-      net-http-persistent (~> 2.5, >= 2.5.2)
-      nokogiri (~> 1.4)
-      ntlm-http (~> 0.1, >= 0.1.1)
-      webrobots (>= 0.0.9, < 0.2)
-    mime-types (1.24)
-    minitest (5.0.6)
-    multi_json (1.8.0)
-    net-http-digest_auth (1.4)
-    net-http-persistent (2.9)
-    nokogiri (1.5.10)
-    ntlm-http (0.1.1)
-    progressbar (0.20.0)
-    rake (10.1.0)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    unf (0.1.2)
-      unf_ext
-    unf_ext (0.0.6)
-    webrobots (0.1.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  minitest
-  rake
-  rest-client
-  viddl-rb!