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

diff --git a/videosite/DailyMotionGrabber.pm b/videosite/DailyMotionGrabber.pm
index 981fef7..6544882 100644
--- a/videosite/DailyMotionGrabber.pm
+++ b/videosite/DailyMotionGrabber.pm
@@ -8,7 +8,6 @@ package videosite::DailyMotionGrabber;
 use videosite::GrabberBase;
 @ISA = qw(videosite::GrabberBase);
 
-use LWP::Simple qw(!get);
 use HTML::Parser;
 use videosite::JSArrayParser;
 use Data::Dumper;
@@ -50,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;
     }
@@ -77,7 +76,7 @@ sub _parse {
         if ($e->[0] =~ m|\.addVariable\("sequence",\s*"([^\"]+)"|) {
             my $sequence = $1;
             my $jsp = videosite::JSArrayParser->new();
-            my $main;
+            my $l;
             my $s;
 
             $sequence =~ s/%(..)/chr(hex($1))/ge;
@@ -93,31 +92,22 @@ sub _parse {
             } else {
                 $self->debug("Parsed sequence: %s", Dumper($sequence));
 
-                foreach (@{$sequence}) {
-                    if (exists($_->{'name'}) && ($_->{'name'} eq 'main')) {
-                        # Found main section
-                        $main = $_->{'layerList'};
-                    }
-                }
-                unless(defined($main)) {
-                    $self->error("Could not find layerList[main]");
+                $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;
                 }
 
-                foreach (@{$main}) {
-                    if (exists($_->{'name'}) && ($_->{'name'} eq 'video')) {
-                        # Found video section
-                        if (exists($_->{'param'}->{'hdURL'})) {
-                            $metadata->{'DLURL'} = $_->{'param'}->{'hdURL'};
-                        } elsif (exists($_->{'param'}->{'hqURL'})) {
-                            $metadata->{'DLURL'} = $_->{'param'}->{'hqURL'};
-                        } elsif (exists($_->{'param'}->{'hqURL'})) {
-                            $metadata->{'DLURL'} = $_->{'param'}->{'sdURL'};
-                        } else {
-                            $self->error("Video section found, but no URLs");
-                            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;
                 }
             }
         }
@@ -131,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;