X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2Fwebsite.rb;h=bfa1b3d618a04163856fee297dd65ce4b0e380b8;hb=7e3bb5567a580e3af73bbabe21cd1a946ffb67d8;hp=ef96dc11fd32f6407a199ee2c033ecd4e40721eb;hpb=e756e0b650774f2503702512ccdc02e86eee1788;p=dead%2Fwhatever-dl.git diff --git a/src/website.rb b/src/website.rb index ef96dc1..bfa1b3d 100644 --- a/src/website.rb +++ b/src/website.rb @@ -16,6 +16,9 @@ # http://www.fsf.org/licensing/licenses/gpl.html # +# Needed for the default implementation of get_page_data. +require 'net/http' + # Necessary in a lot of subclasses; plus, we need it # to parse the server name out of our URL. require 'uri' @@ -111,8 +114,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