=================================================================== RCS file: /cvs/openbsd/OpenBSDTorrents/lib/BT/MetaInfo/Cached.pm,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- openbsd/OpenBSDTorrents/lib/BT/MetaInfo/Cached.pm 2005/05/20 19:37:28 1.10 +++ openbsd/OpenBSDTorrents/lib/BT/MetaInfo/Cached.pm 2005/05/21 01:05:13 1.11 @@ -1,4 +1,4 @@ -# $Id: Cached.pm,v 1.10 2005/05/20 18:37:28 andrew Exp $ +# $Id: Cached.pm,v 1.11 2005/05/21 00:05:13 andrew Exp $ use strict; package BT::MetaInfo::Cached; @@ -8,11 +8,12 @@ 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.10 2005/05/20 18:37:28 andrew Exp $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; +$VERSION = do { my @r = (q$Id: Cached.pm,v 1.11 2005/05/21 00:05:13 andrew Exp $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; sub new { @@ -48,10 +49,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; } @@ -62,12 +77,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; }