===================================================================
RCS file: /cvs/openbsd/OpenBSDTorrents/lib/BT/MetaInfo/Cached.pm,v
retrieving revision 1.9
retrieving revision 1.14
diff -u -r1.9 -r1.14
--- openbsd/OpenBSDTorrents/lib/BT/MetaInfo/Cached.pm	2005/05/06 19:30:25	1.9
+++ openbsd/OpenBSDTorrents/lib/BT/MetaInfo/Cached.pm	2010/03/10 21:00:36	1.14
@@ -1,19 +1,24 @@
-# $Id: Cached.pm,v 1.9 2005/05/06 18:30:25 andrew Exp $
+# $RedRiver: Cached.pm,v 1.13 2009/12/16 20:11:13 andrew Exp $
 use strict;
 
 package BT::MetaInfo::Cached;
 
-require 5.6.0;
+require 5.0060;
 use vars qw( $VERSION @ISA );
 
 use Cache::FileCache;
 use File::Basename;
+use Digest::MD5;
 
 use BT::MetaInfo;
 use base 'BT::MetaInfo';
 
-$VERSION = do { my @r = (q$Id: Cached.pm,v 1.9 2005/05/06 18:30:25 andrew Exp $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
+use Convert::Bencode_XS;
+*{bencode} = \&Convert::Bencode_XS::bencode;
+*{bdecode} = \&Convert::Bencode_XS::bdecode;
 
+$VERSION = do { my @r = (q$Id: Cached.pm,v 1.14 2010/03/10 21:00:36 andrew Exp $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
+
 sub new
 {
 	my $class = shift;
@@ -25,7 +30,9 @@
 		$file = undef;
 	}
 
-	$cache_settings->{namespace} ||= 'BT::MetaInfo::Cached';
+	$cache_settings->{namespace}           ||= 'BT::MetaInfo::Cached';
+	$cache_settings->{default_expires_in}  ||=  7 * 24 * 60 * 60;
+	$cache_settings->{auto_purge_interval} ||=  1 *  1 * 10 * 60;
 
 	my $cache = new Cache::FileCache( $cache_settings );
 
@@ -46,10 +53,24 @@
 	
 	my $info = $cache->get( $basename );
 
+	my $md5;
+	if (defined $info && $info->{'md5'}) {
+		my $old_md5 = delete $info->{'md5'};
+		my $cur_md5 = _MD5_file($file);
+		if ($old_md5 ne $cur_md5) {
+			$cache->remove( $basename );
+			$info = undef;
+		}
+		$md5 = $cur_md5;
+	}
+
 	unless (defined $info) {
 		$info = BT::MetaInfo::_load($file);
+		$info->{'md5'} = $md5;
 		$cache->set( $basename, $info );
+		delete $info->{'md5'};
 	}
+
 	return $info;
 }
 
@@ -60,12 +81,29 @@
 	my $file = shift;
 	my $basename = basename($file);
 
-	my $cache = delete $self->{cache};
+	my $cache   = delete $self->{'cache'};
 
 	if ( $self->SUPER::save($file, @_) ) {
 		my %info_hash = %$self; # unbless
+
+		$info_hash{'md5'} = _MD5_file($file);
 		$cache->set($basename, \%info_hash)
 	}
 
-	$self->{cache} = $cache;
+	$self->{'cache'} = $cache;
+
+	return 1;
+}
+
+sub _MD5_file
+{
+	my $file = shift;
+
+	my $ctx = Digest::MD5->new;
+	open my $fh, $file or die "Couldn't open FILE '$file': $!";
+	binmode $fh;
+	$ctx->addfile($fh);
+	close $fh;
+
+	return $ctx->hexdigest;
 }