X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=videosite%2FFileGetter.pm;h=5e54935c15076aecbb5368fc3d71bf3a964500e4;hb=refs%2Fheads%2Fmaster;hp=f7c680ec75ba33db36737b617745a9540a2397ea;hpb=d4895ed1563f30b8885472b2fe7ba16b1bbfbb84;p=videosite.git

diff --git a/videosite/FileGetter.pm b/videosite/FileGetter.pm
index f7c680e..5e54935 100644
--- a/videosite/FileGetter.pm
+++ b/videosite/FileGetter.pm
@@ -14,15 +14,16 @@ use File::Basename;
 
 sub new {
     my $class = shift;
-    my $self = $class->SUPER::new();
-
-    $self->{'NAME'} = 'filegetter';
-    $self->{'_PARAMS'} = {'MINFREE' => ['500000', 'The amount of space that needs to be available on the filesystem before the video is downloaded (in kilobytes)'], 'FILEPATTERN', => ['/tmp/%s - %s - %s.flv', "The file name to save the file under. This is a string which is passed to a sprintf call later on. The parameters passed to that sprintf call, in order, are:\n- The site the video is from\n- The ID of the video\n- The title of the video\n- The URL of the video file itself\n- The URL of the site the video was taken from\nAll parameters are encoded (space and / replaced by _)"]};
-
-    bless($self, $class);
-    $self->_prepare_parameters();
-
-    return $self;
+    my $self = $class->SUPER::new(
+        NAME => 'filegetter',
+        _PARAMS => {
+            MINFREE => ['500000', 'The amount of space that needs to be available on the filesystem before the video is downloaded (in kilobytes)'],
+            FILEPATTERN => ['/tmp/%s - %s - %s.flv', "The file name to save the file under. This is a string which is passed to a sprintf call later on. The parameters passed to that sprintf call, in order, are:\n- The site the video is from\n- The ID of the video\n- The title of the video\n- The URL of the video file itself\n- The URL of the site the video was taken from\nAll parameters are encoded (space and / replaced by _)"]
+        },
+        @_,
+    );
+
+    return bless($self, $class);
 }
 
 sub get {
@@ -30,8 +31,6 @@ sub get {
     my $video = shift;
     my $dlfile;
     my $dirname;
-    my $ua;
-    my $res;
 
     $dlfile = sprintf($self->_getval('FILEPATTERN'),
         $self->_encode($video->{'SOURCE'}),
@@ -49,20 +48,39 @@ sub get {
     if (exists($video->{'CONNECTOR'})) {
         $self->selectconn($video->{'CONNECTOR'});
     }
-    $ua = $self->ua();
 
-    $self->debug('Going to download %s to %s', $video->{'DLURL'}, $dlfile);
 
-    $res = $ua->mirror($video->{'DLURL'}, $dlfile);
+    $self->_download( $video->{'DLURL'}, $dlfile, $video )
+	or return 0;
+
+    if (exists($video->{'DLURL_AUDIO'})) {
+        $self->_download( $video->{'DLURL_AUDIO'}, $dlfile . '.audio', $video )
+	    or return 0;
+    }
+
+    return 1;
+}
+
+
+sub _download {
+    my $self = shift;
+    my $dlurl = shift;
+    my $dlfile = shift;
+    my $video = shift;
+    my $res;
+
+    $self->debug('Going to download %s to %s', $dlurl, $dlfile);
+
+    $res = $self->ua()->mirror($dlurl, $dlfile);
+    
     if (!$res->is_success()) {
-        $self->error('Could not download %s to %s (%s)', $video->{'DLURL'}, $dlfile, $res->code());
+        $self->error('Could not download %s to %s (%s)', $dlurl, $dlfile, $res->code());
         return 0;
     }
 
     return 1;
 }
 
-
 sub _encode {
     my $self = shift;
     my $s = shift;