X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FWebDAV.pm;h=8c90e2fcd3fc9f94eb400ff9990e458b0b095a16;hp=f428a4f55fcb1889f7213d65e93508c5339411be;hb=97d5bb1e417a37cf3e0cec8bf75bed3a971f913b;hpb=2a98fc654ff4ec29aa576ac5ba68fcba08682ef3

diff --git a/perl/Sesse/pr0n/WebDAV.pm b/perl/Sesse/pr0n/WebDAV.pm
index f428a4f..8c90e2f 100644
--- a/perl/Sesse/pr0n/WebDAV.pm
+++ b/perl/Sesse/pr0n/WebDAV.pm
@@ -11,7 +11,7 @@ use Apache2::Upload;
 sub handler {
 	my $r = shift;
 	my $dbh = Sesse::pr0n::Common::get_dbh();
-	
+			
 	$r->headers_out->{'DAV'} = "1,2";
 
 	# We only handle depth=0, depth=1 (cf. the RFC)
@@ -405,6 +405,10 @@ EOF
 		
 		my ($event, $autorename, $filename) = ($1, $2, $3);
 		my $size = $r->headers_in->{'content-length'};
+		if (!defined($size)) {
+			$size = $r->headers_in->{'x-expected-entity-length'};
+		}
+		$r->log->info("sz=$size");
 		my $orig_filename = $filename;
 
 		# Remove evil characters
@@ -423,7 +427,7 @@ EOF
 		# gnome-vfs and mac os x love to make zero-byte files,
 		# make them happy
 		# 
-		if ($r->headers_in->{'content-length'} == 0 || $filename =~ /^\.(_|DS_Store)/) {
+		if ($size == 0 || $filename =~ /^\.(_|DS_Store)/) {
 			$dbh->do('DELETE FROM fake_files WHERE expires_at <= now() OR (event=? AND vhost=? AND filename=?);',
 				undef, $event, $r->get_server_name, $filename)
 				or dberror($r, "Couldn't prune fake_files");
@@ -436,7 +440,7 @@ EOF
 			$r->log->info("Fake upload of $event/$filename");
 			return Apache2::Const::OK;
 		}
-
+			
 		# Get the new ID
 		my $ref = $dbh->selectrow_hashref("SELECT NEXTVAL('imageid_seq') AS id;");
 		my $newid = $ref->{'id'};
@@ -468,8 +472,9 @@ EOF
 					
 				$dbh->do('INSERT INTO images (id,vhost,event,uploadedby,takenby,filename) VALUES (?,?,?,?,?,?)',
 					undef, $newid, $r->get_server_name, $event, $user, $takenby, $filename);
-				$dbh->do('UPDATE events SET last_update=CURRENT_TIMESTAMP WHERE vhost=? AND event=?',
+				$dbh->do('UPDATE last_picture_cache SET last_update=CURRENT_TIMESTAMP WHERE vhost=? AND event=?',
 					undef, $r->get_server_name, $event);
+				Sesse::pr0n::Common::purge_cache($r, "/$event/");
 
 				# Now save the file to disk
 				$fname = Sesse::pr0n::Common::get_disk_location($r, $newid);
@@ -477,8 +482,7 @@ EOF
 					or die "$fname: $!";
 
 				my $buf;
-				my $content_length = $r->headers_in->{'content-length'};
-				if ($r->read($buf, $content_length)) {
+				if ($r->read($buf, $size)) {
 					print NEWFILE $buf or die "write($fname): $!";
 				}
 
@@ -493,7 +497,7 @@ EOF
 				if ($filename !~ /^\.(_|DS_Store)/) {
 					# FIXME: Ideally we'd want to ensure cache of -1x-1 here as well (for NEFs), but that would
 					# preclude mipmapping in its current form.
-					Sesse::pr0n::Common::ensure_cached($r, $filename, $newid, undef, undef, 1, 80, 64, 320, 256);
+					Sesse::pr0n::Common::ensure_cached($r, $filename, $newid, undef, undef, "nobox", 80, 64, 320, 256);
 				}
 				
 				# OK, we got this far, commit
@@ -564,7 +568,7 @@ EOF
 			my $ref = $q->fetchrow_hashref;
 
 			if ($ref->{'cnt'} == 0) {
-				my @errors = Sesse::pr0n::Common::add_new_event($dbh, $ne_id, $ne_date, $ne_desc, $r->get_server_name);
+				my @errors = Sesse::pr0n::Common::add_new_event($r, $dbh, $ne_id, $ne_date, $ne_desc);
 				if (scalar @errors > 0) {
 					die "Couldn't add new event $ne_id: " . join(', ', @errors);
 				}
@@ -606,7 +610,7 @@ EOF
 			eval {
 				$dbh->do('INSERT INTO images (id,vhost,event,uploadedby,takenby,filename) VALUES (?,?,?,?,?,?)',
 					undef, $newid, $r->get_server_name, $event, $user, $takenby, $filename);
-				$dbh->do('UPDATE events SET last_update=CURRENT_TIMESTAMP WHERE vhost=? AND event=?',
+				$dbh->do('UPDATE last_picture_cache SET last_update=CURRENT_TIMESTAMP WHERE vhost=? AND event=?',
 					undef, $r->get_server_name, $event);
 
 				# Now save the file to disk
@@ -708,7 +712,7 @@ EOF
 		$dbh->do('DELETE FROM images WHERE vhost=? AND event=? AND filename=?',
 			undef, $r->get_server_name, $event, $filename)
 			or dberror($r, "Couldn't remove file");
-		$dbh->do('UPDATE events SET last_update=CURRENT_TIMESTAMP WHERE vhost=? AND event=?',
+		$dbh->do('UPDATE last_picture_cache SET last_update=CURRENT_TIMESTAMP WHERE vhost=? AND event=?',
 			undef, $r->get_server_name, $event)
 			or dberror($r, "Couldn't invalidate cache");
 		$r->status(200);