X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2Fwebsites%2Fyoutube.rb;fp=src%2Fwebsites%2Fyoutube.rb;h=0d9bf398338538a3dfd8e128e851a98680ca46ae;hb=2c835ed7a247ed5639277bc9674b848722ad998d;hp=6766af2d654e4438b7a5dadc07ee61f35b4fd2ff;hpb=c062e7dbc430c3a609aa677eece1ab8afec7a2ef;p=dead%2Fwhatever-dl.git

diff --git a/src/websites/youtube.rb b/src/websites/youtube.rb
index 6766af2..0d9bf39 100644
--- a/src/websites/youtube.rb
+++ b/src/websites/youtube.rb
@@ -26,7 +26,7 @@ require 'uri'
 
 class Youtube < Website
 
-  VALID_YOUTUBE_URL_REGEX = /^(http:\/\/)?(www\.)?youtube\.com\/((watch\?v=)|(v\/))[[:alnum:]]+(\&.*)?$/
+  VALID_YOUTUBE_URL_REGEX = /^(http:\/\/)?(www\.)?youtube\.com\/((watch\?v=)|(v\/))[[:alnum:]]+(\&.*)?\#?$/
   
   def self.owns_url?(url)
     return url =~ VALID_YOUTUBE_URL_REGEX
@@ -86,7 +86,7 @@ class Youtube < Website
   def parse_t_parameter(page_data)
     t_parameter = nil
     
-    t_parameter_regex = /\"t\"\:[[:space:]]\"([[:alnum:]]+)\"/
+    t_parameter_regex = /\"t\"\:[[:space:]]\"([^\"]+?)\"/
     matches = t_parameter_regex.match(page_data)
     t_parameter = matches[1] if not (matches.nil? || matches.length < 2)