X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2FID3FS%2FFuse.pm;h=62dd3a8aa494368173f3ebd29c915353867c519b;hb=fb36f92d827b5e57b2d3238e41bf53f98d6b52b1;hp=54ea029d06ae7f1aa954b6397b2933736e32cbd6;hpb=7093fbc0f65ca7df7914aabcae9008195d9b41f1;p=id3fs.git

diff --git a/lib/ID3FS/Fuse.pm b/lib/ID3FS/Fuse.pm
index 54ea029..62dd3a8 100644
--- a/lib/ID3FS/Fuse.pm
+++ b/lib/ID3FS/Fuse.pm
@@ -2,8 +2,11 @@ package ID3FS::Fuse;
 
 use strict;
 use warnings;
-use POSIX qw(EINVAL ENOENT EROFS EOPNOTSUPP);
+use ID3FS::Path;
 use Fuse;
+use Cwd;
+use POSIX qw(EINVAL EROFS ENOENT EOPNOTSUPP S_IRUSR S_IRGRP S_IROTH S_IXUSR S_IXGRP S_IXOTH);
+our ($TYPE_DIR, $TYPE_SYMLINK)=(0040, 0120);
 
 sub new
 {
@@ -14,7 +17,9 @@ sub new
 
     $self->{db}=shift;
     $self->{source}=shift;
-    $self->{mountpoint}=shift;
+    $self->{mountpoint}=Cwd::abs_path(shift);
+    $self->{debug}=shift;
+    $self->{perms} = S_IRUSR() | S_IXUSR() | S_IRGRP() | S_IXGRP() | S_IROTH() | S_IXOTH();
 
     return $self;
 }
@@ -24,82 +29,148 @@ sub run
     my($self)=@_;
     Fuse::main(
 	mountpoint  => $self->{mountpoint},
-	threaded=>0,
-	debug => 1,
+	threaded    => 0,
+	debug       => $self->{debug},
+	mountopts   => "allow_other,ro",
 	getattr     => sub { $self->getattr(@_); },
-#	readlink    => sub { $self->readlink(@_); },
+	readlink    => sub { $self->readlink(@_); },
 	getdir      => sub { $self->getdir(@_); },
-#	mknod       => sub { $self->mknod(@_); },
-#	mkdir       => sub { $self->mkdir(@_); },
-#	unlink      => sub { $self->unlink(@_); },
-#	rmdir       => sub { $self->rmdir(@_); },
-#	symlink     => sub { $self->symlink(@_); },
-#	rename      => sub { $self->rename(@_); },
-#	link        => sub { $self->link(@_); },
-#	chmod       => sub { $self->chmod(@_); },
-#	chown       => sub { $self->chown(@_); },
-#	truncate    => sub { $self->truncate(@_); },
-#	utime       => sub { $self->utime(@_); },
-#	open        => sub { $self->open(@_); },
-#	read        => sub { $self->read(@_); },
-#	write       => sub { $self->write(@_); },
-#	statfs      => sub { $self->statfs(@_); },
-#	release     => sub { $self->release(@_); },
-#	fsync       => sub { $self->fsync(@_); },
-#	setxattr    => sub { $self->setxattr(@_); },
-#	getxattr    => sub { $self->getxattr(@_); },
-#	listxattr   => sub { $self->listxattr(@_); },
+
+	# Not used
+#	mknod       => sub { $self->mknod(@_);       },
+#	mkdir       => sub { $self->mkdir(@_);       },
+#	unlink      => sub { $self->unlink(@_);      },
+#	rmdir       => sub { $self->rmdir(@_);       },
+#	symlink     => sub { $self->symlink(@_);     },
+#	rename      => sub { $self->rename(@_);      },
+#	link        => sub { $self->link(@_);        },
+#	chmod       => sub { $self->chmod(@_);       },
+#	chown       => sub { $self->chown(@_);       },
+#	truncate    => sub { $self->truncate(@_);    },
+#	utime       => sub { $self->utime(@_);       },
+#	open        => sub { $self->open(@_);        },
+#	read        => sub { $self->read(@_);        },
+#	write       => sub { $self->write(@_);       },
+#	statfs      => sub { $self->statfs(@_);      },
+#	release     => sub { $self->release(@_);     },
+#	fsync       => sub { $self->fsync(@_);       },
+#	setxattr    => sub { $self->setxattr(@_);    },
+#	getxattr    => sub { $self->getxattr(@_);    },
+#	listxattr   => sub { $self->listxattr(@_);   },
 #	removexattr => sub { $self->removexattr(@_); },
 	);
 }
 
 sub getattr
 {
-    my($filename)=@_;
-    print "GETATTR: $filename\n";
+    my($self, $filename)=@_;
+#    print "**GETATTR: $filename\n";
+    my $path=ID3FS::Path->new($self->{db}, $filename);
+    my $last_update=$self->{db}->last_update();
+    return(-ENOENT()) unless($path->isvalid());
     my($dev,$ino,$nlink)=(0,0,1);
-    my($uid,$gid)=(1000,1000);
+    my $uid=$<;
+    my $gid=(split(/ /, $( ))[0];
     my($rdev,$size)=(0,1);
-    my($atime,$mtime,$ctime)=(0,0,0);
+    my($atime,$mtime,$ctime)=($last_update) x 3;
     my($blksize,$blocks)=(512,1);
-    my $mode=(0040 << 9) | 0755;
-    return($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
-	   $atime,$mtime,$ctime,$blksize,$blocks);
+    my $mode=$self->mode( $path->isdir() ? $TYPE_DIR : $TYPE_SYMLINK );
+    return($dev, $ino, $mode, $nlink, $uid, $gid, $rdev, $size,
+	   $atime, $mtime, $ctime, $blksize, $blocks);
 }
 
-sub readlink    { print "readlink\n"; return "FIXME";       }
+sub readlink
+{
+    my($self,$filename)=@_;
+#    print "**READLINK: $filename\n";
+    my $path=ID3FS::Path->new($self->{db}, $filename);
+    return(-EINVAL()) unless($path->isfile());
+    return $path->dest($self->{mountpoint});
+}
 
 sub getdir
 {
     my($self, $filename)=@_;
-    print "GETDIR(", ref($self), ": $filename\n";
-    if($filename eq "/")
+#    print "**GETDIR: $filename\n";
+    my $path=ID3FS::Path->new($self->{db}, $filename);
+    return(-ENOENT()) unless($path->isvalid());
+    return(-ENOTDIR()) unless($path->isdir());
+    my @dents=();
+    my($dirs, $files)=$path->dirents();
+    push(@dents, $self->filter($filename, @$dirs));
+    push(@dents, @$files);
+    if(@dents)
+    {
+	return( (".", "..", @dents, 0) );
+    }
+    return(0);
+}
+
+sub filter
+{
+    my($self, $base, @dirs)=@_;
+    my @outdirs=();
+    for my $dir (@dirs)
     {
-	return(".", "..", $self->{db}->tags(), 0);
+	print "hascontents: $base / $dir\n";
+	my $path=ID3FS::Path->new($self->{db}, "$base/$dir");
+	next unless($path->isvalid());
+	my($subdirs,$subfiles)=$path->dirents();
+	print "SUBDENTS: ", join(", ", @$subdirs, @$subfiles), "\n";
+	next unless(@$subdirs || @$subfiles);
+	if(!@$subfiles || scalar(@$subdirs) < 3)
+	{
+	    my $subdirents=0;
+	    for my $subdir (@$subdirs)
+	    {
+		if(grep { $_ eq $subdir; } qw(AND OR NOT))
+		{
+		    my $subsubpath=ID3FS::Path->new($self->{db}, "$base/$dir/$subdir");
+		    if($path->isvalid())
+		    {
+			my($subsubdirs,$subsubfiles)=$subsubpath->dirents();
+			$subdirents++ if(@$subsubdirs || @$subsubfiles);
+		    }
+		}
+		else
+		{
+		    $subdirents++;
+		}
+	    }
+	    next unless($subdirents);
+	}
+	push(@outdirs, $dir);
     }
-    return('.',0);
+    return(@outdirs)
 }
 
-sub mknod       { print "mknod\n"; return -EINVAL();     }
-sub mkdir       { print "mkdir\n"; return -EROFS();      }
-sub unlink      { print "unlink\n"; return -EINVAL();     }
-sub rmdir       { print "rmdir\n"; return -EROFS();      }
-sub symlink     { print "symlink\n"; return -EROFS();      }
-sub rename      { print "rename\n"; return -EROFS();      }
-sub link        { print "link\n"; return -EROFS();      }
-sub chmod       { print "chmod\n"; return -EINVAL();     }
-sub chown       { print "chown\n"; return -EINVAL();     }
-sub truncate    { print "truncate\n"; return -EROFS();      }
-sub utime       { print "utime\n"; return -EINVAL();     }
-sub open        { print "open\n"; return -EINVAL();     }
-sub read        { print "read\n"; return -EINVAL();     }
-sub write       { print "write\n"; return -EINVAL();     }
-sub statfs      { print "statfs\n"; return -EINVAL();     }
-sub release     { print "release\n"; return 0;             }
-sub fsync       { print "fsync\n"; return 0;             }
-sub setxattr    { print "setxattr\n"; return -EOPNOTSUPP(); }
-sub getxattr    { print "getxattr\n"; return -EOPNOTSUPP(); }
-sub listxattr   { print "listxattr\n"; return -EOPNOTSUPP(); }
-sub removexattr { print "removexattr\n"; return -EOPNOTSUPP(); }
+# unused stubs
+sub mknod       { print "FUSE: mknod\n";       return -EROFS();      }
+sub mkdir       { print "FUSE: mkdir\n";       return -EROFS();      }
+sub unlink      { print "FUSE: unlink\n";      return -EROFS();      }
+sub rmdir       { print "FUSE: rmdir\n";       return -EROFS();      }
+sub symlink     { print "FUSE: symlink\n";     return -EROFS();      }
+sub rename      { print "FUSE: rename\n";      return -EROFS();      }
+sub link        { print "FUSE: link\n";        return -EROFS();      }
+sub chmod       { print "FUSE: chmod\n";       return -EROFS();      }
+sub chown       { print "FUSE: chown\n";       return -EROFS();      }
+sub truncate    { print "FUSE: truncate\n";    return -EROFS();      }
+sub utime       { print "FUSE: utime\n";       return -EINVAL();     }
+sub open        { print "FUSE: open\n";        return -EINVAL();     }
+sub read        { print "FUSE: read\n";        return -EINVAL();     }
+sub write       { print "FUSE: write\n";       return -EROFS();      }
+sub statfs      { print "FUSE: statfs\n";      return -EINVAL();     }
+sub release     { print "FUSE: release\n";     return 0;             }
+sub fsync       { print "FUSE: fsync\n";       return 0;             }
+sub setxattr    { print "FUSE: setxattr\n";    return -EOPNOTSUPP(); }
+sub getxattr    { print "FUSE: getxattr\n";    return -EOPNOTSUPP(); }
+sub listxattr   { print "FUSE: listxattr\n";   return -EOPNOTSUPP(); }
+sub removexattr { print "FUSE: removexattr\n"; return -EOPNOTSUPP(); }
+
+sub mode
+{
+    my($self, $type)=@_;
+    return(($type << 9) | $self->{perms});
+}
 
 1;