viddl-rb 0.67 → 0.68

data/README.md

@@ -18,7 +18,7 @@ Download a video and extract the audio:
 
 In both cases we'll name the output file according to the video title.
 
-__Youtube plugin specifics:__  
+__Youtube plugin specifics:__ 
 
 Download all videos on a playlist:  
     viddl-rb http://www.youtube.com/playlist?list=PL7E8DA0A515924126

data/plugins/metacafe.rb

@@ -3,60 +3,60 @@
 # Vidoes that have URLs that look like this: http://www.metacafe.com/watch/cb-q78rA_lp9s1_9EJsqKJ5BdIHdDNuHa1l/ cannot be downloaded.
 
 class Metacafe < PluginBase
-	BASE_FILE_URL = "http://v.mccont.com/ItemFiles/%5BFrom%20www.metacafe.com%5D%20"
-	API_BASE = "http://www.metacafe.com/api/"
-	
-	#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?("metacafe.com")
-	end
-	
-	def self.get_urls_and_filenames(url)
-		video_id = get_video_id(url)
-		info_url = API_BASE + "item/#{video_id}" #use the API to get the full video url
-		info_doc = Nokogiri::XML(open(info_url))
-		
-		video_swf_url = get_video_swf_url(info_doc, video_id)
-		
-		#by getting the video swf url we get a http redirect url with all info needed
-		http_response = Net::HTTP.get_response(URI(video_swf_url)) 
-		redirect_url = http_response['location'] 
-		
-		file_info = get_file_info(redirect_url, video_id)
-		key_string = get_file_key(redirect_url)
-		file_url_with_key = file_info[:file_url] + "?__gda__=#{key_string}"
-		escaped_url = CGI::escape(file_url_with_key)
-		
-		[{:url => escaped_url, :name => get_video_name(video_swf_url) + file_info[:extension]}]
-	end
-	
-	def self.get_video_id(url)
-		id = url[/watch\/(\d+)/, 1]
-		unless id
-			puts "ERROR: Can only download videos that has the ID in the URL."
-			exit
-		end
-		id
-	end
+  BASE_FILE_URL = "http://v.mccont.com/ItemFiles/%5BFrom%20www.metacafe.com%5D%20"
+  API_BASE = "http://www.metacafe.com/api/"
+  
+  #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?("metacafe.com")
+  end
+  
+  def self.get_urls_and_filenames(url)
+    video_id = get_video_id(url)
+    info_url = API_BASE + "item/#{video_id}" #use the API to get the full video url
+    info_doc = Nokogiri::XML(open(info_url))
+    
+    video_swf_url = get_video_swf_url(info_doc, video_id)
+    
+    #by getting the video swf url we get a http redirect url with all info needed
+    http_response = Net::HTTP.get_response(URI(video_swf_url)) 
+    redirect_url = CGI::unescape(http_response['location'])
 
-	def self.get_video_swf_url(info_doc, video_id)
-		video_url = info_doc.xpath("//rss/channel/item/link").text
-		video_url.sub!("watch", "fplayer")
-		video_url.sub!(/\/\z/, ".swf") # remove last '/' and add .swf in it's place
-	end
-		
-	#$1 = file name part 1, $2 = file name part 2, $3 = file extension
-	def self.get_file_info(redirect_url, video_id)
-		redirect_url =~ /mediaURL.+?metacafe\.com%.+?%\d+\.(\d+)\.(\d+)(\.[\d\w]+)/																																				
-		{:file_url => "#{BASE_FILE_URL}#{video_id}\.#{$1}\.#{$2}#{$3}", :extension => $3}
-	end
-																																										
-	def self.get_file_key(redirect_url)
-		redirect_url[/key.+?\%22([\w\d]+?)\%22/, 1]
-	end
-	
-	def self.get_video_name(url)
-	  name =	url[/fplayer\/\d+\/([\d\w]+)\.swf/, 1]
+    file_info = get_file_info(redirect_url, video_id)
+    key_string = get_file_key(redirect_url)
+    file_url_with_key = file_info[:file_url] + "?__gda__=#{key_string}"
+    escaped_url = CGI::escape(file_url_with_key)
+    
+    [{:url => escaped_url, :name => get_video_name(video_swf_url) + file_info[:extension]}]
+  end
+  
+  def self.get_video_id(url)
+    id = url[/watch\/(\d+)/, 1]
+    unless id
+      puts "ERROR: Can only download videos that has the ID in the URL."
+      exit
+    end
+    id
+  end
+
+  def self.get_video_swf_url(info_doc, video_id)
+    video_url = info_doc.xpath("//rss/channel/item/link").text
+    video_url.sub!("watch", "fplayer")
+    video_url.sub!(/\/\z/, ".swf") # remove last '/' and add .swf in it's place
+  end
+    
+  #$1 = file name part 1, $2 = file name part 2, $3 = file extension
+  def self.get_file_info(redirect_url, video_id)
+    redirect_url =~ /mediaURL.+?metacafe\.com%.+?%\d+\.(\d+)\.(\d+)(\.[\d\w]+)/                                                                       
+    {:file_url => "#{BASE_FILE_URL}#{video_id}\.#{$1}\.#{$2}#{$3}", :extension => $3}
+  end
+                                                                                    
+  def self.get_file_key(redirect_url)
+    redirect_url[/key.+?value":"([\w\d]+)"/, 1]
+  end
+  
+  def self.get_video_name(url)
+    name =  url[/fplayer\/\d+\/([\d\w]+)\.swf/, 1]
     PluginBase.make_filename_safe(name)
-	end
+  end
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: viddl-rb
 version: !ruby/object:Gem::Version 
-  hash: 141
+  hash: 131
   prerelease: 
   segments: 
   - 0
-  - 67
-  version: "0.67"
+  - 68
+  version: "0.68"
 platform: ruby
 authors: 
 - Marc Seeger
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-03 00:00:00 +02:00
+date: 2012-08-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: viddl-rb
-rubygems_version: 1.4.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: An extendable commandline video downloader for flash video sites.