X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=videosite%2FDailyMotionGrabber.pm;h=65448824863918f1ba71549365a5533fa0a1908d;hb=b211d3075c2cf9856a7440b90ba628a8191a095e;hp=903c6106595e797a28e034bf042330371cd583da;hpb=911eeb36e674f916d08b04cd9c48bb33e96bf108;p=videosite.git

diff --git a/videosite/DailyMotionGrabber.pm b/videosite/DailyMotionGrabber.pm
index 903c610..6544882 100644
--- a/videosite/DailyMotionGrabber.pm
+++ b/videosite/DailyMotionGrabber.pm
@@ -8,8 +8,8 @@ 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;
@@ -49,7 +49,7 @@ sub _parse {
     $metadata->{'TITLE'} = undef;
     $metadata->{'DLURL'} = undef;
 
-    unless(defined($content = LWP::Simple::get(sprintf('http://www.dailymotion.com/video/%s', $2)))) {
+    unless(defined($content = $self->simple_get(sprintf('http://www.dailymotion.com/video/%s', $2)))) {
         $self->error('Could not download %s', $url);
         return undef;
     }
@@ -65,19 +65,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/^Dailymotion\s+-\s+//;
+                $metadata->{'TITLE'} =~ s/(?:\s+-\s+.*)?$//;
             }
         }
     }
 
     # Look for the download URL
     foreach $e (@text) {
-        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'};
-
+        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;
+                }
+            }
         }
     }
 
@@ -89,4 +121,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;