projects
/
id3fs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove unnecessary code
[id3fs.git]
/
lib
/
ID3FS
/
Path.pm
diff --git
a/lib/ID3FS/Path.pm
b/lib/ID3FS/Path.pm
index
dc5ea7e
..
86d469d
100644
(file)
--- a/
lib/ID3FS/Path.pm
+++ b/
lib/ID3FS/Path.pm
@@
-99,7
+99,8
@@
sub dirents
}
elsif($state==$STATE_TAG || $state==$STATE_TAGVAL)
{
}
elsif($state==$STATE_TAG || $state==$STATE_TAGVAL)
{
- if($state==$STATE_TAG && $self->at("tag") &&
+ my $tail=$self->tail();
+ if($state==$STATE_TAG && $self->is($TYPE_TAG, $tail) &&
$self->{db}->tag_has_values($self->tail()->id()))
{
@dents=$self->tags();
$self->{db}->tag_has_values($self->tail()->id()))
{
@dents=$self->tags();
@@
-116,7
+117,7
@@
sub dirents
elsif($state==$STATE_BOOLEAN)
{
my $parent=$self->tail();
elsif($state==$STATE_BOOLEAN)
{
my $parent=$self->tail();
- unless($self->is(
"boolean"
, $parent) &&
+ unless($self->is(
$TYPE_BOOL
, $parent) &&
$parent->{name} eq "NOT")
{
@dents=("NOT");
$parent->{name} eq "NOT")
{
@dents=("NOT");
@@
-142,6
+143,7
@@
sub dirents
return(\@dents, \@fents);
}
return(\@dents, \@fents);
}
+# State Machine Of Doom
sub parse
{
my($self)=@_;
sub parse
{
my($self)=@_;
@@
-176,12
+178,12
@@
sub parse
elsif($name eq "NOT")
{
$root_not=1;
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
{
$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);
if($tag)
{
push(@{$self->{elements}}, $tag);
@@
-198,11
+200,11
@@
sub parse
{
my $tag=$self->tail();
# print "SM: TAG/TAGVAL($state): $name\n";
{
my $tag=$self->tail();
# print "SM: TAG/TAGVAL($state): $name\n";
- if($state==$STATE_TAG && $self->is(
"tag"
, $tag) &&
+ if($state==$STATE_TAG && $self->is(
$TYPE_TAG
, $tag) &&
$self->{db}->tag_has_values($tag->id()))
{
# print "Parsing: parent: $tag->id()\n";
$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);
if(defined($tagval))
{
$self->state($STATE_TAGVAL);
@@
-225,16
+227,16
@@
sub parse
elsif($name eq "AND")
{
$self->state($STATE_BOOLEAN);
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);
}
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
{
}
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);
if($artist)
{
push(@{$self->{elements}}, $artist);
@@
-251,7
+253,7
@@
sub parse
# print "SM: BOOLEAN: $name\n";
my $parent=$self->tail();
my $allownot=1;
# 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;
$parent->{name} eq "NOT")
{
$allownot=0;
@@
-259,11
+261,11
@@
sub parse
if($allownot && $name eq "NOT")
{
$self->state($STATE_BOOLEAN);
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
{
}
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);
if($tag)
{
push(@{$self->{elements}}, $tag);
@@
-289,7
+291,7
@@
sub parse
}
else
{
}
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);
if($album)
{
push(@{$self->{elements}}, $album);
@@
-304,7
+306,7
@@
sub parse
elsif($state==$STATE_TRACKLIST)
{
# print "SM: TRACKLIST: $name\n";
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);
if($track)
{
push(@{$self->{elements}}, $track);
@@
-333,7
+335,7
@@
sub parse
}
else
{
}
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);
if($artist)
{
push(@{$self->{elements}}, $artist);
@@
-354,7
+356,7
@@
sub parse
# remove trailing boolean
my @elements=@{$self->{elements}};
# remove trailing boolean
my @elements=@{$self->{elements}};
- while(@elements && $self->is(
"boolean"
, $elements[$#elements]))
+ while(@elements && $self->is(
$TYPE_BOOL
, $elements[$#elements]))
{
pop @elements;
}
{
pop @elements;
}
@@
-388,7
+390,7
@@
sub elements_to_tree
return undef unless(@$elements);
my ($left, $right, $op)=(undef, undef, undef);
my $thing=pop @$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")
{
$right=$self->elements_to_tree($elements);
if($thing->{name} ne "NOT")
@@
-410,16
+412,16
@@
sub sort_elements
# print "INPUT: ", join(', ', map { $_->{name}; } @input), "\n";
while(my $thing = shift @input)
{
# 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
{
# 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);
}
{
$thing=shift @input;
}
push(@output, $thing);
}
- elsif($self->is(
"boolean"
, $thing))
+ elsif($self->is(
$TYPE_BOOL
, $thing))
{
# bool
while(@opstack &&
{
# bool
while(@opstack &&
@@
-449,7
+451,7
@@
sub expecting_values
{
my($self)=@_;
my $tail=$self->tail();
{
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()));
}
{
return($self->{db}->tag_has_values($tail->id()));
}
@@
-459,7
+461,7
@@
sub trailing_tag_id
{
my($self)=@_;
my $tail=$self->tail();
{
my($self)=@_;
my $tail=$self->tail();
- if($self->is(
"tag"
, $tail))
+ if($self->is(
$TYPE_TAG
, $tail))
{
return($tail->id());
}
{
return($tail->id());
}
@@
-470,7
+472,7
@@
sub trailing_tag_parent
{
my($self)=@_;
my $tail=$self->tail();
{
my($self)=@_;
my $tail=$self->tail();
- if($self->is(
"tag"
, $tail))
+ if($self->is(
$TYPE_TAG
, $tail))
{
return($tail->{parents_id});
}
{
return($tail->{parents_id});
}
@@
-483,18
+485,12
@@
sub tail
return($self->{elements}->[$#{$self->{elements}}]);
}
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());
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;
}
return 0;
}
@@
-589,7
+585,7
@@
sub albums
my($self)=@_;
my @ids=();
my $tail=$self->tail();
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());
}
{
return $self->artist_albums($tail->id());
}
@@
-649,15
+645,15
@@
sub tracks
{
my($self)=@_;
my $tail=$self->tail();
{
my($self)=@_;
my $tail=$self->tail();
- if($self->is(
"artist"
, $tail))
+ if($self->is(
$TYPE_ARTIST
, $tail))
{
return $self->artist_tracks($tail->id());
}
{
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();
{
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();
{
# should always happen
$artist_id=$artist->id();
@@
-681,7
+677,7
@@
sub filename
{
my($self, $mountpoint)=@_;
my $tail=$self->tail();
{
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" .
{
my $id=$tail->id();
my $sql=("SELECT paths.name, files.name FROM files\n" .
@@
-801,12
+797,12
@@
sub in_or
my($self)=@_;
my $tail=$self->tail();
return 0 unless($tail);
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 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;
}
return 1 if($parent->name() eq "OR");
return 0;
}