X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2Fpr0n-upload.pl;h=901760f7ec241fd5b5ebc031fd373c410824349a;hp=6d5aacc9d898039e8cf8e0c731ba5bc6075d2b2c;hb=8f134ac2c4309260db7e2ede5814e30427467c3b;hpb=773d6cc9629e119b2bdc0ea8849aefccc29ffc8b

diff --git a/perl/pr0n-upload.pl b/perl/pr0n-upload.pl
index 6d5aacc..901760f 100755
--- a/perl/pr0n-upload.pl
+++ b/perl/pr0n-upload.pl
@@ -1,8 +1,7 @@
 #! /usr/bin/perl
 
 #
-# Small multithreaded pr0n uploader, based partially on dave from HTTP::DAV.
-# Use like
+# Small multithreaded pr0n uploader. Use like
 #
 #   pr0n-upload.pl http://pr0n.sesse.net/webdav/upload/random/ *.JPG
 #
@@ -11,25 +10,26 @@
 
 use strict;
 use warnings;
-use HTTP::DAV;
+use LWP::UserAgent;
 use threads;
 use Thread::Queue;
+use File::Spec;
+use URI;
 
-my $threads = 16;
+my $threads = 40;
 my $running_threads :shared = 0;
 my $queue :shared = Thread::Queue->new;
+my @succeeded :shared = ();
+my @failed :shared = ();
 
 # Enqueue all the images.
 my $url = shift @ARGV;
+$url .= '/' if ($url !~ m#/$#);
 $queue->enqueue(@ARGV);
 
 # Fetch username and password, and check that they actually work.
 my ($user, $pass) = get_credentials();
-my $dav = init_dav($url, $user, $pass);
-my $r = $dav->propfind(-url => $url, -depth => 0);
-if ($r == 0) {
-	die "Couldn't open $url: " . $dav->message . "\n";
-}
+my $ua = init_ua($url, $user, $pass);
 
 # Fire up the worker threads, and wait for them to finish.
 my @threads = ();
@@ -44,27 +44,53 @@ for my $thread (@threads) {
 	$thread->join();
 }
 
+if (scalar @failed != 0 && scalar @succeeded != 0) {
+	# Output failed files in an easily-pastable format.
+	print "\nFailed files: ", join(' ', @failed), "\n";
+}
+
 sub upload_thread {
 	$running_threads++;
 
-	my $dav = init_dav($url, $user, $pass);
+	my $ua = init_ua($url, $user, $pass);
 	while (my $filename = $queue->dequeue_nb) {
-		$dav->put(-local => $filename, -url => $url)
-			or warn "Couldn't upload $filename: " . $dav->message . "\n";
+		my (undef, undef, $basename) = File::Spec->splitpath($filename);
+		my $newurl = $url . $basename;
+		my $req = HTTP::Request->new(PUT => $newurl);
+		{
+			local $/ = undef;
+			open my $fh, "<", $filename
+				or die "Couldn't find $filename: $!";
+			$req->content(<$fh>);
+			close $fh;
+		}
+
+		my $res = $ua->request($req);
+		if ($res->is_success) {
+			push @succeeded, $filename;
+		} else {
+			push @failed, $filename;
+			warn "Couldn't upload $filename: " . $res->message . "\n";
+		}
 	}
 	
 	$running_threads--;
 }
 
-sub init_dav {
+sub init_ua {
 	my ($url, $user, $pass) = @_;
-	my $ua = HTTP::DAV::UserAgent->new();
-	$ua->agent('pr0n-uploader/v1.0 (perldav)');
-	my $dav = HTTP::DAV->new(-useragent=>$ua);
-	$dav->credentials(-user=>$user, -pass=>$pass, -url=>$url);
-	$dav->open(-url => $url)
-		or die "Couldn't open $url: " . $dav->message . "\n";
-	return $dav;
+	my $ua = LWP::UserAgent->new;
+	$ua->agent('pr0n-uploader/v1.0');
+	my $urlobj = URI->new($url);
+	my $hostport = $urlobj->host . ':' . $urlobj->port;
+	$ua->credentials($hostport, 'pr0n.sesse.net', $user, $pass);
+
+	# Check that it works.
+	my $req = HTTP::Request->new(PROPFIND => $url);
+	my $res = $ua->request($req);
+	die "$url: " . $res->status_line if (!$res->is_success);
+
+	return $ua;
 }
 
 sub get_credentials {