===================================================================
RCS file: /cvs/openbsd/OpenBSDTorrents/NewTorrents.pl,v
retrieving revision 1.9
retrieving revision 1.13
diff -u -r1.9 -r1.13
--- openbsd/OpenBSDTorrents/NewTorrents.pl	2006/05/15 19:47:04	1.9
+++ 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.8 2005/05/05 01:07:16 andrew Exp $
+#$RedRiver: NewTorrents.pl,v 1.12 2007/10/01 20:17:23 andrew Exp $
 use strict;
 use warnings;
 use diagnostics;
@@ -15,24 +15,24 @@
 
 %ENV = ();
 
-use YAML;
-
-# *** This requires --log-format="%t [%p] %o %f %l" on the rsync command
-
 my $last_dir = '';
 while (<>) {
+	#print;
 	chomp;
-	if (my ($year,  $mon,  $mday,   $time,               $pid,   $oper, $file, $size) = 
-	    m#^(\d{4})/(\d{2})/(\d{2}) (\d{2}:\d{2}:\d{2}) \[(\d+)\] (\S+) (.+) (\d+)$# ) {
-		#print "($year, $mon, $mday, $time, $pid, $oper, $file, $size)\n";
-		my ($dir, $file) = $file =~ m#^(.*)/([^/]+)#;
-		#print "$dir - $file\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 - ($last_dir) $dir - $file\n";
+		print "$message - $dir - $file\n";
 		if ($last_dir && $last_dir ne $dir) {
 			StartTorrent($last_dir);
 		}
 		$last_dir = $dir;
-	} else {
-		#print $_;
 	}
 }
 
@@ -44,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) {
@@ -57,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') {
@@ -86,8 +91,6 @@
 		}
 
 	}
-
-	chdir $OBT->{DIR_HOME} or die "Can't chdir to $OBT->{DIR_HOME}: $!";
 
 	if (@now_update) {
 		print "Making torrents for ", join(" ", @now_update), "\n";