===================================================================
RCS file: /cvs/openbsd/OpenBSDTorrents/CurrentTorrents.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- openbsd/OpenBSDTorrents/CurrentTorrents.pl	2005/05/05 02:09:43	1.16
+++ openbsd/OpenBSDTorrents/CurrentTorrents.pl	2005/05/05 22:52:45	1.17
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -T
-#$Id: CurrentTorrents.pl,v 1.16 2005/05/05 01:09:43 andrew Exp $
+#$Id: CurrentTorrents.pl,v 1.17 2005/05/05 21:52:45 andrew Exp $
 use strict;
 use warnings;
 use diagnostics;
@@ -9,7 +9,7 @@
 
 use lib 'lib';
 use OpenBSDTorrents;
-use BT::OBTMetaInfo;
+use BT::MetaInfo::Cached;
 
 %ENV = ();
 
@@ -88,25 +88,8 @@
 			next;
 		}
 
-		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 {
-
 		my $t;
-		eval { $t = BT::OBTMetaInfo->new( $torrent ); };
+		eval { $t = BT::MetaInfo::Cached->new( $torrent ); };
 
 		if ($@) {
 			warn "Error reading torrent $torrent\n";
@@ -123,12 +106,10 @@
 			next;
 		}
 
-		$hash = $t->info_hash_cached($torrent);
+		my $hash = $t->info_hash;
 		$hash = unpack("H*", $hash);
 
 		undef $t;
-
-		}
 
 		$files{torrent}{$name}{$epoch}{info_hash} = $hash;