X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=videosite%2FDailyMotionGrabber.pm;h=981fef7b7c00cfb1a2841428872282b24dd4e8d8;hb=cb4ae7b7d722545c793aac94a1d51186368ab248;hp=5dae65d68a8d4b0ef81502988b365171ed6c7252;hpb=2044d5ff60e639a2eafbeed3a70224564e94c84c;p=videosite.git

diff --git a/videosite/DailyMotionGrabber.pm b/videosite/DailyMotionGrabber.pm
index 5dae65d..981fef7 100644
--- a/videosite/DailyMotionGrabber.pm
+++ b/videosite/DailyMotionGrabber.pm
@@ -3,13 +3,14 @@
 # (c) 2007 by Ralf Ertzinger <ralf@camperquake.de>
 # licensed under GNU GPL v2
 
-package DailyMotionGrabber;
+package videosite::DailyMotionGrabber;
 
-use GrabberBase;
-@ISA = qw(GrabberBase);
+use videosite::GrabberBase;
+@ISA = qw(videosite::GrabberBase);
 
 use LWP::Simple qw(!get);
 use HTML::Parser;
+use videosite::JSArrayParser;
 use Data::Dumper;
 
 use strict;
@@ -23,6 +24,8 @@ sub new {
 
     bless($self, $class);
 
+    $self->_prepare_parameters();
+
     return $self;
 }
 
@@ -43,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;
 
@@ -63,17 +66,60 @@ 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\("url", "([^\"]+)"|) {
-            $metadata->{'DLURL'} = $1;
-            $metadata->{'DLURL'} =~ s/%(..)/chr(hex($1))/ge;
-
+        if ($e->[0] =~ m|\.addVariable\("sequence",\s*"([^\"]+)"|) {
+            my $sequence = $1;
+            my $jsp = videosite::JSArrayParser->new();
+            my $main;
+            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));
+
+                foreach (@{$sequence}) {
+                    if (exists($_->{'name'}) && ($_->{'name'} eq 'main')) {
+                        # Found main section
+                        $main = $_->{'layerList'};
+                    }
+                }
+                unless(defined($main)) {
+                    $self->error("Could not find layerList[main]");
+                    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;
+                        }
+                    }
+                }
+            }
         }
     }