X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=videosite%2FSevenloadGrabber.pm;h=f58c00ef3e41f7120b5fef8ea1936abe7e5c975c;hb=918efb1095354b8863af5eba168ffba5faecb50c;hp=1ad6c234450898d9edd902aa612765ceeee538f5;hpb=35306939804820c033c8e25ab5aa5134f5dc5735;p=videosite.git

diff --git a/videosite/SevenloadGrabber.pm b/videosite/SevenloadGrabber.pm
index 1ad6c23..f58c00e 100644
--- a/videosite/SevenloadGrabber.pm
+++ b/videosite/SevenloadGrabber.pm
@@ -1,9 +1,13 @@
-package SevenloadGrabber;
+# (c) 2007 by Ralf Ertzinger <ralf@camperquake.de>
+# licensed under GNU GPL v2
+#
+# Grabber for sevenload.com/de
 
-use GrabberBase;
-@ISA = qw(GrabberBase);
+package videosite::SevenloadGrabber;
+
+use videosite::GrabberBase;
+@ISA = qw(videosite::GrabberBase);
 
-use LWP::Simple qw(!get);
 use XML::Simple;
 use Data::Dumper;
 
@@ -11,15 +15,15 @@ use strict;
 
 sub new {
     my $class = shift;
-    my $self = $class->SUPER::new();
-
-    $self->{'NAME'} = 'sevenload';
-    $self->{'PATTERNS'} = ['(http://(?:[-a-zA-Z0-9_.]+\.)*sevenload.com/videos/([^/]+)(?:/.*)*)'];
-
-    bless($self, $class);
-    $self->_prepare_parameters();
-
-    return $self;
+    my $self = $class->SUPER::new(
+        NAME => 'sevenload',
+        _SELFTESTURL => 'http://de.sevenload.com/videos/uqDvKzh-vilogo-TV-Spot',
+        _SELFTESTTITLE => 'vilogo TV-Spot',
+        PATTERNS => ['(http://(?:[-a-zA-Z0-9_.]+\.)*sevenload.com/videos/(\w+?)-.*)'],
+        @_,
+    );
+
+    return bless($self, $class);
 }
 
 sub _parse {
@@ -37,23 +41,28 @@ sub _parse {
     $metadata->{'URL'} = $url;
     $metadata->{'ID'} = $2;
     $metadata->{'TYPE'} = 'video';
-    $metadata->{'SOURCE'} = 'sevenload';
+    $metadata->{'SOURCE'} = $self->{'NAME'};
     $metadata->{'TITLE'} = undef;
     $metadata->{'DLURL'} = undef;
 
     # Get the XML file containing the video metadata
-    unless(defined($content = LWP::Simple::get(sprintf('http://api.sevenload.com/api/player/id/%s', $2)))) {
+    unless(defined($content = $self->simple_get(sprintf('http://flash.sevenload.com/player?itemId=%s', $2)))) {
         $self->error('Could not download XML metadata');
         return undef;
     }
 
-    unless(defined($t = $p->XMLin($content))) {
+    unless(defined($t = $p->XMLin($content, KeepRoot => 1))) {
         $self->error('Could not parse XML metadata');
         return undef;
     }
 
-    $metadata->{'DLURL'} = $t->{'item'}->{'video'}->{'url'};
-    $metadata->{'TITLE'} = $t->{'item'}->{'title'};
+    # Loop through the video streams
+    foreach(@{$t->{'playerconfig'}->{'playlists'}->{'playlist'}->{'items'}->{'item'}->{'videos'}->{'video'}->{'streams'}->{'stream'}}) {
+        if ($_->{'quality'} eq 'high') {
+            $metadata->{'DLURL'} = $_->{'locations'}->{'location'}->{'content'};
+        }
+    }
+    $metadata->{'TITLE'} = $t->{'playerconfig'}->{'playlists'}->{'playlist'}->{'items'}->{'item'}->{'title'};
 
     unless(defined($metadata->{'DLURL'}) && defined($metadata->{'TITLE'})) {
         $self->error('Could not extract download URL and title');