X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2FID3FS%2FPath%2FNode.pm;h=a0a6b707706075cec46008800ad343a211f17d8c;hb=4d9a3e779039ded464b86ddec75994b540ced90a;hp=f03d0408cae09edd4fcb5ccf2176514a025bd0df;hpb=383168447067bcf6a257ca77eb5c6fd4a95821bc;p=id3fs.git diff --git a/lib/ID3FS/Path/Node.pm b/lib/ID3FS/Path/Node.pm index f03d040..a0a6b70 100644 --- a/lib/ID3FS/Path/Node.pm +++ b/lib/ID3FS/Path/Node.pm @@ -1,8 +1,30 @@ +# id3fs - a FUSE-based filesystem for browsing audio metadata +# Copyright (C) 2010 Ian Beckwith +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + package ID3FS::Path::Node; use strict; use warnings; +require Exporter; +use vars qw(@ISA @EXPORT $TYPE_BOOL $TYPE_TAG $TYPE_ARTIST $TYPE_ALBUM $TYPE_FILE); +@ISA=qw(Exporter); +@EXPORT=qw($TYPE_BOOL $TYPE_TAG $TYPE_ARTIST $TYPE_ALBUM $TYPE_FILE); +($TYPE_BOOL, $TYPE_TAG, $TYPE_ARTIST, $TYPE_ALBUM, $TYPE_FILE)=(1..5); + sub new { my $proto=shift; @@ -10,10 +32,20 @@ sub new my $self={}; bless($self,$class); - $self->left(shift); - $self->op(shift); - $self->right(shift); - + my $db=shift; + $self->{type}=shift; + $self->{name}=shift; + $self->{parents_id}=shift; + if($self->{type} != $TYPE_BOOL) + { + my $table=''; + if ($self->{type} == $TYPE_TAG) { $table="tags"; } + elsif($self->{type} == $TYPE_ARTIST) { $table="artists"; } + elsif($self->{type} == $TYPE_ALBUM) { $table="albums"; } + elsif($self->{type} == $TYPE_FILE) { $table="files"; } + $self->{id}=$db->lookup_id($table, $self->{name}, $self->{parents_id}); + return undef unless(defined($self->{id})); + } return $self; } @@ -27,113 +59,109 @@ sub set return $self->{$name}; } -sub left { return shift->set("left", shift); } -sub right { return shift->set("right", shift); } -sub op { return shift->set("op", shift); } +sub left { return shift->set("left", shift); } +sub right { return shift->set("right", shift); } +sub name { return shift->set("name", shift); } +sub type { return shift->set("type", shift); } +sub id { return shift->set("id", shift); } +sub parents_id { return shift->set("parents_id", shift); } -sub print +sub to_sql { - my($self)=@_; - my $op=$self->op(); - my $left=$self->left(); - my $right=$self->right(); - return "" unless($left || $right); - my $str .= $self->print_node($left); - $str .= (" " . $op->{name} . " ") if($op); - $str .= $self->print_node($right); - if($op || ($left && $right)) + my($self, $hasvals, $not, @joins)=@_; + $not=0 unless(defined($not)); + my @outjoins=(); + unless(@joins) { - $str="(" . $str . ")"; + @outjoins = @joins = ("INNER"); } - return $str; -} + my $str=''; -sub print_node -{ - my($self, $node)=@_; - return "" unless(defined($node)); - return $node->print() if(ref($node) eq "ID3FS::Path::Node"); - return $node->{name}; -} + if($self->type() != $TYPE_BOOL) + { + print $self->{id}, " = ", $self->{name}, "\n"; + $str .= "t" . scalar(@joins) . ".id='" . $self->{id} . "'"; + if($not && !$hasvals) + { + $str = "(" . $str . " AND fxt" . scalar(@joins) . ".files_id IS NULL)"; + } + return ($str, @outjoins); + } -sub to_sql -{ - my($self, $parent, $andlevel)=@_; - $andlevel=1 unless(defined($andlevel)); - my ($leftandlevel, $rightandlevel); - my ($leftstr, $rightstr); - my $op=$self->op(); my $left=$self->left(); my $right=$self->right(); - return ("", $andlevel) unless($left || $right); - ($leftstr, $leftandlevel) = $self->node_to_sql($left, $parent, $andlevel); - $andlevel=$self->max($andlevel, $leftandlevel); - if(defined($op) && (($op->{name} eq "AND") || ($op->{name} eq "NOT"))) - { - $andlevel++; - } - ($rightstr, $rightandlevel) = $self->node_to_sql($right, $parent, $andlevel); - my $str=$leftstr; - $str .= (" " . $op->{name} . " ") if($op); - $str .= $rightstr; - if($op || ($left && $right)) - { - $str="(" . $str . ")"; - } - return($str, $self->max($leftandlevel, $rightandlevel)); -} + return ("", @outjoins) unless($left || $right); -sub node_to_sql -{ - my($self, $node, $parent, $andlevel)=@_; - return ("", $andlevel) unless(defined($node)); - return $node->to_sql($parent, $andlevel) if(ref($node) eq "ID3FS::Path::Node"); - my $sql; - if(defined($node->{parents_id})) - { - print "HIT PARENTS_ID: $node->{parents_id}\n"; - $sql= "(t$andlevel.parents_id='$node->{parents_id}'"; - $sql .= " AND fxt${andlevel}.tags_id='" . $node->{id} . "')"; - } -# elsif($parent) -# { -# print "HIT \$parent\n"; -# $sql= "(t$andlevel.parents_id='$parent')"; -# } - else + my ($leftstr, @leftjoins) = $left->to_sql($hasvals, $not, @joins) if($left); + push(@joins, @leftjoins); + push(@outjoins, @leftjoins); + + my $op=$self->name(); + if(defined($op)) { - $sql= "(t$andlevel.parents_id=''"; - $sql .= " AND fxt${andlevel}.tags_id='" . $node->{id} . "')"; + # if we are ANDing add an inner join + if($op eq "AND") + { + # if right child is a NOT, we don't need extra join/brackets + # NOT will do the same and we will end up with an extra one +# unless($right && $right->name() && $right->name() eq "NOT") +# { + push(@joins, "INNER"); + push(@outjoins, "INNER"); +# } + } + elsif($op eq "NOT") + { + $not=1; + # return an extra join, but don't pass it down to $right->to_sql + # if we are looking for a tag *value*, use INNER join rather than LEFT + push(@outjoins, ($hasvals ? "INNER" : "LEFT")); + } } - return ($sql, $andlevel); + my ($rightstr, @rightjoins) = $right->to_sql($hasvals, $not, @joins) if($right); + push(@outjoins, @rightjoins); + $str = $leftstr; + $str .= " $op " if($op && !$not); + $str .= $rightstr; + $str=("(" . $str . ")") if($op && $left && $right); +# print "LEFT (", scalar(@$leftjoins), "): "; +# print $leftstr if $leftstr; +# print "\n"; +# print "OP: $op\n" if $op; +# print "RIGHT (", scalar(@$rightjoins), "): "; +# print $rightstr if $rightstr; +# print "\n"; + print "OUT(", scalar(@outjoins), "): $str\n"; + return($str, @outjoins); } sub used_tags { my($self)=@_; - my @used=(grep { defined; } ($self->node_used_tags($self->left()), - $self->node_used_tags($self->right()))); - print "used_tags: ", join(", ", @used), "\n"; - return(@used); + if($self->type() == $TYPE_BOOL) + { + my @used=(); + push(@used, $self->left()->used_tags()) if($self->left()); + push(@used, $self->right()->used_tags()) if($self->right()); + return(grep { defined; } @used); + } + return $self->id(); } -sub node_used_tags +# does the bottom right-most expression end in a NOT? +sub right_ends_in_not { my($self, $node)=@_; - return (undef) unless(defined($node)); - return $node->used_tags() if(ref($node) eq "ID3FS::Path::Node"); - if(defined($node->{parents_id})) + return 0 unless($node); + my $right=$node->right(); + if($right && $right->type() == $TYPE_BOOL) { - return([ $node->{parents_id}, $node->{id} ]); + return $self->right_ends_in_not($right); } - return $node->{id}; -} - - -sub max -{ - my($self, $a, $b)=@_; - return(($a > $b) ? $a : $b); + my $op=$node->name(); + return 0 unless($op); + return 1 if($op eq "NOT"); + return 0; } 1;