--- trunk/bin/BackupPC_updatedb	2005/07/10 22:56:43	14
+++ trunk/bin/BackupPC_updatedb	2005/08/20 14:13:58	48
@@ -1,16 +1,35 @@
 #!/usr/local/bin/perl -w
 
 use strict;
-use DBI;
 use lib "__INSTALLDIR__/lib";
+
+use DBI;
 use BackupPC::Lib;
 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,14 +42,15 @@
 
 my %opt;
 
-if ( !getopts("cdm:", \%opt ) ) {
+if ( !getopts("cdm:v:", \%opt ) ) {
 	print STDERR <<EOF;
-usage: $0 [-c|-d] [-m num]
+usage: $0 [-c|-d] [-m num] [-v|-v level]
 
 Options:
 	-c	create database on first use
 	-d	delete database before import
 	-m num	import just num	increments for one host
+	-v num	set verbosity (debug) level (default $debug)
 EOF
 	exit 1;
 }
@@ -81,7 +101,7 @@
 		create table files (
 			ID	INTEGER		NOT NULL PRIMARY KEY,  
 			shareID	INTEGER		NOT NULL references shares(id),
-			backupNum  INTEGER	NOT NULL references backups(id),
+			backupNum  INTEGER	NOT NULL references backups(num),
 			name       VARCHAR(255)	NOT NULL,
 			path       VARCHAR(255)	NOT NULL,
 			fullpath   VARCHAR(255)	NOT NULL,
@@ -122,6 +142,11 @@
 	print " done...\n";
 }
 
+if ($opt{v}) {
+	print "Debug level at $opt{v}\n";
+	$debug = $opt{v};
+}
+
 #################################INSERT VALUES#############################
 
 # get hosts
@@ -180,18 +205,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->{type} || '?', " ",
+			$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 +245,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) = @_;
@@ -236,16 +273,24 @@
 		VALUES (?,?,?,?)
 	});
 
-	$sth->{insert_share}->execute($hostID,$share, $hostname . $share,undef);
+	my $drop_down = $hostname . '/' . $share;
+	$drop_down =~ s#//+#/#g;
+
+	$sth->{insert_share}->execute($hostID,$share, $drop_down ,undef);
 	return $dbh->func('last_insert_rowid');      	
 }
 
 sub found_in_db {
 
-	my ($shareID,undef,$name,$path,undef,$date,undef,$size) = @_;
+	my @data = @_;
+	shift @data;
+
+	my ($key, $shareID,undef,$name,$path,undef,$date,undef,$size) = @_;
+
+	return $beenThere->{$key} if (defined($beenThere->{$key}));
 
 	$sth->{file_in_db} ||= $dbh->prepare(qq{
-		SELECT count(*) FROM files
+		SELECT 1 FROM files
 		WHERE shareID = ? and
 			path = ? and 
 			name = ? and
@@ -255,8 +300,12 @@
 
 	my @param = ($shareID,$path,$name,$date,$size);
 	$sth->{file_in_db}->execute(@param);
-	my ($rows) = $sth->{file_in_db}->fetchrow_array();
-	print STDERR ( $rows ? '+' : '-' ), join(" ",@param), "\n";
+	my $rows = $sth->{file_in_db}->rows;
+	print STDERR "## found_in_db ",( $rows ? '+' : '-' ), join(" ",@param), "\n" if ($debug >= 3);
+
+	$beenThere->{$key}++;
+
+	$sth->{'insert_files'}->execute(@data) unless ($rows);
 	return $rows;
 }
 
@@ -266,59 +315,81 @@
 ####################################################
 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 "\nrecurse($hostname,$backupNum,$share,$dir,$shareID)\n" if ($debug >= 1);
 
-	my $files = BackupPC::View->new($bpc, $hostname, $backups);             
-	my $filesInBackup = $files->dirAttrib($backupNum, $share, $dir);
+	my ($nr_files, $new_files, $nr_dirs, $new_dirs) = (0,0,0,0);
 
-	# first, add all the entries in current directory
-	foreach my $path_key (keys %{$filesInBackup}) {
-		my @data = (
-			$shareID,
-			$backupNum,
-			$path_key,
-			$filesInBackup->{$path_key}->{'relPath'},
-			$filesInBackup->{$path_key}->{'fullPath'},
-#			$filesInBackup->{$path_key}->{'sharePathM'},
-			$filesInBackup->{$path_key}->{'mtime'},
-			$filesInBackup->{$path_key}->{'type'},
-			$filesInBackup->{$path_key}->{'size'}
-		);
+	{ # scope
+		my @stack;
 
-		my $key = join(" ", (
-			$shareID,
-			$dir,
-			$path_key,
-			$filesInBackup->{$path_key}->{'mtime'},
-			$filesInBackup->{$path_key}->{'size'}
-		));
+		print STDERR "# dirAttrib($backupNum, $share, $dir)\n" if ($debug >= 2);
+		my $filesInBackup = $files->dirAttrib($backupNum, $share, $dir);
 
+		# first, add all the entries in current directory
+		foreach my $path_key (keys %{$filesInBackup}) {
+			my @data = (
+				$shareID,
+				$backupNum,
+				$path_key,
+				$filesInBackup->{$path_key}->{'relPath'},
+				$filesInBackup->{$path_key}->{'fullPath'},
+	#			$filesInBackup->{$path_key}->{'sharePathM'},
+				$filesInBackup->{$path_key}->{'mtime'},
+				$filesInBackup->{$path_key}->{'type'},
+				$filesInBackup->{$path_key}->{'size'}
+			);
+
+			my $key = join(" ", (
+				$shareID,
+				$dir,
+				$path_key,
+				$filesInBackup->{$path_key}->{'mtime'},
+				$filesInBackup->{$path_key}->{'size'}
+			));
+
+
+			if (! defined($beenThere->{$key}) && ! found_in_db($key, @data)) {
+				print STDERR "# key: $key [", $beenThere->{$key},"]" if ($debug >= 2);
+
+				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);
+				}
+			}
 
-		if (! $beenThere->{$key} && ! found_in_db(@data)) {
-			$sth->{'insert_files'}->execute(@data);
-			print STDERR "$key\n";
 			if ($filesInBackup->{$path_key}->{'type'} == BPC_FTYPE_DIR) {
-				$new_dirs++;
+				$nr_dirs++;
+
+				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;
+#				$new_files += $nf;
+#				$nr_dirs += $d;
+#				$new_dirs += $nd;
+
 			} else {
-				$new_files++;
+				$nr_files++;
 			}
 		}
-		$beenThere->{$key}++;
 
-		if ($filesInBackup->{$path_key}->{'type'} == BPC_FTYPE_DIR) {
-			$nr_dirs++;
-
-			my ($f,$nf,$d,$nd) = recurseDir($bpc, $hostname, $backups, $backupNum, $share, $path_key, $shareID);
+		print STDERR "## STACK ",join(", ", @stack),"\n" if ($debug >= 2);
 
+		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;
-
-		} else {
-			$nr_files++;
 		}
 	}