X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=perl%2Fupdate-image-cache.pl;h=f50d3a0b046b5539d820bbe8365a52dbc398845e;hb=c8c8d4ba8a2e5a3c8b6a6b787a354f72c29964e2;hp=3857ae22db4918d3124a1d9e64c5e55a7d4b23fe;hpb=29f1fc41da78a3cb8177e28d0579453c8d6ecc4e;p=pr0n

diff --git a/perl/update-image-cache.pl b/perl/update-image-cache.pl
index 3857ae2..f50d3a0 100755
--- a/perl/update-image-cache.pl
+++ b/perl/update-image-cache.pl
@@ -51,6 +51,8 @@ sub warn {
 sub error {
 	print STDERR $_[1], "\n";
 }
+sub logger {
+}
 package main;
 use Sesse::pr0n::Common;
 
@@ -101,7 +103,6 @@ while (my $ref = $q->fetchrow_hashref) {
 	if (!$regen_mipmaps) {
 		@files = grep { !/mipmap/ } @files;
 	}
-	my @boxres = ();
 	my @noboxres = ();
 	my $any_old = 0;
 	for my $c (@files) {
@@ -111,18 +112,13 @@ while (my $ref = $q->fetchrow_hashref) {
 		}
 		if ($c =~ /$id-(\d+)-(\d+)-nobox\.jpg/ || $c =~ /$id-(-1)-(-1)-nobox\.jpg/) {
 			push @noboxres, [$1, $2];
-		} elsif ($c =~ /$id-(\d+)-(\d+)-box\.png/ || $c =~ /$id-(-1)-(-1)-box\.png/) {
-			push @boxres, [$1, $2];
 		}
 	}
 	next unless $any_old;
-	unlink (@files);
+	unlink (@files) or die "Could not delete: $!";
 	if (scalar @noboxres > 0) {
 		Sesse::pr0n::Common::ensure_cached($r, $ref->{'filename'}, $id, $ref->{'width'}, $ref->{'height'}, sort_res(@noboxres));
 	}
-	if (scalar @boxres > 0) {
-		Sesse::pr0n::Common::ensure_infobox_cached($r, $ref->{'filename'}, $id, $ref->{'width'}, $ref->{'height'}, 1, sort_res(@boxres));
-	}
 	
 	my @newfiles = glob("../cache/$dir/$id-*.jpg");
 	my %a = map { $_ => 1 } @files;