X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2FID3FS%2FPath.pm;h=96fd32308cf1cffe9b88b0f6e856cac65a224d28;hb=573886d6fd0eb1cb1a9746c3276f98cc2a0f18e5;hp=9020f44b73fb5f1c0356e75bf08af05d8b17644d;hpb=8d3d327aa83769a7c0aa4fb638302757d6411b6c;p=id3fs.git diff --git a/lib/ID3FS/Path.pm b/lib/ID3FS/Path.pm index 9020f44..96fd323 100644 --- a/lib/ID3FS/Path.pm +++ b/lib/ID3FS/Path.pm @@ -31,6 +31,8 @@ sub new $self->{db}=shift; $self->{path}=shift; $self->{verbose}=shift; + $self->{maxtagdepth}=shift; + $self->{curtagdepth}=0; $self->{path} =~ s/\/\//\//g; # drop doubled slashes $self->parse(); @@ -52,8 +54,7 @@ sub isdir sub isfile { my($self)=@_; - return 1 if($self->state() == $STATE_FILE); - return 0; + return($self->state() == $STATE_FILE); } sub isvalid @@ -67,7 +68,7 @@ sub dest my($self, $mountpoint)=@_; if($self->state() == $STATE_FILE) { - return $self->filename($mountpoint, $self); + return $self->filename($mountpoint); } return "ERROR"; #should never happen? } @@ -82,41 +83,42 @@ sub dirents # print "DIRENTS: FILE: $self->{path}\n"; if($state==$STATE_ALL) { - @dents=($self->artists(), $PATH_ALLTRACKS, $PATH_NOARTIST); + @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 { - @dents=($self->artists(), qw(AND OR), $PATH_ALLTRACKS, $PATH_NOARTIST); + 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) { - @dents=$self->tags(); 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()); } elsif($state==$STATE_ROOT) { - @dents=($self->tags(), qw(ALL NOT)); + @dents=(qw(ALL NOT), $self->tags()); } elsif($state==$STATE_ALBUMS) { - @dents=($self->albums(), $PATH_ALLTRACKS, $PATH_NOALBUM); + @dents=($self->filter($PATH_ALLTRACKS, $PATH_NOALBUM), $self->albums()); } elsif($state==$STATE_TRACKLIST) { @@ -184,11 +186,9 @@ sub parse } 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"; @@ -241,8 +241,7 @@ sub parse # 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; @@ -320,7 +319,6 @@ sub parse } elsif($name eq $PATH_NOARTIST) { - # FIXME $self->state($STATE_TRACKLIST); } else @@ -351,7 +349,7 @@ sub parse # 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; } @@ -373,7 +371,11 @@ sub parse 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}; } @@ -383,7 +385,7 @@ sub elements_to_tree 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); @@ -408,16 +410,16 @@ sub sort_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 && @@ -443,11 +445,11 @@ sub used_tags 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})); } @@ -457,7 +459,7 @@ sub trailing_tag_id { my($self)=@_; my $tail=$self->tail(); - if($tail && ref($tail) eq "ID3FS::PathElement::Tag") + if($self->is("tag", $tail)) { return($tail->{id}); } @@ -468,7 +470,7 @@ sub trailing_tag_parent { my($self)=@_; my $tail=$self->tail(); - if($tail && ref($tail) eq "ID3FS::PathElement::Tag") + if($self->is("tag", $tail)) { return($tail->{parents_id}); } @@ -481,6 +483,22 @@ sub tail 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 { @@ -493,12 +511,12 @@ 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"; @@ -568,16 +586,6 @@ sub tags 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)=@_; @@ -587,11 +595,8 @@ sub artists 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}); @@ -606,26 +611,14 @@ sub albums 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}); @@ -635,18 +628,7 @@ sub albums 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" . @@ -660,18 +642,7 @@ sub artist_albums 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" . @@ -701,33 +672,22 @@ sub tracks 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) { @@ -744,7 +704,7 @@ sub filename { 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" . @@ -754,15 +714,16 @@ sub filename 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}) @@ -818,7 +779,7 @@ sub tags_subselect 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" . @@ -836,109 +797,24 @@ sub bare_not_subselect 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 { @@ -949,7 +825,7 @@ 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)) { @@ -969,61 +845,30 @@ sub constraints_tag_list } } } - 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 "\nFILTER (",$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 "non-empty, accepting: $base / $dir\n"; + print "non-empty, accepting: $base / $dir\n"; push(@outdirs, $dir); } } @@ -1032,59 +877,13 @@ sub filter sub empty { - my($self, $dir, $maxdepth)=@_; - return 0 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;