X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FRotate.pm;h=80c25521600c3c4dead844db64bb248a2ca94ac7;hp=0733cecb21f5eed78cbbf36af3f6fca41dfd4398;hb=c274bd4e4b6277cabf74da908d1e356b5e33b36b;hpb=ebfa7a13cd167409442120036a159a745acc177b

diff --git a/perl/Sesse/pr0n/Rotate.pm b/perl/Sesse/pr0n/Rotate.pm
index 0733cec..80c2552 100644
--- a/perl/Sesse/pr0n/Rotate.pm
+++ b/perl/Sesse/pr0n/Rotate.pm
@@ -14,41 +14,54 @@ sub handler {
 		return Apache2::Const::OK;
 	}
 
+	# FIXME: People can rotate and delete across vhosts using this interface.
+	# We should add some sanity checks.
+
+	my @to_purge = ();
+
 	Sesse::pr0n::Common::header($r, "Rotation/deletion results");
 
 	{
 		# Enable transactions and error raising temporarily
-		local $dbh->{AutoCommit} = 0;
 		local $dbh->{RaiseError} = 1;
 
 		my @params = $apr->param();
 		my $key;
 		for $key (@params) {
+			local $dbh->{AutoCommit} = 0;
+
 			# Rotation
 			if ($key =~ /^rot-(\d+)-(90|180|270)$/ && $apr->param($key) eq 'on') {
 				my ($id, $rotval) = ($1,$2);
 				my $fname = Sesse::pr0n::Common::get_disk_location($r, $id);
+				push @to_purge, Sesse::pr0n::Common::get_all_cache_urls($r, $dbh, $id);
 				(my $tmpfname = $fname) =~ s/\.jpg$/-tmp.jpg/;
 
-				system("/usr/bin/jpegtran -rotate $rotval -copy all < '$fname' > '$tmpfname' && mv '$tmpfname' '$fname'") == 0
-					or error($r, "Rotation of $id [/usr/bin/jpegtran -rotate $rotval -copy all < '$fname' > '$tmpfname' && mv '$tmpfname' '$fname'] failed: $!.");
+				system("/usr/bin/jpegtran -rotate $rotval -copy all < '$fname' > '$tmpfname' && /bin/mv '$tmpfname' '$fname'") == 0
+					or error($r, "Rotation of $id [/usr/bin/jpegtran -rotate $rotval -copy all < '$fname' > '$tmpfname' && /bin/mv '$tmpfname' '$fname'] failed: $!.");
 				$r->print("    <p>Rotated image ID `$id' by $rotval degrees.</p>\n");
 
 				if ($rotval == 90 || $rotval == 270) {
 					my $q = $dbh->do('UPDATE images SET height=width,width=height WHERE id=?', undef, $id)
-						or dberror($r, "Size clear of $id failed: $!");
+						or dberror($r, "Size clear of $id failed");
+					$dbh->do('UPDATE last_picture_cache SET last_update=CURRENT_TIMESTAMP WHERE (vhost,event)=( SELECT vhost,event FROM images WHERE id=? )',
+						undef, $id)
+						or dberror($r, "Cache invalidation at $id failed");
 				}
 			} elsif ($key =~ /^del-(\d+)$/ && $apr->param($key) eq 'on') {
 				my $id = $1;
+				push @to_purge, Sesse::pr0n::Common::get_all_cache_urls($r, $dbh, $id);
 				{
 
 					eval {
-						$dbh->do('UPDATE events SET last_update=CURRENT_TIMESTAMP WHERE event=( SELECT event FROM images WHERE id=? )',
+						$dbh->do('UPDATE last_picture_cache SET last_update=CURRENT_TIMESTAMP WHERE (vhost,event)=( SELECT vhost,event FROM images WHERE id=? )',
 							undef, $id);
 						$dbh->do('INSERT INTO deleted_images SELECT * FROM images WHERE id=?',
-								undef, $id);
+							undef, $id);
+						$dbh->do('DELETE FROM exif_info WHERE image=?',
+							undef, $id);
 						$dbh->do('DELETE FROM images WHERE id=?',
-								undef, $id);
+							undef, $id);
 					};
 					if ($@) {
 # Some error occurred, rollback and bomb out
@@ -60,6 +73,14 @@ sub handler {
 			}
 		}
 	}
+	
+	my $event = $apr->param('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, "Cache invalidation failed");
+
+	push @to_purge, "/$event/";
+	push @to_purge, "/+all/";
+	Sesse::pr0n::Common::purge_cache($r, @to_purge);
 
 	Sesse::pr0n::Common::footer($r);