reworked DB::new et al *again*

[id3fs.git] / bin / id3fs-index

diff --git a/bin/id3fs-index b/bin/id3fs-index
index 93a6ebf..22cdf79 100755 (executable)
--- a/bin/id3fs-index
+++ b/bin/id3fs-index
@@ -30,15 +30,27 @@ my $optret=GetOptions(
     "list|l"         => \$list,
     );
 
+if($list && !@ARGV)
+{
+    push(@ARGV, ".");
+}
 usage() if(!@ARGV || !$optret || $help);
 $init=1 unless($list);
 
-if(@ARGV > 1 && !defined($basedir))
+unless(defined($basedir) && defined($dbpath))
 {
-    die("$me: --basedir must be specified if multiple paths are supplied\n");
+    $basedir=ID3FS::DB::find_db($me, $init, @ARGV);
+    exit unless($basedir);
+    my $absbase=Cwd::abs_path($basedir);
+    for my $dir (@ARGV)
+    {
+       if(Cwd::abs_path($dir) !~ /^\Q$absbase\E/)
+       {
+           die("$me: $dir: must be under basedir $absbase - use --basedir to specify\n");
+       }
+    }
 }
-
-my $db=ID3FS::DB->new($me, $verbose, $init, $dbpath, $basedir, $ARGV[0]);
+my $db=ID3FS::DB->new($me, $verbose, $init, $basedir, $dbpath);
 exit unless($db);
 
 if($list)
@@ -54,16 +66,18 @@ else
     {
        if(Cwd::abs_path($path) !~ /^$abs_base/)
        {
-           print "$me, $path is outside $base, skipping\n";
+           print "$me: $path is outside $base, skipping\n";
        }
        File::Find::find( {wanted => \&wanted, follow => 1, no_chdir => 1}, $path);
     }
     my $directories_pruned=$db->prune_directories();
     if($files_pruned || $directories_pruned)
     {
-       print "Removing data from pruned files\n" if $verbose;
+       print "$me: removing data from pruned files\n" if $verbose;
        $db->remove_unused();
     }
+    print "$me: analyzing db\n" if $verbose;
+    $db->analyze();
 }
 
 sub wanted
@@ -86,8 +100,10 @@ sub wanted
 sub prune
 {
     my $dir=shift;
+    $dir=Cwd::abs_path($dir);
     return unless(opendir(DIR, $dir));
-    print "Pruning $dir\n";
+    my $base=Cwd::abs_path($db->base_dir());
+    $dir=~s/^$base\/?//;
     my @oldfiles=$db->files_in($dir);
     my @newfiles=grep { !/^\.\.?$/; } readdir(DIR);
     closedir(DIR);
@@ -99,9 +115,8 @@ sub prune
     {
        unless(exists($hash{$file}))
        {
-           # FIXME: add path, rebasify
            $files_pruned=1;
-           $db->unindex($file);
+           $db->unindex($dir, $file);
        }
     }
 }