===================================================================
RCS file: /cvs/openbsd/OpenBSDTorrents/lib/BT/MetaInfo/Cached.pm,v
retrieving revision 1.6
retrieving revision 1.8
diff -u -r1.6 -r1.8
--- openbsd/OpenBSDTorrents/lib/BT/MetaInfo/Cached.pm	2005/05/05 21:10:50	1.6
+++ openbsd/OpenBSDTorrents/lib/BT/MetaInfo/Cached.pm	2005/05/05 22:44:03	1.8
@@ -1,4 +1,4 @@
-# $Id: Cached.pm,v 1.6 2005/05/05 20:10:50 andrew Exp $
+# $Id: Cached.pm,v 1.8 2005/05/05 21:44:03 andrew Exp $
 use strict;
 
 package BT::MetaInfo::Cached;
@@ -12,7 +12,7 @@
 use BT::MetaInfo;
 use base 'BT::MetaInfo';
 
-$VERSION = do { my @r = (q$Id: Cached.pm,v 1.6 2005/05/05 20:10:50 andrew Exp $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
+$VERSION = do { my @r = (q$Id: Cached.pm,v 1.8 2005/05/05 21:44:03 andrew Exp $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
 
 sub new
 {
@@ -24,26 +24,13 @@
 
 	my $cache = new Cache::FileCache( $cache_settings );
 
-        my $obj = (defined($file)) ? _load($file, $cache) : {};
+	my $obj = (defined($file)) ? _load($file, $cache) : {};
 
+	bless($obj, $class);
+
 	$obj->{cache} = $cache;
 
-        return(bless($obj, $class));
-}	
-
-sub _load {
-	my $file = shift;
-	my $cache = shift;
-
-	my $basename = basename($file);
-	
-	my $info = $cache->get( $basename );
-
-	unless (defined $info) {
-		$info = BT::MetaInfo::_load($file);
-		$cache->set( $basename, $info );
-	}
-	return $info;
+        return $obj;
 }
 
 sub _load {
@@ -64,11 +51,16 @@
 
 sub save
 {
-	my ($self, $file) = @_;
+	my $self = shift;
+	my $file = shift;
 	my $basename = basename($file);
 
-	$self->SUPER::save($file, @_);
+	my $cache = delete $self->{cache};
 
-        my %info_hash = %$self; # unbless
-	$self->cache->set->($basename, \%info_hash)
+	if ( $self->SUPER::save($file, @_) ) {
+		my %info_hash = %$self; # unbless
+		$cache->set($basename, \%info_hash)
+	}
+
+	$self->{cache} = $cache;
 }