viddl-rb 0.4.7 → 0.4.8

data/README.txt

@@ -2,6 +2,10 @@
 
 * http://github.com/rb2k/viddl-rb
 
+== Installation:  
+  gem install viddl-rb
+
+
 == Gems needed so far:  
 
 Progressbar

data/helper/download-helper.rb

@@ -1,42 +1,57 @@
 class DownloadHelper
 #usually not called directly
-def self.fetch_file(uri)
+  def self.fetch_file(uri)
 
-begin
-	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
-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)
-      end 
-    },
-    :progress_proc => lambda { |progress|
-      progress_bar.set(progress) if progress_bar
-    }) {|file| return file.read}        
-end
-
-#simple helper that will save a file from the web and save it with a progress bar
-def self.save_file(file_uri, file_name)
-  unescaped_uri = CGI::unescape(file_uri)
-  result = false
-  if `which wget`.include?("wget")
-	  puts "using wget"
-  	result = system("wget \"#{unescaped_uri}\" -O #{file_name}")
-  elsif `which curl`.include?("curl")
-    puts "using curl"  
-    #-L means: follow redirects, We set an agent because Vimeo seems to want one
-  	result = system("curl -A 'Mozilla/2.02 (OS/2; U)' -L \"#{unescaped_uri}\" -o #{file_name}")
-  else
-    open(file_name, 'wb') { |file|   	
-      file.write(fetch_file(unescaped_uri)); puts
-    }
-    result = true
+  begin
+  	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
+  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)
+        end 
+      },
+      :progress_proc => lambda { |progress|
+        progress_bar.set(progress) if progress_bar
+      }) {|file| return file.read}        
+  end
+  
+  #simple helper that will save a file from the web and save it with a progress bar
+  def self.save_file(file_uri, file_name)
+    unescaped_uri = CGI::unescape(file_uri)
+    result = false
+    windows = ENV['OS'] =~ /windows/i
+    if os_has?("wget", windows)
+      puts "using wget"
+      result = system("wget \"#{unescaped_uri}\" -O #{file_name}")
+    elsif os_has?("curl", windows)
+      puts "using curl"
+      #-L means: follow redirects, We set an agent because Vimeo seems to want one
+    	result = system("curl -A 'Mozilla/2.02 (OS/2; U)' -L \"#{unescaped_uri}\" -o #{file_name}")
+    else
+      open(file_name, 'wb') { |file|   	      
+        file.write(fetch_file(unescaped_uri)); puts
+      }
+      result = true
+    end         
+    result
+  end
+  
+  #checks to see whether the os has a certain utility like wget or curl
+  def self.os_has?(utility, windows)
+    unless windows # if os is something else than Windows
+      return `which #{utility}`.include?(utility)
+    else
+      begin 
+        `#{utility}` #if running the command does not thow an error, Windows has it
+        return true
+      rescue Errno::ENOENT
+        return false
+      end
+    end
   end
-  result
-end
 end

data/plugins/youtube.rb

@@ -129,9 +129,11 @@ class Youtube < PluginBase
 		puts "[YOUTUBE] formats available: #{available_formats.inspect} (downloading format #{selected_format} -> #{format_ext[selected_format][:name]})"
 
 		#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]
+    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
+    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
 		{:url => download_url, :name => file_name}
 	end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: viddl-rb
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 4
-  - 7
-  version: 0.4.7
+  - 8
+  version: 0.4.8
 platform: ruby
 authors: 
 - Marc Seeger
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-13 00:00:00 +02:00
-default_executable: 
+date: 2011-11-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -50,7 +49,6 @@ files:
 - plugins/youtube.rb
 - CHANGELOG.txt
 - README.txt
-has_rdoc: true
 homepage: https://github.com/rb2k/viddl-rb
 licenses: []
 
@@ -82,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: viddl-rb
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: An extendable commandline video downloader for flash video sites.