===================================================================
RCS file: /cvs/openbsd/OpenBSDTorrents/NewTorrents.pl,v
retrieving revision 1.9
retrieving revision 1.15
diff -u -r1.9 -r1.15
--- openbsd/OpenBSDTorrents/NewTorrents.pl	2006/05/15 19:47:04	1.9
+++ openbsd/OpenBSDTorrents/NewTorrents.pl	2010/03/03 18:23:46	1.15
@@ -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.14 2009/10/20 19:03:25 andrew Exp $
 use strict;
 use warnings;
 use diagnostics;
@@ -15,24 +15,30 @@
 
 %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";
+	# *** This requires --log-format="%t [%p] %o %f %l" on the rsync command
+	if (my ($year,  $mon,   $mday,     $time,
+                $pid,        $oper,    $file,  $size) = m#^
+		(\d{4})/(\d{2})/(\d{2}) \s (\d{2}:\d{2}:\d{2}) \s
+		\[(\d+)\] \s (\S+) \s  (.+) \s (\d+)
+		$#xms) {
+
+		$file =~ s/^.*$OBT->{BASENAME}\/?//;
+
+        	my ($dir, $file) = $file =~ m#^(.*)/([^/]+)#;
+		#print "$oper - ($last_dir) [$dir]/[$file]\n";
+
+		next unless $oper eq 'recv';
+		next unless $size;
+		next unless $dir;
+
 		if ($last_dir && $last_dir ne $dir) {
 			StartTorrent($last_dir);
 		}
 		$last_dir = $dir;
-	} else {
-		#print $_;
 	}
 }
 
@@ -44,6 +50,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) {
@@ -51,27 +60,37 @@
 		delete $Kids{$child};
 	}
 	$SIG{CHLD} = \&REAPER;  # still loathe sysV
+
+	StartTorrent('waiting');
 }
 
 sub StartTorrent
 {
 	my $dir = shift;
 	return undef unless $dir;
-
+	
 	my $should_fork = 1;
 
 	if ($dir eq 'skip') {
 		#$dir = '';
 		%Need_Update = ();
 		$should_fork = 0;
-	} else {
+	} 
+	elsif ($dir eq 'waiting') {
+		return if ! %Need_Update;
+
+		my $count = scalar keys %Need_Update;
+		print "Have $count waiting torrents\n";
+	}
+	else {
+		#print "Need to make torrent for '$dir'\n";
 		$dir = $OBT->{BASENAME} . "/$dir";
 		$Need_Update{$dir} = 1;
 	}
 
 	if (keys %Kids > 0) {
 		print "Not making torrents for $dir now, already running\n";
-		return undef;
+		return;
 	}
 
 	my @now_update = keys %Need_Update;
@@ -82,13 +101,11 @@
 
 		if ($pid) {
 			$Kids{$pid} = 1;
-			return undef;
+			return;
 		}
 
 	}
 
-	chdir $OBT->{DIR_HOME} or die "Can't chdir to $OBT->{DIR_HOME}: $!";
-
 	if (@now_update) {
 		print "Making torrents for ", join(" ", @now_update), "\n";
 	} else {
@@ -96,4 +113,5 @@
 		push @now_update, $dir;
 	}
 	exec($OBT->{DIR_HOME} . '/regen.sh', @now_update);
+	exit;
 }