viddl-rb 0.66 → 0.67

data/helper/download-helper.rb

@@ -4,16 +4,17 @@ class DownloadHelper
   def self.fetch_file(uri)
 
   begin
-  	require "progressbar" #http://github.com/nex3/ruby-progressbar
+    require "progressbar" #http://github.com/nex3/ruby-progressbar
   rescue LoadError
-  	puts "ERROR: You don't seem to have curl or wget on your system. In this case you'll need to install the 'progressbar' gem."
-  	exit
+    puts "ERROR: You don't seem to have curl or wget on your system. In this case you'll need to install the 'progressbar' gem."
+    exit
   end
     progress_bar = nil 
     open(uri, :proxy => nil,
       :content_length_proc => lambda { |length|
         if length && 0 < length
           progress_bar = ProgressBar.new(uri.to_s, length)
+          progress_bar.file_transfer_mode   #to show download speed and file size
         end 
       },
       :progress_proc => lambda { |progress|
@@ -33,10 +34,10 @@ class DownloadHelper
       elsif os_has?("curl")
         puts "using curl"
         #-L means: follow redirects, We set an agent because Vimeo seems to want one
-      	`curl -A 'Wget/1.8.1' -L \"#{unescaped_uri}\" -o #{file_name}`
+        `curl -A 'Wget/1.8.1' -L \"#{unescaped_uri}\" -o #{file_name}`
       else
-    	 puts "using net/http"
-        open(file_name, 'wb') { |file|   	      
+       puts "using net/http"
+        open(file_name, 'wb') { |file|          
           file.write(fetch_file(unescaped_uri)); puts
         }
       end  
@@ -52,26 +53,29 @@ class DownloadHelper
   end
   
   #checks to see whether the os has a certain utility like wget or curl
+  #`` returns the standard output of the process
+  #system returns the exit code of the process
   def self.os_has?(utility)
     windows = ENV['OS'] =~ /windows/i
-    return `which #{utility}`.include?(utility) unless windows # if not Windows
 
-    #use where (simliar to which) if present to reduce console clutter
-    begin
-      has_where? ? `where #{utility}` : `#{utility}`
-      return true
-    rescue Errno::ENOENT
-      return false
+    unless windows # if os is not Windows
+      `which #{utility}`.include?(utility)
+    else
+      if has_where?
+        system("where /q #{utility}")   #/q is the quiet mode flag
+      else
+        begin   #as a fallback we just run the utility itself
+          system(utility)
+        rescue Errno::ENOENT
+          false
+        end
+      end
     end
   end
 
   #checks if Windows has the where utility (Server 2003 and later)
+  #system only return nil if the command is not found
   def self.has_where?
-    begin
-      `where`
-      true
-    rescue Errno::ENOENT
-      false
-    end
+    !system("where /q where").nil?
   end
-end
+end

data/helper/plugin-helper.rb

@@ -1,10 +1,16 @@
 class PluginBase
-#some static stuff
+  #some static stuff
   class << self; attr_reader :registered_plugins end
     @registered_plugins = []
 
-#if you inherit from this class, the child gets added to the "registered plugins" array
+  #if you inherit from this class, the child gets added to the "registered plugins" array
   def self.inherited(child)
     PluginBase.registered_plugins << child
   end
+
+  #takes a string a returns a new string that is file name safe
+  #deletes \"' and replaces anything else that is not a digit or letter with _
+  def self.make_filename_safe(string)
+    string.delete("\"'").gsub(/[^\d\w]/, '_')
+  end
 end

data/plugins/blip.rb

@@ -1,3 +1,4 @@
+
 class Blip < 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)
@@ -10,7 +11,7 @@ class Blip < PluginBase
     xml_url      = "http://blip.tv/rss/#{id}"
     doc          = Nokogiri::XML(open(xml_url))
     user         = doc.at("//channel/item/blip:user").inner_text
-    title        = doc.at("//channel/item/title").inner_text.gsub(" ", "_")
+    title        = PluginBase.make_filename_safe(doc.at("//channel/item/title").inner_text)
     download_url = doc.at("//channel/item/media:group/media:content").attributes["url"].value
     extention    = download_url.split(".").last
     file_name    = "#{id}-#{user}-#{title}.#{extention}"

data/plugins/metacafe.rb

@@ -56,6 +56,7 @@ class Metacafe < PluginBase
 	end
 	
 	def self.get_video_name(url)
-		url[/fplayer\/\d+\/([\d\w]+)\.swf/, 1]
+	  name =	url[/fplayer\/\d+\/([\d\w]+)\.swf/, 1]
+    PluginBase.make_filename_safe(name)
 	end
 end

data/plugins/veoh.rb

@@ -30,9 +30,8 @@ class Veoh < PluginBase
 	#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
+		PluginBase.make_filename_safe(name) + extension
 	end
 
 	def self.get_attribute(format)
@@ -43,4 +42,4 @@ class Veoh < PluginBase
 			"previewUrl"
 		end
 	end
-end
+end

data/plugins/vimeo.rb

@@ -1,4 +1,5 @@
 
+
 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)
@@ -22,18 +23,12 @@ class Vimeo < PluginBase
     timestamp = page_html[/"timestamp":(\d+),/, 1]
     signature = page_html[/"signature":"([\d\w]+)",/, 1]
 
-    # The quality and codecs are listed in order of preference in the url. If HD is not availabe SD will be download for example.
     redirect_url = "http://player.vimeo.com/play_redirect?clip_id=#{vimeo_id}&sig=#{signature}&time=#{timestamp}&quality=hd,sd&codecs=H264,VP8,VP6"
 
     #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"
 
-    file_name = make_filename(title)
-    
     [{:url => download_url, :name => file_name}]
   end
-
-  def self.make_filename(title)
-    title.delete("\"'").gsub(/[^\d\w]/, '_') + ".mp4"
-  end
-end
+end

data/plugins/youtube.rb

@@ -190,7 +190,7 @@ class Youtube < PluginBase
     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 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]
+    file_name = PluginBase.make_filename_safe(title) + "." + format_ext[selected_format][:extension]
     puts "downloading to " + file_name
     {:url => download_url, :name => file_name}
   end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: viddl-rb
 version: !ruby/object:Gem::Version 
-  hash: 143
+  hash: 141
   prerelease: 
   segments: 
   - 0
-  - 66
-  version: "0.66"
+  - 67
+  version: "0.67"
 platform: ruby
 authors: 
 - Marc Seeger
@@ -14,7 +14,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-03 00:00:00 Z
+date: 2012-07-03 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -109,6 +110,7 @@ files:
 - Gemfile.lock
 - Rakefile
 - README.md
+has_rdoc: true
 homepage: https://github.com/rb2k/viddl-rb
 licenses: []
 
@@ -140,10 +142,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: viddl-rb
-rubygems_version: 1.8.21
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: An extendable commandline video downloader for flash video sites.
 test_files: []
 
-has_rdoc: false