===================================================================
RCS file: /cvs/openbsd/OpenBSDTorrents/CurrentTorrents.pl,v
retrieving revision 1.13
retrieving revision 1.15
diff -u -r1.13 -r1.15
--- openbsd/OpenBSDTorrents/CurrentTorrents.pl	2005/05/02 22:43:53	1.13
+++ openbsd/OpenBSDTorrents/CurrentTorrents.pl	2005/05/04 01:48:35	1.15
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -T
-#$Id: CurrentTorrents.pl,v 1.13 2005/05/02 21:43:53 andrew Exp $
+#$Id: CurrentTorrents.pl,v 1.15 2005/05/04 00:48:35 andrew Exp $
 use strict;
 use warnings;
 use diagnostics;
@@ -14,7 +14,7 @@
 
 use YAML;
 
-justme();
+#justme();
 
 my $Name_Filter = shift || '';
 if ($Name_Filter =~ /^(\w*)$/) {
@@ -23,7 +23,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 +62,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";
@@ -71,6 +78,16 @@
 		#print "\t$epoch\n";
 		my $torrent = $files{torrent}{$name}{$epoch}{path};
 
+		if (
+			keys %{ $files{torrent}{$name} } == 1 &&
+			$files{torrent}{$name}{$epoch}{dir} 
+				eq $OBT->{DIR_TORRENT}
+		) {
+			#print "Skipping torrent for $name there is only one.\n";
+			next;
+		}
+
+
 		my $t;
 		eval { $t = BT::OBTMetaInfo->new( $torrent ); };
 
@@ -89,15 +106,6 @@
 			next;
 		}
 
-		if (
-			keys %{ $files{torrent}{$name} } == 1 &&
-			$files{torrent}{$name}{$epoch}{dir} 
-				eq $OBT->{DIR_TORRENT}
-		) {
-			#print "Skipping torrent for $name there is only one.\n";
-			next;
-		}
-
 		my $hash = $t->info_hash_cached($torrent);
 		$hash = unpack("H*", $hash);
 
@@ -169,3 +177,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")
+        }
+}
+