$self->{db}=shift;
$self->{path}=shift;
$self->{verbose}=shift;
+ $self->{maxtagdepth}=shift;
+ $self->{curtagdepth}=0;
$self->{path} =~ s/\/\//\//g; # drop doubled slashes
$self->parse();
sub isfile
{
my($self)=@_;
- return 1 if($self->state() == $STATE_FILE);
- return 0;
+ return($self->state() == $STATE_FILE);
}
sub isvalid
my($self, $mountpoint)=@_;
if($self->state() == $STATE_FILE)
{
- return $self->filename($mountpoint, $self);
+ return $self->filename($mountpoint);
}
return "ERROR"; #should never happen?
}
# print "DIRENTS: FILE: $self->{path}\n";
if($state==$STATE_ALL)
{
- push(@dents, $PATH_ALLTRACKS, $PATH_NOARTIST, $self->artists());
+ @dents=($PATH_ALLTRACKS, $PATH_NOARTIST, $self->artists());
}
elsif($state==$STATE_TAG || $state==$STATE_TAGVAL)
{
- my $tag=$self->tail();
- if($state==$STATE_TAG &&
- defined($tag) &&
- ref($tag) eq "ID3FS::PathElement::Tag" &&
- $self->{db}->tag_has_values($tag->{id}))
+ if($state==$STATE_TAG && $self->at("tag") &&
+ $self->{db}->tag_has_values($self->tail()->{id}))
{
@dents=$self->tags();
}
else
{
- push(@dents, qw(AND OR), $PATH_ALLTRACKS, $PATH_NOARTIST, $self->artists());
+ if($self->{maxtagdepth} && ($self->{curtagdepth} < $self->{maxtagdepth}))
+ {
+ @dents=qw(AND OR);
+ }
+ push(@dents, $self->filter($PATH_ALLTRACKS, $PATH_NOARTIST));
+ push(@dents, $self->artists());
}
}
elsif($state==$STATE_BOOLEAN)
{
my $parent=$self->tail();
- unless(defined($parent) &&
- ref($parent) eq "ID3FS::PathElement::Boolean" &&
+ unless($self->is("boolean", $parent) &&
$parent->{name} eq "NOT")
{
- push(@dents, "NOT");
+ @dents=("NOT");
}
- push(@dents, $self->tags());
+ push(@dents,$self->tags());
}
elsif($state==$STATE_ROOT)
{
}
elsif($state==$STATE_ALBUMS)
{
- @dents=($PATH_ALLTRACKS, $PATH_NOALBUM, $self->albums());
+ @dents=($self->filter($PATH_ALLTRACKS, $PATH_NOALBUM), $self->albums());
}
elsif($state==$STATE_TRACKLIST)
{
}
elsif($state==$STATE_TAG || $state==$STATE_TAGVAL)
{
-# print "SM: TAG/TAGVAL($state): $name\n";
my $tag=$self->tail();
- if($state==$STATE_TAG &&
- defined($tag) &&
- ref($tag) eq "ID3FS::PathElement::Tag" &&
+# print "SM: TAG/TAGVAL($state): $name\n";
+ if($state==$STATE_TAG && $self->is("tag", $tag) &&
$self->{db}->tag_has_values($tag->{id}))
{
# print "Parsing: parent: $tag->{id}\n";
# print "SM: BOOLEAN: $name\n";
my $parent=$self->tail();
my $allownot=1;
- if(defined($parent) &&
- ref($parent) eq "ID3FS::PathElement::Boolean" &&
+ if($self->is("boolean", $parent) &&
$parent->{name} eq "NOT")
{
$allownot=0;
}
elsif($name eq $PATH_NOARTIST)
{
- # FIXME
$self->state($STATE_TRACKLIST);
}
else
# remove trailing boolean
my @elements=@{$self->{elements}};
- while(@elements && ref($elements[$#elements]) eq "ID3FS::PathElement::Boolean")
+ while(@elements && $self->is("boolean", $elements[$#elements]))
{
pop @elements;
}
sub state
{
my($self, $newstate)=@_;
- $self->{state}=$newstate if(defined($newstate));
+ if(defined($newstate))
+ {
+ $self->{state}=$newstate;
+ $self->{curtagdepth}++ if($newstate == $STATE_TAG);
+ }
return $self->{state};
}
return undef unless(@$elements);
my ($left, $right, $op)=(undef, undef, undef);
my $thing=pop @$elements;
- if(ref($thing) eq "ID3FS::PathElement::Boolean")
+ if($self->is("boolean", $thing))
{
my $op=$thing;
$right=$self->elements_to_tree($elements);
# print "INPUT: ", join(', ', map { $_->{name}; } @input), "\n";
while(my $thing = shift @input)
{
- if(ref($thing) eq "ID3FS::PathElement::Tag")
+ if($self->is("tag", $thing))
{
# Handle tag values by dropping parent
- if(@input && ref($input[0]) eq "ID3FS::PathElement::Tag")
+ if(@input && $self->is("tag", $input[0])
{
$thing=shift @input;
}
push(@output, $thing);
}
- elsif(ref($thing) eq "ID3FS::PathElement::Boolean")
+ elsif($self->is("boolean", $thing))
{
# bool
while(@opstack &&
return($self->{tagtree}->used_tags());
}
-sub tag_has_values
+sub expecting_values
{
my($self)=@_;
my $tail=$self->tail();
- if($tail && ref($tail) eq "ID3FS::PathElement::Tag")
+ if($self->is("tag", $tail))
{
return($self->{db}->tag_has_values($tail->{id}));
}
{
my($self)=@_;
my $tail=$self->tail();
- if($tail && ref($tail) eq "ID3FS::PathElement::Tag")
+ if($self->is("tag", $tail))
{
return($tail->{id});
}
{
my($self)=@_;
my $tail=$self->tail();
- if($tail && ref($tail) eq "ID3FS::PathElement::Tag")
+ if($self->is("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);
+ my $ref=ref($thing);
+ my $typestr="ID3FS::PathElement::" . ucfirst($type);
+ return 1 if($ref eq $typestr);
+ return 0;
+}
+
# the one before last
sub tail_parent
{
sub tags
{
my($self)=@_;
- if(!$self->{tagtree}) # / or /NOT # FIXME: /ALL too?
+ if(!$self->{tagtree}) # / or /NOT
{
my $sql="SELECT DISTINCT name FROM tags WHERE parents_id='';";
return($self->{db}->cmd_firstcol($sql));
}
- my $hasvals=$self->tag_has_values();
+ my $hasvals=$self->expecting_values();
my $parent=$self->trailing_tag_parent();
# print "THASVALS: $hasvals\n";
# print "TPARENT: ", (defined($parent)? $parent : "NO"), "\n";
return(@tagnames);
}
-sub tag_values
-{
- my($self, $tagid)=@_;
- my $sql=("SELECT DISTINCT name FROM tags\n" .
- "WHERE parents_id=?");
- my @tags=$self->{db}->cmd_firstcol($sql, $tagid);
- @tags=map { length($_) ? $_ : "NOVALUE"; } @tags;
- return @tags;
-}
-
sub artists
{
my($self)=@_;
return($self->{db}->cmd_firstcol($sql));
}
my @ids=();
- my $sql=("SELECT artists.name FROM (\n" .
- $self->tags_subselect() .
- ") AS subselect\n" .
- "INNER JOIN files ON subselect.files_id=files.id\n" .
- "INNER JOIN artists ON files.artists_id=artists.id\n" .
+ my $sql=$self->sql_start("artists.name");
+ $sql .= ("INNER JOIN artists ON files.artists_id=artists.id\n" .
"WHERE artists.name != ''\n" .
"GROUP BY artists.name;");
print "SQL(ARTISTS): $sql\n" if($self->{verbose});
my @ids=();
my $tail=$self->tail();
# FIXME: rework PathElements
- if(ref($tail) eq "ID3FS::PathElement::Artist")
+ if($self->is("artist", $tail))
{
return $self->artist_albums($tail->{id});
}
- my $sql;
- if($self->{in_all})
- {
- $sql="SELECT name FROM albums";
- }
- else
- {
- $sql=("SELECT albums.name\n" .
- "\tFROM (\n" .
- $self->tags_subselect() .
- "\t) AS subselect\n" .
- "INNER JOIN files ON subselect.files_id=files.id\n" .
- "INNER JOIN albums ON files.albums_id=albums.id\n" .
- "WHERE albums.name != ''\n" .
- "GROUP BY albums.name;");
- }
+ my $sql=$self->sql_start("albums.name");
+ $sql .= ("INNER JOIN albums ON files.albums_id=albums.id\n" .
+ "WHERE albums.name != ''\n" .
+ "GROUP BY albums.name;");
print "SQL(ALBUMS): \n$sql\n" if($self->{verbose});
my @names=$self->{db}->cmd_firstcol($sql);
print("ALBUMS: ", join(', ', @names), "\n") if($self->{verbose});
sub artist_albums
{
my($self, $artist_id)=@_;
- my $sql="SELECT albums.name FROM ";
- if($self->{in_all})
- {
- $sql .= "files\n";
- }
- else
- {
- $sql .= ("(\n" .
- $self->tags_subselect() .
- ") AS subselect\n" .
- "INNER JOIN files ON subselect.files_id=files.id\n");
- }
+ my $sql=$self->sql_start("albums.name");
$sql .= ("INNER JOIN albums ON albums.id=files.albums_id\n" .
"INNER JOIN artists ON artists.id=files.artists_id\n" .
"WHERE artists.id=? and albums.name <> ''\n" .
sub artist_tracks
{
my($self, $artist_id)=@_;
- my $sql="SELECT files.name FROM ";
- if($self->{in_all})
- {
- $sql .= "files\n";
- }
- else
- {
- $sql .= ("(\n" .
- $self->tags_subselect() .
- "\t) AS subselect\n" .
- "INNER JOIN files ON subselect.files_id=files.id\n");
- }
+ my $sql=$self->sql_start("files.name");
$sql .= ("INNER JOIN artists ON artists.id=files.artists_id\n" .
"INNER JOIN albums ON albums.id=files.albums_id\n" .
"WHERE artists.id=? AND albums.name=''\n" .
my($self)=@_;
# FIXME: rework PathElements
my $tail=$self->tail();
- if(ref($tail) eq "ID3FS::PathElement::Artist")
+ if($self->is("artist", $tail))
{
return $self->artist_tracks($tail->{id});
}
- elsif(ref($tail) eq "ID3FS::PathElement::Album")
+ elsif($self->is("album", $tail))
{
my $artist_id=0;
my $artist=$self->tail_parent();
- if(defined($artist) && (ref($artist) eq "ID3FS::PathElement::Artist"))
+ if($self->is("artist", $artist))
{
# should always happen
$artist_id=$artist->{id};
}
return $self->album_tracks($artist_id, $tail->{id});
}
- my $sql="SELECT files.name FROM ";
- if($self->{in_all})
- {
- $sql .= "files\n";
- }
- else
- {
- $sql .= ("(\n" .
- $self->tags_subselect() .
- ") AS subselect\n" .
- "INNER JOIN files ON files.id=subselect.files_id\n");
- }
+ my $sql=$self->sql_start("files.name");
$sql .= "INNER JOIN artists ON files.artists_id=artists.id\n";
if($self->{components}->[$#{$self->{components}}] eq $PATH_NOARTIST)
{
{
my($self, $mountpoint)=@_;
my $tail=$self->tail();
- if(ref($tail) eq "ID3FS::PathElement::File")
+ if($self->is("file", $tail))
{
my $id=$tail->{id};
my $sql=("SELECT paths.name, files.name FROM files\n" .
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, $id3fs_path));
+ return($self->{db}->relativise($path, $name, $mountpoint));
}
- die("DB::filename: unhandled case\n"); #FIXME
+ # should never happen
+ return "ERROR";
}
sub tags_subselect
{
my($self)=@_;
- my $hasvals=$self->tag_has_values();
+ my $hasvals=$self->expecting_values();
# we need to specially handle a bare /NOT/tag with no other clauses,
# using a simple WHERE id !='tagid' instead of a LEFT JOIN
if($self->{bare_not})
sub bare_not_subselect
{
my($self)=@_;
- my @tags=grep { ref($_) eq "ID3FS::PathElement::Tag"; } @{$self->{elements}};
+ my @tags=grep { $self->is("tag", $_); } @{$self->{elements}};
my $sql=("\tSELECT f1.id AS files_id FROM files f1 WHERE f1.id NOT IN (\n" .
"\t\tSELECT fxt1.files_id FROM tags t1\n" .
"\t\tINNER JOIN files_x_tags fxt1 ON t1.id=fxt1.tags_id\n" .
return($sql);
}
-sub tags_subselect_and_not
+sub sql_start
{
- my($self,@constraints)=@_;
- my ($tags, $tags_vals, $parent)=$self->constraints_tag_list(@constraints);
- my @tags=@$tags;
- my @tags_vals=@$tags_vals;;
- my $cnt=1;
- my @andclauses=();
- my $sql='';
- for my $tag (@tags)
- {
- if($cnt == 1)
- {
- $sql="\tSELECT fxt" . scalar(@tags) . ".files_id FROM files_x_tags fxt1\n";
- push(@andclauses, "\t\tfxt${cnt}.tags_id=$tag");
- }
- else
- {
- $sql .= ("\tLEFT JOIN files_x_tags fxt$cnt ON fxt" .
- ($cnt-1) . ".files_id=fxt${cnt}.files_id\n");
- push(@andclauses, "\t\tfxt${cnt}.tags_id IS NULL");
- }
- print "AND: @andclauses\n";
- $cnt++;
- }
- if(@andclauses)
- {
- $sql .= "\tWHERE\n\t\t";
- $sql .= join(" AND\n\t\t", @andclauses) . "\n";
- }
- $sql .= "\tGROUP BY fxt". scalar(@tags).".files_id\n";
- return $sql;
-}
-
-
-sub tags_subselect_and
-{
- my($self,@constraints)=@_;
- my ($tags, $tags_vals, $parent)=$self->constraints_tag_list(@constraints);
- my @tags=@$tags;
- my @tags_vals=@$tags_vals;;
- my $cnt=1;
- my @andclauses=();
- my $sql='';
- for my $tag (@tags)
+ my($self, $tables)=@_;
+ my $sql="SELECT $tables FROM ";
+ if($self->{in_all})
{
- if($cnt == 1)
- {
- $sql="\tSELECT fxt" . scalar(@tags) . ".files_id FROM files_x_tags fxt1\n";
- }
- else
- {
- $sql .= ("\tINNER JOIN files_x_tags fxt$cnt ON fxt" .
- ($cnt-1) . ".files_id=fxt${cnt}.files_id\n");
- }
- push(@andclauses, "\t\tfxt${cnt}.tags_id = $tag");
- print "AND: @andclauses\n";
- $cnt++;
+ $sql .= "files\n";
}
- if(@andclauses)
+ else
{
- $sql .= "\tWHERE\n\t\t";
- $sql .= join(" AND\n\t\t", @andclauses) . "\n";
+ $sql .= ("(\n" .
+ $self->tags_subselect() .
+ ") AS subselect\n" .
+ "INNER JOIN files ON subselect.files_id=files.id\n");
}
- $sql .= "\tGROUP BY fxt". scalar(@tags).".files_id\n";
return $sql;
}
-sub tags_subselect_or
-{
- my($self,@constraints)=@_;
- my ($tags, $tags_vals, $parent)=$self->constraints_tag_list(@constraints);
- my @tags=@$tags;
- my @tags_vals=@$tags_vals;;
-
- my $sql=("\tSELECT files_x_tags.files_id FROM tags t1\n" .
- "\tINNER JOIN files_x_tags ON t1.id=files_x_tags.tags_id\n");
- my @orclauses=();
- my @andclauses=();
- # FIXME: and / or?
- if(@tags)
- {
- push(@andclauses, "( t1.parents_id=" . (defined($parent) ? $parent : "''") . " )");
- push(@andclauses, "( t1.id IN ( " . join(', ', @tags) ." ) )");
- }
- for my $pair (@tags_vals)
- {
- my($tag, $val)=@$pair;
- push(@orclauses, "( t1.parents_id=$tag AND t1.id=$val )");
- }
-# push(@andclauses, "( t1.parents_id=" . (defined($parent) ? $parent : "''") . " )");
- if(@orclauses)
- {
- push(@andclauses, join("\n\t\tOR ", @orclauses));
- }
- if(@andclauses)
- {
- $sql .= "\tWHERE\n\t\t";
- $sql .= join("\n\t\tAND ", @andclauses) . "\n";
- }
- $sql .= "\tGROUP BY files_x_tags.files_id\n";
- return $sql;
-}
sub constraints_tag_list
{
for my $constraint (@constraints)
{
# print ref($constraint), ": ", $constraint->{name}, "\n";
- if(ref($constraint) eq "ID3FS::PathElement::Tag")
+ if($self->is("tag", $constraint))
{
if(defined($lasttag))
{
}
}
}
- unless($self->{db}->{postgres})
- {
- @tags=map{ "\"$_\""; } @tags;
- @tags_vals=map( { [ map({ "\"$_\""; } @$_ ) ] } @tags_vals);
- $lasttag="\"$lasttag\"" if defined($lasttag);
- }
+ @tags=map{ "\"$_\""; } @tags;
+ @tags_vals=map( { [ map({ "\"$_\""; } @$_ ) ] } @tags_vals);
+ $lasttag="\"$lasttag\"" if defined($lasttag);
return(\@tags, \@tags_vals, $lasttag);
}
-
-sub bare_tags
-{
- my($self)=@_;
- my $sql=("SELECT tags.name FROM tags\n" .
- "WHERE tags.parents_id=''\n" .
- "GROUP BY tags.name\n");
- my @names=$self->{db}->cmd_firstcol($sql);
- return (@names);
-}
-
-sub tags_with_values
-{
- # FIXME: only shows one level of tag depth
- my($self)=@_;
- my $sql=("SELECT p.name, t.name FROM tags t\n" .
- "INNER JOIN tags p ON t.parents_id=p.id\n" .
- "GROUP BY p.name, t.name\n");
-# print "SQL: $sql\n";
- my $result=$self->{db}->cmd_rows($sql);
- my $tags={};
- for my $pair (@$result)
- {
- push(@{$tags->{$pair->[0]}}, $pair->[1]);
- }
- return $tags;
-}
-
-
+# we just filter $ALLTRACKS, $NOARTIST and $NOALBUM
+# filtering tags properly requires up to four levels of recursion
+# (tag/tagval/AND/NOT) and is too slow
sub filter
{
my($self, @dirs)=@_;
my $base=$self->{path};
my @outdirs=();
- # depth 4 to allow for tag/tagval/AND/NOT
- my $maxdepth=4;
for my $dir (@dirs)
{
-# print "FILTER (",$self->state(), "): $base / $dir\n";
- if($self->empty("$base/$dir", $maxdepth))
+ print "\nFILTER (",$self->state(), "): $base / $dir\n";
+ if($self->empty("$base/$dir"))
{
-# print "empty: $base / $dir\n";
+ print "empty: $base / $dir\n";
}
else
{
-# print "accepting: $base / $dir\n";
+ print "non-empty, accepting: $base / $dir\n";
push(@outdirs, $dir);
}
}
sub empty
{
- my($self, $dir, $maxdepth)=@_;
- return 1 unless($maxdepth);
-# print "testing($maxdepth): $dir\n";
- my $path=ID3FS::Path->new($self->{db}, $dir, $self->{verbose});
-# print "PATH INVALID\n" unless($path->isvalid());
+ my($self, $dir)=@_;
+ my $path=ID3FS::Path->new($self->{db}, $dir, $self->{verbose},
+ ($self->{maxtagdepth} - $self->{curtagdepth}));
return 1 unless($path->isvalid());
my($subdirs,$subfiles)=$path->dirents();
-# print "SUBDENTS: ", join(", ", @$subdirs, @$subfiles), "\n";
-# print("SUBFILES: ", join(', ', @$subfiles), "\n") if(@$subfiles);
- return 0 if(@$subfiles);
- for my $subdir (@$subdirs)
- {
-# print "SUBSUB $dir/$subdir\n";
- if(1) #$self->dir_is_special($subdir))
- {
- if($self->empty("$dir/$subdir", ($maxdepth-1)))
- {
-# print "EMPTY: $dir / $subdir\n";
- }
- else
- {
-# print "NONEMPTY: $dir / $subdir\n";
- return 0;
- }
- }
- else
- {
- return 0;
- }
-# return 0 if($self->nonempty("$dir/$subdir", ($maxdepth-1)));
- }
+ return 0 if(@$subfiles || @$subdirs);
return 1;
}
-sub tagname_has_values
-{
- my($self, $name)=@_;
- my $id=$self->{db}->lookup_id("tags", $name);
- return 0 unless($id);
- return $self->{db}->tag_has_values($id);
-
-}
-
-sub dir_is_special
-{
- my($self, $dir)=@_;
- if((grep { $_ eq $dir; }
- qw(AND OR NOT), $PATH_ALLTRACKS, $PATH_NOARTIST, $PATH_NOALBUM) ||
- ($self->tagname_has_values($dir)))
- {
- return 1;
- }
- return 0;
-}
-
1;