--- trunk/bin/BackupPC_updatedb	2005/07/29 17:31:14	27
+++ trunk/bin/BackupPC_updatedb	2005/08/19 15:38:56	40
@@ -7,10 +7,27 @@
 use BackupPC::View;
 use Data::Dumper;
 use Getopt::Std;
+use Time::HiRes qw/time/;
+use File::Pid;
+use POSIX qw/strftime/;
 use constant BPC_FTYPE_DIR => 5;
 
+my $debug = 0;
 $|=1;
 
+my $pidfile = new File::Pid;
+
+if (my $pid = $pidfile->running ) {
+	die "$0 already running: $pid\n";
+} elsif ($pidfile->pid ne $$) {
+	$pidfile->remove;
+	$pidfile = new File::Pid;
+}
+$pidfile->write;
+print STDERR "$0 using pid ",$pidfile->pid," file ",$pidfile->file,"\n";
+
+my $t_fmt = '%Y-%m-%d %H:%M:%S';
+
 my $hosts;
 my $bpc = BackupPC::Lib->new || die;
 my %Conf = $bpc->Conf();
@@ -23,7 +40,7 @@
 
 my %opt;
 
-if ( !getopts("cdm:", \%opt ) ) {
+if ( !getopts("cdm:v", \%opt ) ) {
 	print STDERR <<EOF;
 usage: $0 [-c|-d] [-m num]
 
@@ -122,6 +139,11 @@
 	print " done...\n";
 }
 
+if ($opt{v}) {
+	print "Debug level at $opt{v}\n";
+	$debug = $opt{v};
+}
+
 #################################INSERT VALUES#############################
 
 # get hosts
@@ -180,18 +202,38 @@
 	my $inc_nr = 0;
 
 	foreach my $backup (@backups) {
+
 		$inc_nr++;
 		last if ($opt{m} && $inc_nr > $opt{m});
 
 		my $backupNum = $backup->{'num'};
 		my @backupShares = ();
 
-		print $hosts->{$host_key}->{'host'},"\t#$backupNum\n";
+		print $hosts->{$host_key}->{'host'},
+			"\t#$backupNum\t",
+			$backup->{nFilesNew} || '?', "/", $backup->{nFiles} || '?',
+			" files\n";
 
 		$sth->{backups_broj}->execute($hostID, $backupNum);
 		my ($broj) = $sth->{backups_broj}->fetchrow_array();
 		next if ($broj > 0);
 
+		my $files = BackupPC::View->new($bpc, $hostname, \@backups, 1);
+		foreach my $share ($files->shareList($backupNum)) {
+
+			my $t = time();
+
+			print strftime($t_fmt,localtime())," ", $share;
+			$shareID = getShareID($share, $hostID, $hostname);
+		
+			my ($f, $nf, $d, $nd) = recurseDir($bpc, $hostname, $files, $backupNum, $share, "", $shareID);
+			printf(" %d/%d files %d/%d dirs [%.2f/s]\n",
+				$nf, $f, $nd, $d,
+				( ($f+$d) / ((time() - $t) || 1) )
+			);
+			$dbh->commit();
+		}
+
 		$sth->{insert_backups}->execute(
 			$hostID,
 			$backupNum,
@@ -200,22 +242,14 @@
 		);
 		$dbh->commit();
 
-		my $files = BackupPC::View->new($bpc, $hostname, \@backups);
-		foreach my $share ($files->shareList($backupNum)) {
-
-			print "\t$share";
-			$shareID = getShareID($share, $hostID, $hostname);
-		
-			my ($f, $nf, $d, $nd) = recurseDir($bpc, $hostname, \@backups, $backupNum, $share, "", $shareID);
-			print " $nf/$f files $nd/$d dirs\n";
-			$dbh->commit();
-		}
 	}
 }
 undef $sth;
 $dbh->commit();
 $dbh->disconnect();
 
+$pidfile->remove;
+
 sub getShareID() {
 
 	my ($share, $hostID, $hostname) = @_;
@@ -269,19 +303,17 @@
 ####################################################
 sub recurseDir($$$$$$$$) {
 
-	my ($bpc, $hostname, $backups, $backupNum, $share, $dir, $shareID) = @_;
+	my ($bpc, $hostname, $files, $backupNum, $share, $dir, $shareID) = @_;
 
-	my ($nr_files, $new_files, $nr_dirs, $new_dirs) = (0,0,0,0);
+	print STDERR "recurse($hostname,$backupNum,$share,$dir,$shareID)\n" if ($debug >= 1);
 
-	my @stack;
+	my ($nr_files, $new_files, $nr_dirs, $new_dirs) = (0,0,0,0);
 
 	{ # scope
+		my @stack;
 
-		my $files = BackupPC::View->new($bpc, $hostname, $backups);             
 		my $filesInBackup = $files->dirAttrib($backupNum, $share, $dir);
 
-print STDERR "$hostname: $share | $dir | $backupNum\n";
-
 		# first, add all the entries in current directory
 		foreach my $path_key (keys %{$filesInBackup}) {
 			my @data = (
@@ -306,12 +338,14 @@
 
 
 			if (! $beenThere->{$key} && ! found_in_db(@data)) {
+				print STDERR "# key: $key [", $beenThere->{$key},"]" if ($debug >= 2);
 				$sth->{'insert_files'}->execute(@data);
-				print STDERR "$key\n";
 				if ($filesInBackup->{$path_key}->{'type'} == BPC_FTYPE_DIR) {
 					$new_dirs++;
+					print STDERR " dir\n" if ($debug >= 2);
 				} else {
 					$new_files++;
+					print STDERR " file\n" if ($debug >= 2);
 				}
 			}
 			$beenThere->{$key}++;
@@ -319,7 +353,10 @@
 			if ($filesInBackup->{$path_key}->{'type'} == BPC_FTYPE_DIR) {
 				$nr_dirs++;
 
-				push @stack, [ $bpc, $hostname, $backups, $backupNum, $share, $path_key, $shareID ] unless ($beenThere->{$key});
+				my $full_path = $dir . '/' . $path_key;
+				push @stack, $full_path;
+				print STDERR "### store to stack: $full_path\n" if ($debug >= 3);
+
 #				my ($f,$nf,$d,$nd) = recurseDir($bpc, $hostname, $backups, $backupNum, $share, $path_key, $shareID) unless ($beenThere->{$key});
 #
 #				$nr_files += $f;
@@ -332,14 +369,16 @@
 			}
 		}
 
-	}
+		print STDERR "## STACK ",join(", ", @stack),"\n" if ($debug >= 2);
 
-	foreach my $r (@stack) {
-		my ($f,$nf,$d,$nd) = recurseDir(@{$r});
-		$nr_files += $f;
-		$new_files += $nf;
-		$nr_dirs += $d;
-		$new_dirs += $nd;
+		while ( my $dir = shift @stack ) {
+			my ($f,$nf,$d,$nd) = recurseDir($bpc, $hostname, $files, $backupNum, $share, $dir, $shareID);
+			print STDERR "# $dir f: $f nf: $nf d: $d nd: $nd\n" if ($debug >= 1);
+			$nr_files += $f;
+			$new_files += $nf;
+			$nr_dirs += $d;
+			$new_dirs += $nd;
+		}
 	}
 
 	return ($nr_files, $new_files, $nr_dirs, $new_dirs);