===================================================================
RCS file: /cvs/openbsd/OpenBSDTorrents/CurrentTorrents.pl,v
retrieving revision 1.14
retrieving revision 1.19
diff -u -r1.14 -r1.19
--- openbsd/OpenBSDTorrents/CurrentTorrents.pl	2005/05/04 01:11:59	1.14
+++ openbsd/OpenBSDTorrents/CurrentTorrents.pl	2005/06/01 18:52:14	1.19
@@ -1,20 +1,21 @@
 #!/usr/bin/perl -T
-#$Id: CurrentTorrents.pl,v 1.14 2005/05/04 00:11:59 andrew Exp $
+#$Id: CurrentTorrents.pl,v 1.19 2005/06/01 17:52:14 andrew Exp $
 use strict;
 use warnings;
 use diagnostics;
 
 use Time::Local;
+use Fcntl ':flock';
 
 use lib 'lib';
 use OpenBSDTorrents;
-use BT::OBTMetaInfo;
+use BT::MetaInfo::Cached;
 
 %ENV = ();
 
 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,9 +88,16 @@
 			next;
 		}
 
-
 		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";
@@ -99,12 +114,13 @@
 			next;
 		}
 
-		my $hash = $t->info_hash_cached($torrent);
+		my $hash = $t->info_hash;
 		$hash = unpack("H*", $hash);
 
+		undef $t;
+
 		$files{torrent}{$name}{$epoch}{info_hash} = $hash;
 
-		undef $t;
 
 		if (exists $keep{$name}) {
 			if (exists $keep{$name}{$hash}) {
@@ -146,27 +162,48 @@
 }
 
 
-#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': $!";
+##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': $!";
+#			}
+#		}
+#	}
+#}
 
-			my $name = $keep{$name}{$hash}{name};
-			my $epoch = $keep{$name}{$hash}{epoch};
+sub Process_Dir
+{
+        my $basedir = shift;
 
-			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': $!";
-			}
-		}
-	}
+        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")
+        }
 }
+