sql formatting tweaks

[id3fs.git] / lib / ID3FS / Path.pm

diff --git a/lib/ID3FS/Path.pm b/lib/ID3FS/Path.pm
index 86d469d..629c02a 100644 (file)
--- a/lib/ID3FS/Path.pm
+++ b/lib/ID3FS/Path.pm
@@ -20,10 +20,10 @@ use strict;
 use warnings;
 use ID3FS::Path::Node;
 
-our ($STATE_INVALID, $STATE_ROOT, $STATE_TAG, $STATE_TAGVAL,
-     $STATE_BOOLEAN, $STATE_ALBUMS, $STATE_TRACKLIST,
-     $STATE_FILE, $STATE_ALL)=(0..8);
+our ($STATE_INVALID, $STATE_ROOT, $STATE_TAG, $STATE_BOOLEAN,
+     $STATE_ALBUMS, $STATE_TRACKLIST, $STATE_FILE, $STATE_ALL)=(0..7);
 
+# operator precedence
 our %priorities=( "OR" => 0, "AND" => 1, "NOT" => 2 );
 
 our $PATH_ALLTRACKS= "TRACKS";
@@ -97,11 +97,10 @@ sub dirents
     {
        @dents=($self->filter($PATH_ALLTRACKS, $PATH_NOARTIST), $self->artists());
     }
-    elsif($state==$STATE_TAG || $state==$STATE_TAGVAL)
+    elsif($state==$STATE_TAG)
     {
        my $tail=$self->tail();
-       if($state==$STATE_TAG && $self->is($TYPE_TAG, $tail) &&
-          $self->{db}->tag_has_values($self->tail()->id()))
+       if($self->is($TYPE_TAG, $tail) && $self->{db}->tag_has_values($tail->id()))
        {
            @dents=$self->tags();
        }
@@ -117,8 +116,7 @@ sub dirents
     elsif($state==$STATE_BOOLEAN)
     {
        my $parent=$self->tail();
-       unless($self->is($TYPE_BOOL, $parent) &&
-              $parent->{name} eq "NOT")
+       unless($self->is($TYPE_BOOL, $parent) && $parent->{name} eq "NOT")
        {
            @dents=("NOT");
        }
@@ -138,7 +136,7 @@ sub dirents
     }
     else
     {
-       print "DIRENTS: UNHANDLED STATE: $state\n";
+       print "id3fsd: INTERNAL ERROR: DIRENTS: UNHANDLED STATE: $state\n";
     }
     return(\@dents, \@fents);
 }
@@ -147,11 +145,11 @@ sub dirents
 sub parse
 {
     my($self)=@_;
+    $self->state($STATE_ROOT);
+    return if($self->{path} eq "/");
     @{$self->{components}}=split(/\//, $self->{path});
     shift @{$self->{components}}; # drop empty field before leading /
 #    print "PATH: $self->{path}\n";
-    $self->state($STATE_ROOT);
-    return if($self->{path} eq "/");
     my @parts=@{$self->{components}};
     my($tag, $tagval);
     $self->{elements}=[];
@@ -196,18 +194,16 @@ sub parse
                }
            }
        }
-       elsif($state==$STATE_TAG || $state==$STATE_TAGVAL)
+       elsif($state==$STATE_TAG)
        {
            my $tag=$self->tail();
 #          print "SM: TAG/TAGVAL($state): $name\n";
-           if($state==$STATE_TAG && $self->is($TYPE_TAG, $tag) &&
-              $self->{db}->tag_has_values($tag->id()))
+           if($self->is($TYPE_TAG, $tag) && $self->{db}->tag_has_values($tag->id()))
            {
 #              print "Parsing: parent: $tag->id()\n";
                my $tagval=ID3FS::Path::Node->new($self->{db}, $TYPE_TAG, $name, $tag->id());
                if(defined($tagval))
                {
-                   $self->state($STATE_TAGVAL);
                    # stay in tag state
                    push(@{$self->{elements}}, $tagval);
                }
@@ -354,8 +350,8 @@ sub parse
        }
     }
 
-    # remove trailing boolean
     my @elements=@{$self->{elements}};
+    # remove trailing boolean
     while(@elements && $self->is($TYPE_BOOL, $elements[$#elements]))
     {
        pop @elements;
@@ -363,14 +359,6 @@ sub parse
     # sort elements by precedence
     @elements=$self->sort_elements(@elements);
     $self->{tagtree}=$self->elements_to_tree(\@elements);
-    if($self->{tagtree})
-    {
-#      use Data::Dumper;
-#      print "TREE\n";
-#      print Dumper $self->{tagtree};
-#      my ($conditions, @joins)=$self->{tagtree}->to_sql();
-#      print "CONDITIONS(", scalar(@joins), "): ", $conditions, "\n";
-    }
 }
 
 sub state
@@ -384,6 +372,7 @@ sub state
     return $self->{state};
 }
 
+# link up precedence-sorted list into a binary tree
 sub elements_to_tree
 {
     my($self, $elements)=@_;
@@ -423,7 +412,6 @@ sub sort_elements
        }
        elsif($self->is($TYPE_BOOL, $thing))
        {
-           # bool
            while(@opstack &&
                  ($priorities{$thing->{name}} <= $priorities{$opstack[$#opstack]->{name}}))
            {
@@ -686,7 +674,6 @@ sub filename
                 "GROUP BY paths.name, files.name");
        print "FILENAME SQL: $sql\n" if($self->{verbose});
        my ($path, $name)=$self->{db}->cmd_onerow($sql, $id);
-       my $id3fs_path=join('/', map { $_->{name}; }  @{$self->{elements}});
        return($self->{db}->relativise($path, $name, $mountpoint, $self->{path}));
     }
     # should never happen
@@ -708,6 +695,8 @@ sub tags_subselect
     }
     my ($sqlclause, @joins)=(undef, ());
     ($sqlclause, @joins) = $tree->to_sql($hasvals) if($tree);
+#    use Data::Dumper;
+#    print Dumper $tree if($tree);
 #    print "SQL(" . scalar(@joins) ."): $sqlclause\n";
     my $sql="\tSELECT fxt1.files_id FROM tags t1";
     my @crosses=();
@@ -766,16 +755,7 @@ sub filter
     my @outdirs=();
     for my $dir (@dirs)
     {
-#      print "\nFILTER (",$self->state(), "): $base / $dir\n";
-       if($self->empty("$base/$dir"))
-       {
-#          print "empty: $base / $dir\n";
-       }
-       else
-       {
-#          print "non-empty, accepting: $base / $dir\n";
-           push(@outdirs, $dir);
-       }
+       push(@outdirs, $dir) unless($self->empty("$base/$dir"));
     }
     return(@outdirs);
 }