Fix all Ruby 1.9 errors and warnings.

[dead/whatever-dl.git] / src / websites / generic.rb

diff --git a/src/websites/generic.rb b/src/websites/generic.rb
index 88fa5156a915333096beb76c0f4d8c8ad202d7a0..04537279cc2866c8473cecf651ea491a39588015 100644 (file)
--- a/src/websites/generic.rb
+++ b/src/websites/generic.rb
@@ -48,17 +48,17 @@ class Generic < Website
   end
 
   def parse_video_url(page_data)
-    full_video_url_regex = /(http:\/\/.+?\.(flv|mp4))/i
+    full_video_url_regex = /(http:\/\/[^\"\']+?\.(flv|mp4))/i
     matches = full_video_url_regex.match(page_data)
 
-    if not (matches.nil? || matches.length < 2)
+    if not matches.nil? || matches.length < 2
       return matches[1]
     end
 
     partial_video_url_regex = /([^\=\"\']+\.(flv|mp4))/i
     matches = partial_video_url_regex.match(page_data)
 
-    if not (matches.nil? || matches.length < 2)
+    if not matches.nil? || matches.length < 2
       return base_url + matches[1]
     end