viddl-rb 0.5.4 → 0.5.5

data/README.md

@@ -28,7 +28,7 @@ __Requirements:__
 
 __Contributors:__
 
-* [kl](https://github.com/kl): Windows support (who knew!), bug fixes, veoh plugin   
+* [kl](https://github.com/kl): Windows support (who knew!), bug fixes, veoh plugin, metacafe plugin   
 * [divout](https://github.com/divout) aka Ivan K: blip.tv plugin, bugfixes
 * Sniper: bugfixes
 * [Serabe](https://github.com/Serabe) aka Sergio Arbeo: packaging viddl as a binary

data/helper/download-helper.rb

@@ -32,6 +32,7 @@ class DownloadHelper
       #-L means: follow redirects, We set an agent because Vimeo seems to want one
     	result = system("curl -A 'Wget/1.8.1' -L \"#{unescaped_uri}\" -o #{file_name}")
     else
+    	puts "using net/http"
       open(file_name, 'wb') { |file|   	      
         file.write(fetch_file(unescaped_uri)); puts
       }
@@ -41,12 +42,13 @@ class DownloadHelper
   end
   
   #checks to see whether the os has a certain utility like wget or curl
-  def self.os_has?(utility, windows = (ENV['OS'] =~ /windows/i))
+  def self.os_has?(utility)
+    windows = ENV['OS'] =~ /windows/i
     unless windows # if os is something else than Windows
       return `which #{utility}`.include?(utility)
-    else
+    else # OS is Windows
       begin 
-        `#{utility}` #if running the command does not throw an error, Windows has it
+        `#{utility} --version` #if running the command does not throw an error, Windows has it. --version is for prettier console output.
         return true
       rescue Errno::ENOENT
         return false

data/plugins/metacafe.rb

@@ -0,0 +1,62 @@
+# Note: unfortunaley, only videos that are hosted on Metacafe.com's content server can be downloaded.
+# They have an URL that looks somehting like this: http://www.metacafe.com/watch/7731483/
+# Vidoes that have URLs that look like this: http://www.metacafe.com/watch/cb-q78rA_lp9s1_9EJsqKJ5BdIHdDNuHa1l/ cannot be downloaded.
+require 'cgi'
+
+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
+
+	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)
+		url[/fplayer\/\d+\/([\d\w]+)\.swf/, 1]
+	end
+end

data/plugins/veoh.rb

@@ -26,7 +26,7 @@ class Veoh < PluginBase
 			return(download_attr.content) unless download_attr.nil? || download_attr.content.empty?
 		end
 	end
-
+	
 	#the file name string is a combination of the video name and the extension
 	def self.get_file_name(info_doc, download_url)
 		name = info_doc.xpath('//rsp/videoList/video').first.attributes['title'].content

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: viddl-rb
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 5
-  - 4
-  version: 0.5.4
+  - 5
+  version: 0.5.5
 platform: ruby
 authors: 
 - Marc Seeger
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-24 00:00:00 Z
+date: 2011-11-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -87,12 +87,12 @@ files:
 - helper/plugin-helper.rb
 - plugins/blip.rb
 - plugins/megavideo.rb
+- plugins/metacafe.rb
 - plugins/veoh.rb
 - plugins/vimeo.rb
 - plugins/youtube.rb
 - CHANGELOG.txt
 - Gemfile
-- Gemfile.lock
 - Rakefile
 - README.md
 homepage: https://github.com/rb2k/viddl-rb

data/Gemfile.lock

@@ -1,21 +0,0 @@
-PATH
-  remote: .
-  specs:
-    viddl-rb (0.5.2)
-      nokogiri
-
-GEM
-  specs:
-    mime-types (1.17.2)
-    minitest (2.8.1)
-    nokogiri (1.5.0)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  minitest
-  rest-client
-  viddl-rb!