X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=videosite%2FDailyMotionGrabber.pm;h=5e4f10ed1092b075821b229a53b68ce71e48136e;hb=e7da1d6ef392d2533bf4f31ba6bca3d3824352cd;hp=8cea83c2af1429303eb8be38da940df8a3894f31;hpb=d333195856d50dbceb175e5cdcd1061a8ad8366a;p=videosite.git

diff --git a/videosite/DailyMotionGrabber.pm b/videosite/DailyMotionGrabber.pm
index 8cea83c..5e4f10e 100644
--- 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;
@@ -14,10 +19,12 @@ sub new {
     my $self = $class->SUPER::new();
 
     $self->{'NAME'} = 'dailymotion';
-    $self->{'PATTERNS'} = ['(http://(?:[-a-zA-Z0-9_.]+\.)*.dailymotion.com/(?:[^/]+/)*video/([-a-zA-Z0-9_]+)'];
+    $self->{'PATTERNS'} = ['(http://(?:[-a-zA-Z0-9_.]+\.)*dailymotion.com/(?:[^/]+/)*video/([-a-zA-Z0-9_]+))'];
 
     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;
 
@@ -58,14 +65,19 @@ sub _parse {
         if ('meta' eq $e->[0]) {
             if ('title' eq $e->[1]->{'name'}) {
                 $metadata->{'TITLE'} = $e->[1]->{'content'};
+                $metadata->{'TITLE'} =~ s/^Dailymotion\s*:\s*//;
             }
         }
     }
 
     # Look for the download URL
     foreach $e (@text) {
-        if ($e->[0] =~ m|\.add_variable("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'};
+
         }
     }