}
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();
}
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")
{
@dents=("NOT");
}
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" &&
- $self->{db}->tag_has_values($tag->{id}))
+# 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";
- my $tagval=ID3FS::PathElement::Tag->new($self->{db}, $name, $tag->{id});
+# print "Parsing: parent: $tag->id()\n";
+ my $tagval=ID3FS::PathElement::Tag->new($self->{db}, $name, $tag->id());
if(defined($tagval))
{
$self->state($STATE_TAGVAL);
# 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;
# 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;
}
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 &&
{
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}));
+ 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});
+ return($tail->id());
}
return undef;
}
{
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
{
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});
+ return $self->artist_albums($tail->id());
}
my $sql=$self->sql_start("albums.name");
$sql .= ("INNER JOIN albums ON files.albums_id=albums.id\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});
+ 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};
+ $artist_id=$artist->id();
}
- return $self->album_tracks($artist_id, $tail->{id});
+ return $self->album_tracks($artist_id, $tail->id());
}
my $sql=$self->sql_start("files.name");
$sql .= "INNER JOIN artists ON files.artists_id=artists.id\n";
{
my($self, $mountpoint)=@_;
my $tail=$self->tail();
- if(ref($tail) eq "ID3FS::PathElement::File")
+ if($self->is("file", $tail))
{
- my $id=$tail->{id};
+ my $id=$tail->id();
my $sql=("SELECT paths.name, files.name FROM files\n" .
"INNER JOIN paths ON files.paths_id=paths.id\n" .
"WHERE files.id=?\n" .
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" .
"\t\tWHERE ");
if(scalar(@tags) > 1)
{
- $sql .= ("(t1.parents_id='" . $tags[0]->{id} . "' AND t1.id='" .
- $tags[1]->{id} . "')");
+ $sql .= ("(t1.parents_id='" . $tags[0]->id() . "' AND t1.id='" .
+ $tags[1]->id() . "')");
}
else
{
- $sql .= ("(t1.parents_id='' AND t1.id='" . $tags[0]->{id} . "')");
+ $sql .= ("(t1.parents_id='' AND t1.id='" . $tags[0]->id() . "')");
}
$sql .= "\n\t\tGROUP BY fxt1.files_id\n\t)\n";
return($sql);
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))
{
# print "TAGVAL\n";
- push(@tags_vals, [$lasttag, $constraint->{id}]) if defined($constraint->{id});
+ push(@tags_vals, [$lasttag, $constraint->id()]) if defined($constraint->id());
$lasttag=undef;
}
- elsif($self->tag_has_values($constraint->{id}))
+ elsif($self->tag_has_values($constraint->id()))
{
# print "HASVALUES\n";
- $lasttag=$constraint->{id} if defined($constraint->{id});
+ $lasttag=$constraint->id() if defined($constraint->id());
}
else
{
# print "NOVALUES\n";
- push(@tags, $constraint->{id}) if(defined($constraint->{id}));
+ push(@tags, $constraint->id()) if(defined($constraint->id()));
}
}
}