viddl-rb 0.4.9 → 0.5.0

data/README.md

@@ -0,0 +1,33 @@
+__viddl-rb:__  
+Created by Marc Seeger (@rb2k)  
+Repo: http://github.com/rb2k/viddl-rb
+
+
+
+__Installation:__  
+gem install viddl-rb
+
+__Usage:__  
+
+Download a video:  
+    viddl-rb http://www.youtube.com/watch?v=QH2-TGUlwu4
+
+Download a video and extract the audio:  
+    viddl-rb http://www.youtube.com/watch?v=QH2-TGUlwu4 --extract-audio 
+
+In both cases we'll name the output file according to the video title.
+
+
+__Requirements:__
+
+* curl/wget or the [progress bar](http://github.com/nex3/ruby-progressbar/) gem  
+* [Nokogiri](http://nokogiri.org/)
+* ffmpeg if you want to extract audio tracks from the videos
+
+
+__Contributors:__
+
+* [kl](https://github.com/kl): Windows support (who knew!) and bug fixes  
+* [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/bin/viddl-rb

@@ -5,11 +5,12 @@ require "rubygems"
 require "nokogiri"
 require "cgi"
 require "open-uri"
+require "open3"
 require "download-helper.rb"
 require "plugin-helper.rb"
 
-if ARGV.first.nil?
-	puts "Usage: viddl-rb [URL]!"
+if ARGV[0].nil?
+	puts "Usage: viddl-rb URL [--extract-audio]"
 	exit
 end
 
@@ -20,26 +21,75 @@ end
 
 puts "Plugins loaded: #{PluginBase.registered_plugins.inspect}"
 
+url = ARGV[0]
+extract_audio = ARGV.include?('--extract-audio')
+puts "Will try to extract audio: #{extract_audio}."
+
+unless url.match(/^http/)
+	puts "Please include 'http' with your URL e.g. http://www.youtube.com/watch?v=QH2-TGUlwu4"
+	exit(1)
+end
 
-url = ARGV.first
 puts "Analyzing URL: #{url}"
+#Check all plugins for a match
 PluginBase.registered_plugins.each do |plugin|
 	if plugin.matches_provider?(url)
 		puts "#{plugin}: true"
 		begin
+			#we'll end up with an array of hashes with they keys :url and :name 
 			download_queue = plugin.get_urls_and_filenames(url)
 		rescue StandardError => e
 			puts "Error while running the #{plugin.name.inspect} plugin. Maybe it has to be updated? Error: #{e.message}."	
-			exit
+			exit(1)
 		end
 		download_queue.each do |url_name|
 			result = DownloadHelper.save_file(url_name[:url], url_name[:name])
 			if result
 				puts "Download for #{url_name[:name]} successful."
+				if extract_audio
+					puts "Extracting audio for #{url_name[:name]}"
+					if DownloadHelper.os_has?('ffmpeg')
+						no_ext_filename = url_name[:name].split('.')[0..-1][0]
+						#capture stderr because ffmpeg expects an output param and will error out
+						file_info = Open3.popen3("ffmpeg -i #{url_name[:name]}") {|stdin, stdout, stderr, wait_thr| stderr.read }
+
+						if !file_info.to_s.empty?
+						  audio_format_matches = file_info.match(/Audio: (\w*)/)
+						  if audio_format_matches
+						  	audio_format = audio_format_matches[1]
+						  else
+						  	puts "Couldn't find any audio:\n#{file_info.inspect}"
+						  	next
+						  end
+						  
+						  extension_mapper = {
+							'aac' => 'm4a',
+							'mp3' => 'mp3',
+							'vorbis' => 'ogg'
+						  }
+
+						  if extension_mapper.key?(audio_format)
+						  	output_extension = extension_mapper[audio_format]
+						  else
+							#lame fallback
+							puts "Unknown audio format: #{audio_format}, using name as extension: '.#{audio_format}'."
+							output_extension = audio_format
+						  end
+						  output_filename = "#{no_ext_filename}.#{output_extension}"
+						  Open3.popen3("ffmpeg -i #{url_name[:name]} -vn -acodec copy #{output_filename}") {|stdin, stdout, stderr, wait_thr| stdout.read }
+						  puts "Done extracting audio to #{output_filename}"
+						else
+						  puts "Error while checking audio track of #{url_name[:name]}"
+						end
+					else
+						puts "Didn't detect ffmpeg on your system, can't extract audio."
+					end
+				end
 			else
 				puts "Download for #{url_name[:name]} failed."
 			end
 		end
+		#plugin matched and downloaded, we're done
 		exit
 	else
 		puts "#{plugin}: false"

data/helper/download-helper.rb

@@ -24,11 +24,10 @@ class DownloadHelper
   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)
+    if os_has?("wget")
       puts "using wget"
       result = system("wget \"#{unescaped_uri}\" -O #{file_name}")
-    elsif os_has?("curl", windows)
+    elsif os_has?("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}")
@@ -42,7 +41,7 @@ class DownloadHelper
   end
   
   #checks to see whether the os has a certain utility like wget or curl
-  def self.os_has?(utility, windows)
+  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

metadata

@@ -1,45 +1,35 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: viddl-rb
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 0.5.0
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 9
-  version: 0.4.9
 platform: ruby
-authors: 
+authors:
 - Marc Seeger
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-19 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70340043318900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-description: An extendable commandline video downloader for flash video sites. Includes plugins for vimeo, youtube and megavideo
+  prerelease: false
+  version_requirements: *70340043318900
+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
@@ -48,41 +38,29 @@ files:
 - plugins/vimeo.rb
 - plugins/youtube.rb
 - CHANGELOG.txt
-- README.txt
+- README.md
 homepage: https://github.com/rb2k/viddl-rb
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 19
-      segments: 
-      - 1
-      - 3
-      - 4
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.4
 requirements: []
-
 rubyforge_project: viddl-rb
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: An extendable commandline video downloader for flash video sites.
 test_files: []
-

data/README.txt

@@ -1,17 +0,0 @@
-= viddl-rb
-
-* http://github.com/rb2k/viddl-rb
-
-== Installation:  
-  gem install viddl-rb
-
-
-== Gems needed so far:  
-
-Progressbar
-  gem install progressbar  
-homepage: http://github.com/nex3/ruby-progressbar/  
-  
-Nokogiri
-  gem install nokogiri  
-homepage: http://nokogiri.org/