===================================================================
RCS file: /cvs/openbsd/OpenBSDTorrents/CurrentTorrents.pl,v
retrieving revision 1.16
retrieving revision 1.19
diff -u -r1.16 -r1.19
--- openbsd/OpenBSDTorrents/CurrentTorrents.pl	2005/05/05 02:09:43	1.16
+++ openbsd/OpenBSDTorrents/CurrentTorrents.pl	2005/06/01 18:52:14	1.19
@@ -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.19 2005/06/01 17:52:14 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,16 @@
 			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, 
+				{ 
+					cache_root => 
+					$OBT->{DIR_HOME} . '/FileCache' 
+				}
+			); 
+		};
 
 		if ($@) {
 			warn "Error reading torrent $torrent\n";
@@ -123,13 +114,11 @@
 			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;
 
 
@@ -173,30 +162,30 @@
 }
 
 
-#print Dump \%keep;
-foreach my $name (keys %keep) {
-	foreach my $hash (keys %{ $keep{$name} }) {
-		my $file = $keep{$name}{$hash}{file};
-		my $dir  = $keep{$name}{$hash}{dir };
-		if ($dir eq $OBT->{DIR_NEW_TORRENT}) {
-			print "Moving $file to current torrents\n";
-			rename("$dir/$file", $OBT->{DIR_TORRENT} . "/" . $file)
-				or die "Couldn't rename '$file': $!";
-
-			my $name = $keep{$name}{$hash}{name};
-			my $epoch = $keep{$name}{$hash}{epoch};
-
-			if (exists $files{txt}{$name}{$epoch}) { 
-				my $m_file = $files{txt}{$name}{$epoch}{file};
-				my $m_dir  = $files{txt}{$name}{$epoch}{dir };
-				rename(
-					"$m_dir/$m_file", 
-					$OBT->{DIR_TORRENT} . "/" . $m_file
-				) or die "Couldn't rename '$m_file': $!";
-			}
-		}
-	}
-}
+##print Dump \%keep;
+#foreach my $name (keys %keep) {
+#	foreach my $hash (keys %{ $keep{$name} }) {
+#		my $file = $keep{$name}{$hash}{file};
+#		my $dir  = $keep{$name}{$hash}{dir };
+#		if ($dir eq $OBT->{DIR_NEW_TORRENT}) {
+#			print "Moving $file to current torrents\n";
+#			rename("$dir/$file", $OBT->{DIR_TORRENT} . "/" . $file)
+#				or die "Couldn't rename '$file': $!";
+#
+#			my $name = $keep{$name}{$hash}{name};
+#			my $epoch = $keep{$name}{$hash}{epoch};
+#
+#			if (exists $files{txt}{$name}{$epoch}) { 
+#				my $m_file = $files{txt}{$name}{$epoch}{file};
+#				my $m_dir  = $files{txt}{$name}{$epoch}{dir };
+#				rename(
+#					"$m_dir/$m_file", 
+#					$OBT->{DIR_TORRENT} . "/" . $m_file
+#				) or die "Couldn't rename '$m_file': $!";
+#			}
+#		}
+#	}
+#}
 
 sub Process_Dir
 {