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";
{
@dents=($self->filter($PATH_ALLTRACKS, $PATH_NOARTIST), $self->artists());
}
- elsif($state==$STATE_TAG || $state==$STATE_TAGVAL)
+ elsif($state==$STATE_TAG)
{
- if($state==$STATE_TAG && $self->at("tag") &&
- $self->{db}->tag_has_values($self->tail()->id()))
+ my $tail=$self->tail();
+ if($self->is($TYPE_TAG, $tail) && $self->{db}->tag_has_values($tail->id()))
{
@dents=$self->tags();
}
elsif($state==$STATE_BOOLEAN)
{
my $parent=$self->tail();
- unless($self->is("boolean", $parent) &&
- $parent->{name} eq "NOT")
+ unless($self->is($TYPE_BOOL, $parent) && $parent->{name} eq "NOT")
{
@dents=("NOT");
}
}
else
{
- print "DIRENTS: UNHANDLED STATE: $state\n";
+ print "id3fsd: INTERNAL ERROR: DIRENTS: UNHANDLED STATE: $state\n";
}
return(\@dents, \@fents);
}
+# State Machine Of Doom
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}=[];
elsif($name eq "NOT")
{
$root_not=1;
- push(@{$self->{elements}}, ID3FS::Path::Node->new($self->{db}, "boolean", $name));
+ push(@{$self->{elements}}, ID3FS::Path::Node->new($self->{db}, $TYPE_BOOL, $name));
$self->state($STATE_BOOLEAN);
}
else
{
- $tag=ID3FS::Path::Node->new($self->{db},"tag", $name);
+ $tag=ID3FS::Path::Node->new($self->{db}, $TYPE_TAG, $name);
if($tag)
{
push(@{$self->{elements}}, $tag);
}
}
}
- 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("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}, "tag", $name, $tag->id());
+ 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);
}
elsif($name eq "AND")
{
$self->state($STATE_BOOLEAN);
- push(@{$self->{elements}}, ID3FS::Path::Node->new($self->{db}, "boolean", $name));
+ push(@{$self->{elements}}, ID3FS::Path::Node->new($self->{db}, $TYPE_BOOL, $name));
}
elsif($name eq "OR")
{
$self->state($STATE_BOOLEAN);
- push(@{$self->{elements}}, ID3FS::Path::Node->new($self->{db}, "boolean", $name));
+ push(@{$self->{elements}}, ID3FS::Path::Node->new($self->{db}, $TYPE_BOOL, $name));
}
else
{
- my $artist=ID3FS::Path::Node->new($self->{db}, "artist", $name);
+ my $artist=ID3FS::Path::Node->new($self->{db}, $TYPE_ARTIST, $name);
if($artist)
{
push(@{$self->{elements}}, $artist);
# print "SM: BOOLEAN: $name\n";
my $parent=$self->tail();
my $allownot=1;
- if($self->is("boolean", $parent) &&
+ if($self->is($TYPE_BOOL, $parent) &&
$parent->{name} eq "NOT")
{
$allownot=0;
if($allownot && $name eq "NOT")
{
$self->state($STATE_BOOLEAN);
- push(@{$self->{elements}}, ID3FS::Path::Node->new($self->{db}, "boolean", $name));
+ push(@{$self->{elements}}, ID3FS::Path::Node->new($self->{db}, $TYPE_BOOL, $name));
}
else
{
- my $tag=ID3FS::Path::Node->new($self->{db}, "tag", $name);
+ my $tag=ID3FS::Path::Node->new($self->{db}, $TYPE_TAG, $name);
if($tag)
{
push(@{$self->{elements}}, $tag);
}
else
{
- my $album=ID3FS::Path::Node->new($self->{db}, "album", $name);
+ my $album=ID3FS::Path::Node->new($self->{db}, $TYPE_ALBUM, $name);
if($album)
{
push(@{$self->{elements}}, $album);
elsif($state==$STATE_TRACKLIST)
{
# print "SM: TRACKLIST: $name\n";
- my $track=ID3FS::Path::Node->new($self->{db}, "file", $name);
+ my $track=ID3FS::Path::Node->new($self->{db}, $TYPE_FILE, $name);
if($track)
{
push(@{$self->{elements}}, $track);
}
else
{
- my $artist=ID3FS::Path::Node->new($self->{db}, "artist", $name);
+ my $artist=ID3FS::Path::Node->new($self->{db}, $TYPE_ARTIST, $name);
if($artist)
{
push(@{$self->{elements}}, $artist);
}
}
- # remove trailing boolean
my @elements=@{$self->{elements}};
- while(@elements && $self->is("boolean", $elements[$#elements]))
+ # remove trailing boolean
+ while(@elements && $self->is($TYPE_BOOL, $elements[$#elements]))
{
pop @elements;
}
# 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
return $self->{state};
}
+# link up precedence-sorted list into a binary tree
sub elements_to_tree
{
my($self, $elements)=@_;
return undef unless(@$elements);
my ($left, $right, $op)=(undef, undef, undef);
my $thing=pop @$elements;
- if($self->is("boolean", $thing))
+ if($self->is($TYPE_BOOL, $thing))
{
$right=$self->elements_to_tree($elements);
if($thing->{name} ne "NOT")
# print "INPUT: ", join(', ', map { $_->{name}; } @input), "\n";
while(my $thing = shift @input)
{
- if($self->is("tag", $thing))
+ if($self->is($TYPE_TAG, $thing))
{
# Handle tag values by dropping parent
- if(@input && $self->is("tag", $input[0]))
+ if(@input && $self->is($TYPE_TAG, $input[0]))
{
$thing=shift @input;
}
push(@output, $thing);
}
- elsif($self->is("boolean", $thing))
+ elsif($self->is($TYPE_BOOL, $thing))
{
- # bool
while(@opstack &&
($priorities{$thing->{name}} <= $priorities{$opstack[$#opstack]->{name}}))
{
{
my($self)=@_;
my $tail=$self->tail();
- if($self->is("tag", $tail))
+ if($self->is($TYPE_TAG, $tail))
{
return($self->{db}->tag_has_values($tail->id()));
}
{
my($self)=@_;
my $tail=$self->tail();
- if($self->is("tag", $tail))
+ if($self->is($TYPE_TAG, $tail))
{
return($tail->id());
}
{
my($self)=@_;
my $tail=$self->tail();
- if($self->is("tag", $tail))
+ if($self->is($TYPE_TAG, $tail))
{
return($tail->{parents_id});
}
return($self->{elements}->[$#{$self->{elements}}]);
}
-sub at
-{
- my($self, $type)=@_;
- return($self->is($type, $self->tail()));
-}
-
sub is
{
my($self, $type, $thing)=@_;
return 0 unless($thing);
return 0 unless($thing->type());
- return 1 if($type eq $thing->type());
+ return 1 if($type == $thing->type());
return 0;
}
my($self)=@_;
my @ids=();
my $tail=$self->tail();
- if($self->is("artist", $tail))
+ if($self->is($TYPE_ARTIST, $tail))
{
return $self->artist_albums($tail->id());
}
{
my($self)=@_;
my $tail=$self->tail();
- if($self->is("artist", $tail))
+ if($self->is($TYPE_ARTIST, $tail))
{
return $self->artist_tracks($tail->id());
}
- elsif($self->is("album", $tail))
+ elsif($self->is($TYPE_ALBUM, $tail))
{
my $artist_id=0;
my $artist=$self->tail_parent();
- if($self->is("artist", $artist))
+ if($self->is($TYPE_ARTIST, $artist))
{
# should always happen
$artist_id=$artist->id();
{
my($self, $mountpoint)=@_;
my $tail=$self->tail();
- if($self->is("file", $tail))
+ if($self->is($TYPE_FILE, $tail))
{
my $id=$tail->id();
my $sql=("SELECT paths.name, files.name FROM files\n" .
"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
my $tree=$self->{tagtree};
my $parent=$self->trailing_tag_parent();
-# print "ELEMENTS: ", join('/', map { $_->{name}; } @{$self->{elements}}), "\n";
-# print "TREE: ", $tree->print(), "\n";
my $tag=undef;
if($hasvals)
{
}
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=();
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);
}
my($self)=@_;
my $tail=$self->tail();
return 0 unless($tail);
- return 0 unless($tail->type() eq "boolean");
+ return 0 unless($tail->type() == $TYPE_BOOL);
return 1 if($tail->name() eq "OR");
return 0 unless($tail->name() eq "NOT");
my $parent=$self->tail_parent();
return 0 unless($parent);
- return 0 unless($parent->type() eq "boolean");
+ return 0 unless($parent->type() == $TYPE_BOOL);
return 1 if($parent->name() eq "OR");
return 0;
}
projects / id3fs.git / blobdiff