===================================================================
RCS file: /cvs/openbsd/OpenBSDTorrents/NewTorrents.pl,v
retrieving revision 1.10
retrieving revision 1.13
diff -u -r1.10 -r1.13
--- openbsd/OpenBSDTorrents/NewTorrents.pl	2006/07/24 19:03:53	1.10
+++ openbsd/OpenBSDTorrents/NewTorrents.pl	2007/11/02 03:35:07	1.13
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -T
-#$RedRiver: NewTorrents.pl,v 1.9 2006/05/15 18:47:04 andrew Exp $
+#$RedRiver: NewTorrents.pl,v 1.12 2007/10/01 20:17:23 andrew Exp $
 use strict;
 use warnings;
 use diagnostics;
@@ -15,21 +15,20 @@
 
 %ENV = ();
 
-use YAML;
-
-
 my $last_dir = '';
 while (<>) {
+	#print;
 	chomp;
-	print $_, "\n";
 	if (my ($message, $file) = m#(.*)\s+\`([^']+)'#) {
+		next if $message eq 'Mirroring directory';
 		next if $message eq 'Making directory';
 
 		my $dir = '';
 		if ($file =~ m#^(.*)/([^/]+)#) {
 			($dir, $file) = ($1, $2);
 		}
-		#print "$message - $dir - $file\n";
+		#print "$message - ($last_dir) $dir - $file\n";
+		print "$message - $dir - $file\n";
 		if ($last_dir && $last_dir ne $dir) {
 			StartTorrent($last_dir);
 		}
@@ -45,6 +44,9 @@
 sleep(1) while (keys %Kids > 0);
 StartTorrent('skip');
 
+# and wait for it to finish
+sleep(1) while (keys %Kids > 0);
+
 sub REAPER {
 	my $child;
         while (($child = waitpid(-1,WNOHANG)) > 0) {
@@ -58,7 +60,9 @@
 {
 	my $dir = shift;
 	return undef unless $dir;
+	$dir =~ s/^.*$OBT->{BASENAME}\///;
 
+	print "Starting '$dir'\n";
 	my $should_fork = 1;
 
 	if ($dir eq 'skip') {