Added configurable downloaders.

[dead/whatever-dl.git] / bin / whatever-dl

diff --git a/bin/whatever-dl b/bin/whatever-dl
index 79cbbee15afb9785a5f2ff5085b94392894dcdbb..fbc84e909bde09dbfc14f525404300c56e00394a 100755 (executable)
--- a/bin/whatever-dl
+++ b/bin/whatever-dl
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby -w
+#!/usr/bin/ruby -wKU
 #
 # whatever-dl, a script to download online (web-based) videos.
 #
@@ -31,14 +31,20 @@ require 'pathname'
 executable = Pathname.new(__FILE__).realpath.to_s
 $: << File.dirname(executable) + '/../'
 
-# We require the UriUtilities class to handle
-# the download of the video URL.
-require 'src/uri_utilities'
+# Load our config file.
+require 'bin/configuration'
 
+# And the downloaders...
+require 'src/downloader'
+
+# The Dir.glob that's coming up doesn't use the
+# Ruby library path so we need to tell it where to
+# look explicitly.
+websites_pattern = File.dirname(executable) + '/../src/websites/*.rb'
 
 # All of the website classes are located in one
 # directory, so we can 'require' them automatically.
-Dir.glob('src/websites/*.rb').each do |r|
+Dir.glob(websites_pattern).each do |r|
   require r
 end
 
@@ -77,23 +83,22 @@ if (__FILE__ == $0) then
     puts 'Error retrieving video URL.'
     exit(EXIT_COULDNT_GET_VIDEO_URL)
   end
-
-  video_uri = URI.parse(video_url)
-  uu = UriUtilities.new()
-  
+    
   if File.exists?(site.get_video_filename())
     puts "Error: output file already exists. Please remove #{site.get_video_filename()}, and try again."
     Kernel.exit(EXIT_OUTPUT_FILE_ALREADY_EXISTS)
   end
 
-
+  # The Downloader class is a factory; it should decide
+  # which subclass we get.
+  downloader = Downloader.create(Configuration::DOWNLOAD_METHOD)
+  
   # Attempt to download the file, and rescue and report
-  # any (predictable) exceptions.
+  # any (predictable) exceptions. The wget downloader will
+  # naturally not report any of these, since it will die in
+  # its own process.
   begin
-    puts "Fetching #{video_url}"
-    puts "Saving as #{site.get_video_filename()}."
-    puts ""
-    uu.download_with_progress_bar(video_uri, site.get_video_filename())
+    downloader.download(video_url, site.get_video_filename())
   rescue Errno::ECONNREFUSED => e
     puts 'The connection to the server (to download the video file) was refused. Check your connection, and try again later.'
     Kernel.exit(EXIT_CONNECTION_REFUSED)
@@ -105,7 +110,7 @@ if (__FILE__ == $0) then
   end
 
   # Write an empty line at the end for aesthetic reasons.
-  puts ""
+  puts ''
   
   Kernel.exit(EXIT_SUCCESS)
 end