viddl-rb 0.5.1 → 0.5.2

data/README.md

@@ -27,7 +27,7 @@ __Requirements:__
 
 __Contributors:__
 
-* [kl](https://github.com/kl): Windows support (who knew!) and bug fixes  
+* [kl](https://github.com/kl): Windows support (who knew!), bug fixes, veho 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

@@ -46,7 +46,7 @@ class DownloadHelper
       return `which #{utility}`.include?(utility)
     else
       begin 
-        `#{utility}` #if running the command does not thow an error, Windows has it
+        `#{utility}` #if running the command does not throw an error, Windows has it
         return true
       rescue Errno::ENOENT
         return false

data/plugins/blip.rb

@@ -1,5 +1,5 @@
 class Blip < PluginBase
-  # this will be called by the main app to check weather this plugin is responsible for the url passed
+  # 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?("blip.tv")
   end

data/plugins/megavideo.rb

@@ -1,5 +1,5 @@
 class Megavideo < PluginBase
-	#this will be called by the main app to check weather this plugin is responsible for the url passed
+	#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?("megavideo.com")
 	end

data/plugins/veoh.rb

@@ -0,0 +1,46 @@
+class Veoh < PluginBase
+	VEOH_API_BASE = "http://www.veoh.com/api/"
+	PREFERRED_FORMATS = [:mp4, :flash] # mp4 is preferred because it enables downloading full videos and not just previews
+	
+	#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?("veoh.com")
+	end
+
+	def self.get_urls_and_filenames(url)
+		veoh_id = url[/\/watch\/([\w\d]+)/, 1]
+		info_url = "#{VEOH_API_BASE}findByPermalink?permalink=#{veoh_id}"
+		info_doc = Nokogiri::XML(open(info_url))
+
+		download_url = get_download_url(info_doc)
+		file_name = get_file_name(info_doc, download_url)
+
+		[{:url => download_url, :name => file_name}]
+	end
+	
+	#returns the first valid download url string, in order of the prefered formats, that is found for the video
+	def self.get_download_url(info_doc)
+		PREFERRED_FORMATS.each do |format|
+			a = get_attribute(format)
+			download_attr = info_doc.xpath('//rsp/videoList/video').first.attributes[a]
+			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
+		name.gsub!(" ", "_") # replace spaces with underscores
+		extension = download_url[/\/[\w\d]+(\.[\w\d]+)\?ct/, 1]
+		name + extension
+	end
+
+	def self.get_attribute(format)
+		case format
+		when :mp4
+			"ipodUrl"
+		when :flash
+			"previewUrl"
+		end
+	end
+end

data/plugins/vimeo.rb

@@ -1,5 +1,5 @@
 class Vimeo < PluginBase
-	#this will be called by the main app to check weather this plugin is responsible for the url passed
+	#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")
 	end
@@ -22,4 +22,4 @@ class Vimeo < PluginBase
 		puts "downloading to " + file_name
 		[{:url => download_url, :name => file_name}]
 	end
-end
+end

data/plugins/youtube.rb

@@ -1,5 +1,5 @@
 class Youtube < PluginBase
-	#this will be called by the main app to check weather this plugin is responsible for the url passed
+	#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?("youtube.com") || url.include?("youtu.be")
 	end
@@ -134,7 +134,7 @@ class Youtube < PluginBase
 
 		#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]
-    #if download url ends with a ';' followed by a codec string remove that part because stops URI.parse from working
+    #if download url ends with a ';' followed by a codec string remove that part because it stops URI.parse from working
     download_url = $1 if download_url =~ /(.*?);\scodecs=/
 		file_name = title.delete("\"'").gsub(/[^0-9A-Za-z]/, '_') + "." + format_ext[selected_format][:extension]
 		puts "downloading to " + file_name

metadata

@@ -1,66 +1,89 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: viddl-rb
-version: !ruby/object:Gem::Version
-  version: 0.5.1
+version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: 
+  segments: 
+  - 0
+  - 5
+  - 2
+  version: 0.5.2
 platform: ruby
-authors:
+authors: 
 - Marc Seeger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-19 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-11-20 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: nokogiri
-  requirement: &70242056051380 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70242056051380
-description: An extendable commandline video downloader for flash video sites. Includes
-  plugins for vimeo, youtube and megavideo
+  version_requirements: *id001
+description: An extendable commandline video downloader for flash video sites. Includes plugins for vimeo, youtube and megavideo
 email: mail@marc-seeger.de
-executables:
+executables: 
 - viddl-rb
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - bin/viddl-rb
 - helper/download-helper.rb
 - helper/plugin-helper.rb
 - plugins/blip.rb
 - plugins/megavideo.rb
+- plugins/veoh.rb
 - plugins/vimeo.rb
 - plugins/youtube.rb
 - CHANGELOG.txt
 - README.md
 homepage: https://github.com/rb2k/viddl-rb
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - .
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 19
+      segments: 
+      - 1
+      - 3
+      - 4
       version: 1.3.4
 requirements: []
+
 rubyforge_project: viddl-rb
-rubygems_version: 1.8.10
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: An extendable commandline video downloader for flash video sites.
 test_files: []
+