X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=videosite%2FDailyMotionGrabber.pm;h=a98fae68b783c592a6bac107e1628415b9bf505e;hb=faaacb2741009b8df6e855d74f38ef72197d6889;hp=286c8769a121411ea2fd6384be2106fb13a738b4;hpb=030f66b1d4e02e927dd8767e5d10d399acff730e;p=videosite.git

diff --git a/videosite/DailyMotionGrabber.pm b/videosite/DailyMotionGrabber.pm
index 286c876..a98fae6 100644
--- a/videosite/DailyMotionGrabber.pm
+++ b/videosite/DailyMotionGrabber.pm
@@ -1,10 +1,16 @@
-package DailyMotionGrabber;
+# Grabber for dailymotion.com
+#
+# (c) 2007 by Ralf Ertzinger <ralf@camperquake.de>
+# licensed under GNU GPL v2
 
-use GrabberBase;
-@ISA = qw(GrabberBase);
+package videosite::DailyMotionGrabber;
+
+use videosite::GrabberBase;
+@ISA = qw(videosite::GrabberBase);
 
 use LWP::Simple qw(!get);
 use HTML::Parser;
+use videosite::JSArrayParser;
 use Data::Dumper;
 
 use strict;
@@ -14,10 +20,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 +46,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 +66,51 @@ sub _parse {
         if ('meta' eq $e->[0]) {
             if ('title' eq $e->[1]->{'name'}) {
                 $metadata->{'TITLE'} = $e->[1]->{'content'};
+                $metadata->{'TITLE'} =~ s/^Dailymotion\s+-\s+//;
+                $metadata->{'TITLE'} =~ s/(?:\s+-\s+.*)?$//;
             }
         }
     }
 
     # Look for the download URL
     foreach $e (@text) {
-        if ($e->[0] =~ m|\.add_variable("url", "([^\"]+)")|) {
-            $metadata->{'DLURL'} = $1;
+        if ($e->[0] =~ m|\.addVariable\("sequence",\s*"([^\"]+)"|) {
+            my $sequence = $1;
+            my $jsp = videosite::JSArrayParser->new();
+            my $l;
+            my $s;
+
+            $sequence =~ s/%(..)/chr(hex($1))/ge;
+            $self->debug("Found sequence: %s", $sequence);
+
+            $self->debug("Using %s to parse", ref($jsp));
+            $sequence = $jsp->parse($sequence);
+            $self->debug(Dumper($sequence));
+
+            unless(defined($sequence)) {
+                $self->error("Found sequence, but could not parse");
+                return undef;
+            } else {
+                $self->debug("Parsed sequence: %s", Dumper($sequence));
+
+                $l = $self->_fetch_layer($sequence, "root/layerList", "background/sequenceList", "main/layerList", "video/param");
+                unless(defined($l)) {
+                    $self->error("Could not find video layer");
+                    return undef;
+                }
+
+                # Found video section
+                if (exists($l->{'videoPluginParameters'}->{'hdURL'})) {
+                    $metadata->{'DLURL'} = $l->{'videoPluginParameters'}->{'hdURL'};
+                } elsif (exists($l->{'videoPluginParameters'}->{'hqURL'})) {
+                    $metadata->{'DLURL'} = $l->{'videoPluginParameters'}->{'hqURL'};
+                } elsif (exists($l->{'videoPluginParameters'}->{'hqURL'})) {
+                    $metadata->{'DLURL'} = $l->{'videoPluginParameters'}->{'sdURL'};
+                } else {
+                    $self->error("Video section found, but no URLs");
+                    return undef;
+                }
+            }
         }
     }
 
@@ -77,4 +122,37 @@ sub _parse {
     return $metadata;
 }
 
+sub _fetch_layer {
+    my $self = shift;
+    my $sequence = shift;
+    my $point = shift;
+    my $next;
+    my @points = @_;
+    my $l;
+
+    $self->debug("Looking for %s in %s", $point, Dumper($sequence));
+
+    unless(defined($point)) {
+        $self->debug("Reached last point");
+        return $sequence;
+    }
+    ($point, $next) = split(/\//, $point, 2);
+
+    foreach (@{$sequence}) {
+        if (exists($_->{'name'}) and ($_->{'name'} eq $point)) {
+            if (exists($_->{$next})) {
+                $self->debug("Using %s in %s", $next, $point);
+                return $self->_fetch_layer($_->{$next}, @points);
+            } else {
+                $self->debug("%s found, but no %s", $point, $next);
+                return undef;
+            }
+
+        }
+    }
+
+    $self->debug("Could not find entry named %s", $point);
+    return undef;
+}
+
 1;