- Study message before throwing it to the grabbers

[videosite.git] / videosite / DailyMotionGrabber.pm

diff --git a/videosite/DailyMotionGrabber.pm b/videosite/DailyMotionGrabber.pm
index b77c119..5e4f10e 100644 (file)
--- a/videosite/DailyMotionGrabber.pm
+++ b/videosite/DailyMotionGrabber.pm
@@ -1,3 +1,8 @@
+# Grabber for dailymotion.com
+#
+# (c) 2007 by Ralf Ertzinger <ralf@camperquake.de>
+# licensed under GNU GPL v2
+
 package DailyMotionGrabber;
 
 use GrabberBase;
@@ -18,6 +23,8 @@ sub new {
 
     bless($self, $class);
 
+    $self->_prepare_parameters();
+
     return $self;
 }
 
@@ -38,7 +45,7 @@ sub _parse {
     $metadata->{'URL'} = $url;
     $metadata->{'ID'} = $2;
     $metadata->{'TYPE'} = 'video';
-    $metadata->{'SOURCE'} = 'dailymotion';
+    $metadata->{'SOURCE'} = $self->{'NAME'};
     $metadata->{'TITLE'} = undef;
     $metadata->{'DLURL'} = undef;
 
@@ -65,9 +72,11 @@ sub _parse {
 
     # Look for the download URL
     foreach $e (@text) {
-        if ($e->[0] =~ m|\.addVariable\("url", "([^\"]+)"|) {
+        if ($e->[0] =~ m|\.addVariable\("video", "([^\"]+)"|) {
             $metadata->{'DLURL'} = $1;
             $metadata->{'DLURL'} =~ s/%(..)/chr(hex($1))/ge;
+            $metadata->{'DLURL'} =~ s/\@\@spark.*//g;
+            $metadata->{'DLURL'} = 'http://www.dailymotion.com' . $metadata->{'DLURL'};
 
         }
     }