X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=videosite%2FAsyncFileGetter.pm;h=1489f8863820dc37948c431dab178cade8483bff;hb=ee3cab314530ee9929680b849d7c7fd965dc8dbc;hp=70fa613a547ea3a1a960f9ef4e3179e2998ce592;hpb=a21902ff29384676eb0e776140a81a67f81dc8c6;p=videosite.git

diff --git a/videosite/AsyncFileGetter.pm b/videosite/AsyncFileGetter.pm
index 70fa613..1489f88 100644
--- a/videosite/AsyncFileGetter.pm
+++ b/videosite/AsyncFileGetter.pm
@@ -1,5 +1,5 @@
 # (c) 2007 by Ralf Ertzinger <ralf@camperquake.de>
-#     2008-2009 by Christian Garbs <mitch@cgarbs.de>
+#     2015 by Christian Garbs <mitch@cgarbs.de>
 #
 # licensed under GNU GPL v2
 #
@@ -13,59 +13,46 @@ use videosite::FileGetter;
 @ISA = qw(videosite::FileGetter);
 
 use strict;
-use LWP::Simple qw(!get);
-use File::Basename;
-use File::Temp qw(tempfile);
-use MIME::Base64;
 
 sub new {
     my $class = shift;
-    my $self = $class->SUPER::new();
+    my $self = $class->SUPER::new(
+        NAME => 'asyncfilegetter',
+        @_,
+    );
 
-    $self->{'NAME'} = 'asyncfilegetter';
-
-    bless($self, $class);
-    $self->_prepare_parameters();
-
-    return $self;
+    return bless($self, $class);
 }
 
-sub get {
+sub _download {
     my $self = shift;
+    my $dlurl = shift;
+    my $dlfile = shift;
     my $video = shift;
-    my $dlfile;
-    my $dirname;
-    my $cookie = "";
-
-    $dlfile = sprintf($self->_getval('FILEPATTERN'),
-        $self->_encode($video->{'SOURCE'}),
-        $self->_encode($video->{'ID'}),
-        $self->_encode($video->{'TITLE'}),
-        $self->_encode($video->{'DLURL'}),
-        $self->_encode($video)->{'URL'});
-
-    $dirname = dirname($dlfile);
-    if ($self->_diskfree($dirname) < $self->_getval('MINFREE')) {
-        $self->error("Not enough free space to download");
-        return 0;
-    }
-
-    $self->debug('Going to download %s to %s', $video->{'DLURL'}, $dlfile);
-
-    my (undef, $tmpfile) = tempfile('videosite.tmp.XXXXXXXXXXXX', DIR => $dirname);
-
-    if (exists($video->{'CONNECTOR'})) {
-	my $schemas = $video->{'CONNECTOR'}->{'schemas'};
-	foreach (keys(%{$schemas})) {
-	    $self->debug("Setting %s_proxy to %s", $_, $schemas->{$_});
-	    $ENV{ $_.'_proxy'} = $schemas->{$_};
+    my $child_pid;
+
+    # fork to background
+    $child_pid = fork();
+    
+    if ($child_pid) {               # parent
+	$self->debug('parent spawned process %d for download', $child_pid);
+	if (exists $self->{_API}->{wait_for_child}) {
+	    $self->debug('calling wait_for_child on %d', $child_pid);
+	    $self->{_API}->{wait_for_child}->($child_pid);
 	}
+	Irssi::pidwait_add($child_pid);
+    }
+    elsif (defined $child_pid) {    # child
+        close STDIN;
+        close STDOUT;
+        close STDERR;
+	$self->debug('CHILD: start download');
+	$self->SUPER::_download($dlurl, $dlfile, $video);
+	$self->debug('CHILD: end download');
+	exit;
+	$self->debug('CHILD: AFTER EXIT? WTF!');
     }
-
-    $cookie = "-H \"Cookie: $video->{'COOKIE'}\"" if (defined $video->{'COOKIE'});
-    my $cmdline = "( GET $cookie \"$video->{'DLURL'}\" > \"$tmpfile\" && mv \"$tmpfile\" \"$dlfile\" && chmod =rw \"$dlfile\" || rm -f \"$tmpfile\" ) &";
-    $self->debug(encode_base64($cmdline));
-    system($cmdline);
 
     return 1;
 }
+