===================================================================
RCS file: /cvs/openbsd/OpenBSDTorrents/CurrentTorrents.pl,v
retrieving revision 1.14
retrieving revision 1.16
diff -u -r1.14 -r1.16
--- openbsd/OpenBSDTorrents/CurrentTorrents.pl	2005/05/04 01:11:59	1.14
+++ openbsd/OpenBSDTorrents/CurrentTorrents.pl	2005/05/05 02:09:43	1.16
@@ -1,10 +1,11 @@
 #!/usr/bin/perl -T
-#$Id: CurrentTorrents.pl,v 1.14 2005/05/04 00:11:59 andrew Exp $
+#$Id: CurrentTorrents.pl,v 1.16 2005/05/05 01:09:43 andrew Exp $
 use strict;
 use warnings;
 use diagnostics;
 
 use Time::Local;
+use Fcntl ':flock';
 
 use lib 'lib';
 use OpenBSDTorrents;
@@ -14,7 +15,7 @@
 
 use YAML;
 
-justme();
+#justme();
 
 my $Name_Filter = shift || '';
 if ($Name_Filter =~ /^(\w*)$/) {
@@ -23,7 +24,12 @@
 	die "Invalid filter: $Name_Filter";
 }
 
+my %Possible_Torrents;
+Process_Dir($OBT->{DIR_FTP});
+
 my %files;
+my %keep;
+my @delete;
 foreach my $DIR ($OBT->{DIR_NEW_TORRENT}, $OBT->{DIR_TORRENT}) {
 	opendir DIR, $DIR 
 		or die "Couldn't opendir $DIR: $!";
@@ -57,12 +63,14 @@
 			epoch     => $epoch,
 		};
 
+		unless (exists $Possible_Torrents{$name}) {
+			print "Would remove $_\n";
+			push @delete, $files{$ext}{$name}{$epoch};
+		}
 	}
 	closedir DIR;
 }
 
-my %keep;
-my @delete;
 foreach my $name (keys %{ $files{torrent} }) {
 	next unless $name =~ /^$Name_Filter/;
 	print "Checking $name\n";
@@ -80,7 +88,23 @@
 			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 ); };
 
@@ -99,12 +123,15 @@
 			next;
 		}
 
-		my $hash = $t->info_hash_cached($torrent);
+		$hash = $t->info_hash_cached($torrent);
 		$hash = unpack("H*", $hash);
 
+		undef $t;
+
+		}
+
 		$files{torrent}{$name}{$epoch}{info_hash} = $hash;
 
-		undef $t;
 
 		if (exists $keep{$name}) {
 			if (exists $keep{$name}{$hash}) {
@@ -170,3 +197,24 @@
 		}
 	}
 }
+
+sub Process_Dir
+{
+        my $basedir = shift;
+
+        my ($dirs, $files) = Get_Files_and_Dirs($basedir);
+        if (@$files) {
+		my $dir = $basedir;
+		$dir =~ s/^$OBT->{DIR_FTP}\///;
+                my $torrent = Name_Torrent($dir);
+		$torrent =~ s/-.*$//;
+		$Possible_Torrents{$torrent} = 1;
+        }
+
+        foreach my $subdir (@$dirs) {
+                next if $subdir eq '.';
+                next if $subdir eq '..';
+                Process_Dir("$basedir/$subdir")
+        }
+}
+