--- trunk/DBI.pm	2004/10/09 00:03:42	30
+++ trunk/DBI.pm	2004/11/23 23:54:58	47
@@ -13,7 +13,7 @@
 use Data::Dumper;
 
 
-our $VERSION = '0.04';
+our $VERSION = '0.07';
 
 =head1 NAME
 
@@ -29,7 +29,7 @@
 =head1 DESCRIPTION
 
 This module will use C<Fuse> module, part of C<FUSE (Filesystem in USErspace)>
-available at L<http://sourceforge.net/projects/avf> to mount
+available at L<http://fuse.sourceforge.net/> to mount
 your database as file system.
 
 That will give you possibility to use normal file-system tools (cat, grep, vi)
@@ -152,7 +152,16 @@
 		die "fork() failed: $!" unless defined $pid;
 		# child will return to caller
 		if ($pid) {
-			return $self;
+			my $counter = 4;
+			while ($counter && ! $self->is_mounted) {
+				select(undef, undef, undef, 0.5);
+				$counter--;
+			}
+			if ($self->is_mounted) {
+				return $self;
+			} else {
+				return undef;
+			}
 		}
 	}
 
@@ -169,8 +178,6 @@
 	$self->{'read_filenames'} = sub { $self->read_filenames };
 	$self->read_filenames;
 
-	$self->{'mounted'} = 1;
-
 	$fuse_self = \$self;
 
 	Fuse::main(
@@ -188,14 +195,38 @@
 		debug=>0,
 	);
 	
-	$self->{'mounted'} = 0;
-
 	exit(0) if ($arg->{'fork'});
 
 	return 1;
 
 };
 
+=head2 is_mounted
+
+Check if fuse filesystem is mounted
+
+  if ($mnt->is_mounted) { ... }
+
+=cut
+
+sub is_mounted {
+	my $self = shift;
+
+	my $mounted = 0;
+	my $mount = $self->{'mount'} || confess "can't find mount point!";
+	if (open(MTAB, "/etc/mtab")) {
+		while(<MTAB>) {
+			$mounted = 1 if (/ $mount fuse /i);
+		}
+		close(MTAB);
+	} else {
+		warn "can't open /etc/mtab: $!";
+	}
+
+	return $mounted;
+}
+
+
 =head2 umount
 
 Unmount your database as filesystem.
@@ -210,23 +241,31 @@
 sub umount {
 	my $self = shift;
 
-	if ($self->{'mounted'}) {
-		system "fusermount -u ".$self->{'mount'} || croak "umount error: $!";
+	if ($self->{'mount'} && $self->is_mounted) {
+		system "fusermount -u ".$self->{'mount'}." 2>&1 >/dev/null" || return 0;
+		return 1;
 	}
 
-	return 1;
+	return 0;
 }
 
 $SIG{'INT'} = sub {
-	print STDERR "umount called by SIG INT\n";
-	umount;
+	if ($fuse_self && $$fuse_self->umount) {
+		print STDERR "umount called by SIG INT\n";
+	}
+};
+
+$SIG{'QUIT'} = sub {
+	if ($fuse_self && $$fuse_self->umount) {
+		print STDERR "umount called by SIG QUIT\n";
+	}
 };
 
 sub DESTROY {
 	my $self = shift;
-	return if (! $self->{'mounted'});
-	print STDERR "umount called by DESTROY\n";
-	$self->umount;
+	if ($self->umount) {
+		print STDERR "umount called by DESTROY\n";
+	}
 }
 
 =head2 fuse_module_loaded
@@ -264,6 +303,10 @@
 			type => 0040,
 			mode => 0755,
 		},
+		'..' => {
+			type => 0040,
+			mode => 0755,
+		},
 	#	a => {
 	#		cont => "File 'a'.\n",
 	#		type => 0100,
@@ -342,7 +385,7 @@
 	my %out;
 	foreach my $f (sort keys %files) {
 		if ($dirname) {
-			if ($f =~ s/^\E$dirname\Q\///) {
+			if ($f =~ s/^\Q$dirname\E\///) {
 				$out{$f}++ if ($f =~ /^[^\/]+$/);
 			}
 		} else {
@@ -364,7 +407,8 @@
 
 	$sth->{'read'}->execute($id) || die $sth->{'read'}->errstr;
 	$files{$file}{cont} = $sth->{'read'}->fetchrow_array;
-	$files{$file}{ctime} = time();
+	# I should modify ctime only if content in database changed
+	#$files{$file}{ctime} = time() unless ($files{$file}{ctime});
 	print "file '$file' content [",length($files{$file}{cont})," bytes] read in cache\n";
 }
 
@@ -410,6 +454,7 @@
 	print "invalidate all cached content\n";
 	foreach my $f (keys %files) {
 		delete $files{$f}{cont};
+		delete $files{$f}{ctime};
 	}
 	print "begin new transaction\n";
 	#$dbh->begin_work || die $dbh->errstr;
@@ -518,10 +563,16 @@
 
 Nothing.
 
+=head1 BUGS
+
+Size information (C<ls -s>) is wrong. It's a problem in upstream Fuse module
+(for which I'm to blame lately), so when it gets fixes, C<Fuse::DBI> will
+automagically pick it up.
+
 =head1 SEE ALSO
 
 C<FUSE (Filesystem in USErspace)> website
-L<http://sourceforge.net/projects/avf>
+L<http://fuse.sourceforge.net/>
 
 Example for WebGUI which comes with this distribution in
 directory C<examples/webgui.pl>. It also contains a lot of documentation