viddl-rb 0.4.5 → 0.4.6

data/bin/viddl-rb

@@ -29,7 +29,7 @@ PluginBase.registered_plugins.each do |plugin|
 		begin
 			download_queue = plugin.get_urls_and_filenames(url)
 		rescue StandardError => e
-			puts "Error while running the #{plugin.name.inspect} plugin. Maybe it has to be updated?"	
+			puts "Error while running the #{plugin.name.inspect} plugin. Maybe it has to be updated? Error: #{e.message}."	
 			exit
 		end
 		download_queue.each do |url_name|

data/plugins/youtube.rb

@@ -50,17 +50,37 @@ class Youtube < PluginBase
 			puts "[YOUTUBE] ID FOUND: #{video_id}"
 		end
 		#let's get some infos about the video. data is urlencoded
-		video_info = open("http://www.youtube.com/get_video_info?video_id=#{video_id}").read
-
+		yt_url = "http://www.youtube.com/get_video_info?video_id=#{video_id}"
+		video_info = open(yt_url).read
 		#converting the huge infostring into a hash. simply by splitting it at the & and then splitting it into key and value arround the =
 		#[...]blabla=blubb&narf=poit&marc=awesome[...]
 		video_info_hash = Hash[*video_info.split("&").collect { |v| 
-      key, value = v.split "="
-      value = CGI::unescape(value) if value
+      key, encoded_value = v.split("=")
+      if encoded_value.to_s.empty?
+		value = ""
+      else
+      #decode until everything is "normal"
+      	while (encoded_value != CGI::unescape(encoded_value)) do
+      		#"decoding"
+	      	encoded_value = CGI::unescape(encoded_value)
+      	end
+      	value = encoded_value
+      end
+
       if key =~ /_map/
+      	orig_value = value
         value = value.split(",")
-        value = if key == "fmt_map"
-            Hash[*value.collect{ |v| 
+        if key == "url_encoded_fmt_stream_map"
+	        url_array = orig_value.split("url=").map{|url_string| url_string.chomp(",")}
+    	    result_hash = {}
+    	    url_array.each do |url|
+        		next if url.to_s.empty?
+		        format_id = url.match(/\&itag=(\d+)/)[1]
+				result_hash[format_id] = url
+	        end
+	        value = result_hash
+        elsif key == "fmt_map"
+          value = Hash[*value.collect{ |v| 
               k2, *v2 = v.split("/")
               [k2, v2]
             }.flatten(1)]
@@ -82,7 +102,8 @@ class Youtube < PluginBase
 
 		
 		#for the formats, see: http://en.wikipedia.org/wiki/YouTube#Quality_and_codecs
-		available_formats = video_info_hash["fmt_map"].keys
+		fmt_list = video_info_hash["fmt_list"]
+		available_formats = fmt_list.map{|format| format.split("/").first}
 		
 		format_ext = {}
 		format_ext["38"] = {:extension => "mp4", :name => "MP4 Highest Quality 4096x3027 (H.264, AAC)"}						
@@ -107,8 +128,8 @@ class Youtube < PluginBase
 		#best quality seems always to be firsts
 		puts "[YOUTUBE] formats available: #{available_formats.inspect} (downloading format #{selected_format} -> #{format_ext[selected_format][:name]})"
 
-
-    	download_url = video_info_hash["fmt_url_map"][selected_format]
+		#video_info_hash.keys.sort.each{|key| puts "#{key} : #{video_info_hash[key]}" }
+    	download_url = video_info_hash["url_encoded_fmt_stream_map"][selected_format]
 		file_name = title.delete("\"'").gsub(/[^0-9A-Za-z]/, '_') + "." + format_ext[selected_format][:extension]
 		puts "downloading to " + file_name
 		{:url => download_url, :name => file_name}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: viddl-rb
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 4
-  - 5
-  version: 0.4.5
+  - 6
+  version: 0.4.6
 platform: ruby
 authors: 
 - Marc Seeger
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-28 00:00:00 +02:00
+date: 2011-10-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency