===================================================================
RCS file: /cvs/openbsd/OpenBSDTorrents/lib/BT/MetaInfo/Cached.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openbsd/OpenBSDTorrents/lib/BT/MetaInfo/Cached.pm	2005/05/02 22:46:48	1.3
+++ openbsd/OpenBSDTorrents/lib/BT/MetaInfo/Cached.pm	2005/05/05 20:34:31	1.4
@@ -1,4 +1,4 @@
-# $Id: Cached.pm,v 1.3 2005/05/02 21:46:48 andrew Exp $
+# $Id: Cached.pm,v 1.4 2005/05/05 19:34:31 andrew Exp $
 use strict;
 
 package BT::OBTMetaInfo;
@@ -7,64 +7,75 @@
 use vars qw( $VERSION @ISA );
 
 use Digest::SHA1 qw(sha1);
-use Fcntl ':flock'; # import LOCK_* constants
+use YAML qw/ DumpFile LoadFile /;
 
 use BT::MetaInfo;
 use base 'BT::MetaInfo';
 
 use OpenBSDTorrents;
 
-use Data::Dumper;
+$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.3 2005/05/02 21:46:48 andrew Exp $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
-
 sub new
 {
-	my $classname	= shift;
-	return $classname->SUPER::new(@_);
+	my $class = shift;
+        my $file  = shift;
+
+        my $obj = (defined($file)) ? _load($file, @_) : {};
+        return(bless($obj, $class));
 }	
 
+sub _load {
+	my $file = shift;
+	my $meta_file = shift;
+	my $regen = shift;
+	
+	my $info;
+	if ($meta_file && ! $regen && -e $meta_file) {
+		$info = LoadFile($meta_file);
+	}
 
-sub info_hash_cached 
-{ 
-	my $self = shift;
-	my $torrent = shift;
-
-	return $self->SUPER::info_hash unless $torrent;
-
-	my $meta_file = $torrent;
-	$meta_file =~ s/\.torrent$/.$OBT->{META_EXT}/;
-
-	my $hash = undef;
-
-	if (-e $meta_file) {
-		#print "Reading meta file: $meta_file\n";
-		open my $meta, $meta_file or die "Couldn't open $meta_file: $!";
-		flock($meta, LOCK_SH);
-		binmode $meta;
-
-		$hash = do { local $/; <$meta> };
-
-		flock($meta, LOCK_UN);
-		close $meta;
-	} else {
-		$hash = $self->SUPER::info_hash;
-		#print "Writing meta file: $meta_file\n";
-		open my $meta, '>', $meta_file 
-			or die "Couldn't open $meta_file: $!";
-		flock($meta, LOCK_EX);
-		binmode $meta;
-
-		print $meta $hash;
-
-		flock($meta, LOCK_UN);
-		close $meta;
-
+	unless ($info) {
+		$info = BT::MetaInfo::_load($file);
+		DumpFile($meta_file, $info) if $meta_file;
 	}
-	#my $text_hash = unpack("H*", $hash);
-	#print "INFO_HASH: $text_hash\n";
-	
-	return $hash;
+
+	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