X-Git-Url: http://gitweb.michael.orlitzky.com/?p=dead%2Fwhatever-dl.git;a=blobdiff_plain;f=bin%2Fwhatever-dl;h=787e9dbb93c748ed5f949bce8e50052a15968081;hp=9a6b8c3e23eabe2b02624fe5a38539b3de340d74;hb=0662d93e5088ecfd2ce351910ab9a1d3568f8359;hpb=c292aca3372339f92ea6fa8fa563ffed7f4fd19c

diff --git a/bin/whatever-dl b/bin/whatever-dl
index 9a6b8c3..787e9db 100755
--- a/bin/whatever-dl
+++ b/bin/whatever-dl
@@ -24,6 +24,9 @@
 # a symlink which points to it.
 require 'pathname'
 
+# And getoptlong to check for our one option, --continue.
+require 'getoptlong'
+
 # This bit of magic adds the parent directory (the
 # project root) to the list of ruby load paths.
 # Thus, our require statements will work regardless of
@@ -31,10 +34,11 @@ 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
@@ -52,19 +56,56 @@ EXIT_SUCCESS = 0
 EXIT_NO_URL = 1
 EXIT_INVALID_URL = 2
 EXIT_COULDNT_GET_VIDEO_URL = 3
-EXIT_OUTPUT_FILE_ALREADY_EXISTS = 4
+EXIT_IO_ERROR = 4
 EXIT_ERROR_READING_FROM_VIDEO_URL = 5
 EXIT_CONNECTION_REFUSED = 6
 EXIT_HTTP_ERROR = 7
 EXIT_ACCESS_DENIED = 8
 
+def usage()
+  puts <<EOF
+
+Usage: whatever-dl [options] <url>
+
+Options:
+  -c, --continue        Continue downloading a previously-attempted file.
+
+EOF
+
+end
+
 # Only actually do something if this script was called
 # directly (i.e. not from the tests).
 if (__FILE__ == $0) then
+  # Default options.
+  options = { :continue => false }
+
+  # Parse the command-line options into the options hash.
+  opts = GetoptLong.new(["--continue", "-c", GetoptLong::NO_ARGUMENT],
+                        ["--help", "-h", GetoptLong::NO_ARGUMENT])
+
+  opts.each do |opt, arg|
+    case opt
+    when '--help'
+      usage()
+      Kernel.exit(EXIT_SUCCESS)
+    when '--continue'
+      options[:continue] = true
+    end
+  end
+
+  # Warn about nonsensical options.
+  if options[:continue] and not (Configuration::DOWNLOAD_METHOD == :wget)
+    puts 'WARNING: The --continue flag does nothing unless DOWNLOAD_METHOD is :wget.'
+  end
+
+  # Note that GetoptLong steals its arguments from ARGV, so we don't need
+  # to take optional arguments into account when figuring out whether or not
+  # we were passed a URL.
   if (ARGV.length < 1) then
     # If the user didn't give us a URL, yell
     # at him or her.
-    puts 'Usage: whatever-dl <url>'
+    usage()
     Kernel.exit(EXIT_NO_URL)
   end
 
@@ -79,26 +120,23 @@ if (__FILE__ == $0) then
   video_url = site.get_video_url()
 
   if video_url.nil?
-    puts 'Error retrieving video URL.'
-    exit(EXIT_COULDNT_GET_VIDEO_URL)
-  end
+    puts 'Error retrieving video URL:'
+    puts "Site not supported, and the generic parser couldn't find any videos."
+    exit(EXIT_COULDNT_GET_VIDEO_URL) end
 
-  video_uri = URI.parse(video_url)
-  uu = UriUtilities.new()
+  # The Downloader class is a factory; it should decide
+  # which subclass we get.
+  downloader = Downloader.create(Configuration::DOWNLOAD_METHOD)
   
-  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
-
-
   # 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(),
+                        site.headers(),
+                        continue=options[:continue])
   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)
@@ -107,10 +145,13 @@ if (__FILE__ == $0) then
   rescue OpenURI::HTTPError => e
     puts "An HTTP error occurred while downloading the video file: #{e.message}."
     Kernel.exit(EXIT_HTTP_ERROR)
+  rescue IOError => e
+    puts "Input/Output Error: #{e.message}"
+    Kernel.exit(EXIT_IO_ERROR)
   end
 
   # Write an empty line at the end for aesthetic reasons.
-  puts ""
+  puts ''
   
   Kernel.exit(EXIT_SUCCESS)
 end