X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2Fwebsites%2Fveoh.rb;h=d2744c3f81ef450361efaf1e6f6f2b4396a84e30;hb=63a898d70c90cf95f423fcd396af9b4639f1c3dd;hp=8978febf855ec4bfd38abf6ab50840020f1559b4;hpb=174589cd65cf32d4a54b9298953228f6094c7128;p=dead%2Fwhatever-dl.git

diff --git a/src/websites/veoh.rb b/src/websites/veoh.rb
index 8978feb..d2744c3 100644
--- a/src/websites/veoh.rb
+++ b/src/websites/veoh.rb
@@ -18,15 +18,10 @@
 
 require 'src/website'
 
-# Needed to download the page, which is in turn
-# needed because it contains the video (redirect) URL.
-require 'net/http'
-require 'uri'
-
 
 class Veoh < Website
 
-  VALID_VEOH_URL_REGEX = /^(http:\/\/)?(www\.)?veoh\.com\/videos\/([[:alnum:]]+)$/
+  VALID_VEOH_URL_REGEX = /^(http:\/\/)?(www\.)?veoh\.com\/.*?(v[[:alnum:]]+)$/
   
   def self.owns_url?(url)
     return url =~ VALID_VEOH_URL_REGEX
@@ -58,7 +53,7 @@ class Veoh < Website
   protected;
 
   def parse_video_id()
-    video_id_regex = /[[:alnum:]]+$/
+    video_id_regex = /v[[:alnum:]]+$/
     matches = video_id_regex.match(@url)
     video_id = matches[0] if not matches.nil?
     
@@ -71,7 +66,7 @@ class Veoh < Website
   def parse_redirect_url(page_data)
     redirect_url_regex = /fullPreviewHashPath=\"(.*?)\"/
     matches = redirect_url_regex.match(page_data)
-    redirect_url = matches[1] if not (matches.nil? || matches.length < 1)
+    redirect_url = matches[1] if not (matches.nil? || matches.length < 2)
     
     return redirect_url
   end