===================================================================
RCS file: /cvs/openbsd/OpenBSDTorrents/lib/BT/MetaInfo/Cached.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openbsd/OpenBSDTorrents/lib/BT/MetaInfo/Cached.pm	2005/05/05 20:34:31	1.4
+++ openbsd/OpenBSDTorrents/lib/BT/MetaInfo/Cached.pm	2005/05/05 21:08:04	1.5
@@ -1,45 +1,65 @@
-# $Id: Cached.pm,v 1.4 2005/05/05 19:34:31 andrew Exp $
+# $Id: Cached.pm,v 1.5 2005/05/05 20:08:04 andrew Exp $
 use strict;
 
-package BT::OBTMetaInfo;
+package BT::MetaInfo::Cached;
 
 require 5.6.0;
 use vars qw( $VERSION @ISA );
 
-use Digest::SHA1 qw(sha1);
-use YAML qw/ DumpFile LoadFile /;
+use YAML;
 
+#use Digest::SHA1 qw(sha1);
+#use YAML qw/ DumpFile LoadFile /;
+
+use Cache::FileCache;
+use File::Basename;
+
 use BT::MetaInfo;
 use base 'BT::MetaInfo';
 
-use OpenBSDTorrents;
+#use OpenBSDTorrents;
 
-$VERSION = do { my @r = (q$Id: Cached.pm,v 1.4 2005/05/05 19:34:31 andrew Exp $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
+$VERSION = do { my @r = (q$Id: Cached.pm,v 1.5 2005/05/05 20:08:04 andrew Exp $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
 
 sub new
 {
 	my $class = shift;
         my $file  = shift;
+	my $cache_settings = shift;
 
-        my $obj = (defined($file)) ? _load($file, @_) : {};
+	$cache_settings->{namespace} ||= 'BT::MetaInfo::Cached';
+
+	my $cache = new Cache::FileCache( $cache_settings );
+
+        my $obj = (defined($file)) ? _load($file, $cache) : {};
+
+	$obj->{cache} = $cache;
+
         return(bless($obj, $class));
 }	
 
+sub save {
+	my ($self, $file) = @_;
+	my $basename = basename($file);
+
+	$self->SUPER::save($file, @_);
+
+        my %info_hash = %$self; # unbless
+	$self->cache->set->($basename, \%info_hash)
+}
+
 sub _load {
 	my $file = shift;
-	my $meta_file = shift;
-	my $regen = shift;
+	my $cache = shift;
+
+	my $basename = basename($file);
 	
-	my $info;
-	if ($meta_file && ! $regen && -e $meta_file) {
-		$info = LoadFile($meta_file);
-	}
+	my $info = $cache->get( $basename );
 
-	unless ($info) {
+	unless (defined $info) {
 		$info = BT::MetaInfo::_load($file);
-		DumpFile($meta_file, $info) if $meta_file;
+		$cache->set( $basename, $info );
 	}
-
 	return $info;
 }