Make headers a property of the website class rather than passing them to get_page_data.

[dead/whatever-dl.git] / src / website.rb

diff --git a/src/website.rb b/src/website.rb
index 75f5aa8907d4c6c8e3fa237172a3e02a1f80f71c..4e20466d30d95f0bf5a95370bcaa674a4adf5f73 100644 (file)
--- a/src/website.rb
+++ b/src/website.rb
@@ -62,7 +62,7 @@ class Website
     uri = URI.parse(url)
 
     response = Net::HTTP.start(uri.host, uri.port) do |http|
-      http.get(uri.request_uri)
+      http.get(uri.request_uri, self.headers)
     end
 
     return response.body
@@ -72,11 +72,17 @@ class Website
   
   public;
 
+  # Additional headers used when requesting data from the website.
+  # These aren't passed as a parameter because the (final)
+  # downloaders need them as well.
+  attr_accessor :headers
+
   def initialize(url)
     @url = url
+    self.headers = { 'User-Agent' => Configuration::USER_AGENT }
   end
 
-  
+
   def self.create(url)
     # Factory method returning an instance of
     # the appropriate subclass.
@@ -114,8 +120,15 @@ class Website
   # of the video URL, but in some cases, subclasses will want
   # to override this behavior.
   def get_video_filename()
-    # Use whatever comes after the final front slash.    
-    return get_video_url().split('/').pop()
+    # Use whatever comes after the final front slash.
+    file_and_params = get_video_url().split('/').pop()
+
+    # Unless it contains URL parameters. We don't want those.
+    return file_and_params unless file_and_params.include?('?')
+    
+    # There must be some parameters. Strip them off.
+    param_start_idx = file_and_params.index('?')
+    return file_and_params[0...(param_start_idx)]
   end
   
 end