===================================================================
RCS file: /cvs/openbsd/OpenBSDTorrents/lib/BT/MetaInfo/Cached.pm,v
retrieving revision 1.2
retrieving revision 1.5
diff -u -r1.2 -r1.5
--- openbsd/OpenBSDTorrents/lib/BT/MetaInfo/Cached.pm	2005/05/02 20:43:44	1.2
+++ openbsd/OpenBSDTorrents/lib/BT/MetaInfo/Cached.pm	2005/05/05 21:08:04	1.5
@@ -1,27 +1,101 @@
-# $Id: Cached.pm,v 1.2 2005/05/02 19:43:44 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 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 Data::Dumper;
+#use OpenBSDTorrents;
 
-$VERSION = do { my @r = (q$Id: Cached.pm,v 1.2 2005/05/02 19:43:44 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 $classname	= shift;
-	print Dumper $classname;
-	exit;
+	my $class = shift;
+        my $file  = shift;
+	my $cache_settings = shift;
 
-#	my $self	= $classname->SUPER::new(@_);
+	$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);
 
-sub info_hash { return(sha1(bencode($_[0]->info))); }
+	$self->SUPER::save($file, @_);
+
+        my %info_hash = %$self; # unbless
+	$self->cache->set->($basename, \%info_hash)
+}
+
+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;
+}
+
+#sub cached
+#{
+#	my $self = shift;
+#        my $which_info = shift;
+#	my $file = shift;
+#	my @args = @_;
+#
+#	if (@args) {
+#		return $self->$which_info(@args),
+#	}
+#
+#	return undef unless $which_info;
+#	return $self->$which_info unless $file;
+#
+#	my $info = undef;
+#
+#	if (-e $file) {
+#		#print "Reading meta file: $file\n";
+#		$info = LoadFile($file);
+#	}
+#
+#	unless ($info->{$which_info}) {
+#		my $cur_info = $self->$which_info;
+#
+#		$info->{$which_info} = $cur_info;
+#		DumpFile($file, $info);
+#	}
+#
+#	if (defined $info->{$which_info}) {
+#		return $info->{$which_info};
+#	} else {
+#		return $self->$which_info;
+#	}
+#}
 
 1