X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXDupe.pm;h=6595ef879c7cdd4446106e2a5183758d62fd2af7;hb=f44ebfb22849652844e5c4ff4e2e583cb444c2b9;hp=4cc2be6ff936fccb7fb6693b642daade97b7ca19;hpb=dbf7523a9b228dbdf1d03109afde351b8b194fab;p=spider.git diff --git a/perl/DXDupe.pm b/perl/DXDupe.pm index 4cc2be6f..6595ef87 100644 --- a/perl/DXDupe.pm +++ b/perl/DXDupe.pm @@ -27,7 +27,14 @@ $main::branch += $BRANCH; sub init { - $dbm = tie (%d, 'DB_File', $fn) or confess "can't open dupe file: $fn ($!)"; + $dbm = tie (%d, 'DB_File', $fn); + unless ($dbm) { + eval { untie %d }; + dbg("Dupefile $fn corrupted, removing..."); + unlink $fn; + $dbm = tie (%d, 'DB_File', $fn) or confess "can't open dupe file: $fn ($!)"; + confess "cannot open $fn $!" unless $dbm; + } } sub finish @@ -39,21 +46,21 @@ sub finish sub check { - my ($s, $t) = @_; + my $s = shift; return 1 if find($s); - add($s, $t); + add($s, shift); return 0; } sub find { - return 1 if exists $d{$_[0]}; + return $d{$_[0]}; } sub add { - my ($s, $t) = @_; - $t = $main::systime + $default unless $t; + my $s = shift; + my $t = shift || $main::systime + $default; $d{$s} = $t; } @@ -96,7 +103,7 @@ sub listdups my @out; for (sort { $d{$a} <=> $d{$b} } grep { m{$regex}i } keys %d) { my ($dum, $key) = unpack "a1a*", $_; - push @out, "$key = " . cldatetime($d{$_} - $dupage); + push @out, "$key = " . cldatetime($d{$_} - $dupage) . " expires " . cldatetime($d{$_}); } return @out; }