use ID3FS::PathElement::Tag;
use ID3FS::PathElement::Tagval;
-our ($STATE_INVALID, $STATE_ROOT, $STATE_WANTMORE, $STATE_TAG, $STATE_TAGVAL,
- $STATE_BOOLEAN, $STATE_ARTIST, $STATE_ALBUM, $STATE_FILE)=(0..8);
+our ($STATE_INVALID, $STATE_ROOT, $STATE_TAG, $STATE_TAGVAL,
+ $STATE_BOOLEAN, $STATE_ALBUMS, $STATE_TRACKLIST,
+ $STATE_FILE)=(0..7);
sub new
{
sub isdir
{
my($self)=@_;
- if(($self->state() eq $STATE_FILE) ||
- ($self->state() eq $STATE_INVALID))
+ if(($self->state() == $STATE_FILE) ||
+ ($self->state() == $STATE_INVALID))
{
return 0;
}
return 1;
}
+sub isfile
+{
+ my($self)=@_;
+ return 1 if($self->state() == $STATE_FILE);
+ return 0;
+}
+
sub isvalid
{
my($self)=@_;
sub dest
{
my($self)=@_;
- return "FIXME";
+ if($self->state() == $STATE_FILE)
+ {
+ return $self->{db}->filename(@{$self->{elements}});
+ }
+ return "ERROR"; #should never happen?
}
sub dirents
{
my($self)=@_;
+ my @dents=();
given($self->state())
{
when($STATE_TAG)
{
- return(qw(AND ARTISTS ALBUMS TRACKS));
+ @dents=(qw(AND ALLTRACKS), # FIXME: NOT and OR
+ $self->{db}->artists(@{$self->{elements}}));
}
when($STATE_BOOLEAN)
{
- return $self->{db}->tags(@{$self->{elements}});
+ @dents=$self->{db}->tags(@{$self->{elements}});
}
when($STATE_ROOT)
{
- my @dents=("ALL", $self->{db}->tags(@{$self->{elements}}));
- return @dents;
+ @dents=("ALL", $self->{db}->tags(@{$self->{elements}}));
+ }
+ when($STATE_ALBUMS)
+ {
+ @dents=("TRACKS", $self->{db}->albums(@{$self->{elements}}));
+ }
+ when($STATE_TRACKLIST)
+ {
+ @dents=$self->{db}->tracks(@{$self->{elements}});
}
default
{
print "DIRENTS: UNHANDLED STATE: $_\n";
}
}
+ return(@dents);
}
sub parse
@{$self->{components}}=split(/\//, $self->{path});
shift @{$self->{components}}; # drop empty field before leading /
print "PATH: $self->{path}\n";
- print "COMPONENTS: ", join(' | ', @{$self->{components}}), "\n";
+# print "COMPONENTS: ", join(' | ', @{$self->{components}}), "\n";
$self->state($STATE_ROOT);
return if($self->{path} eq "/");
my @parts=@{$self->{components}};
print "SM: ROOT: $name\n";
if($name eq "ALL")
{
- $self->state($STATE_ARTIST);
+ $self->state($STATE_TAG);
}
else
{
$self->state($STATE_BOOLEAN);
# push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($name));
}
-# when("ARTISTS") { ; }
-# when("ALBUMS") { ; }
-# when("TRACKS") { ; }
-# when("OR") { ; }
-# when("NOT") { ; }
- default
+ when("ALLTRACKS")
{
- $self->state($STATE_INVALID);
+ $self->state($STATE_TRACKLIST);
}
- }
- }
-
- when($STATE_WANTMORE)
- {
- print "SM: WANTMORE: $name\n";
- $tag=ID3FS::PathElement::Tag->new($self->{db}, $name);
- if($tag)
- {
- push(@{$self->{elements}}, $tag);
-# $self->state($STATE_TAG);
- }
- else
- {
- $self->state($STATE_INVALID);
- }
- my @valid_tagvals=$self->{db}->tag_values($tag);
- print "TAGVALUES: $name: ", join(', ', @valid_tagvals), "\n";
- if(@valid_tagvals)
- {
- if(grep { $name eq $_; } @valid_tagvals)
+ when("OR")
+ {
+ $self->state($STATE_BOOLEAN);
+# push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($name));
+ }
+ when("NOT")
{
- print "TAGVAL VALID\n";
- $self->state($STATE_TAGVAL);
- push(@{$self->{elements}}, ID3FS::PathElement::Tagval($name));
+ $self->state($STATE_TAG);
+# push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($name));
+ }
+ my $artist=ID3FS::PathElement::Artist->new($self->{db}, $name);
+ if($artist)
+ {
+ push(@{$self->{elements}}, $artist);
+ $self->state($STATE_ALBUMS);
}
else
{
- print "ERROR: unknown tagval: $tagval\n";
$self->state($STATE_INVALID);
}
}
- else
- {
- $self->state($STATE_INVALID);
- }
}
+
+# when(255) #FIXME - dead code
+# {
+# my @valid_tagvals=$self->{db}->tag_values($tag);
+# print "TAGVALUES: $name: ", join(', ', @valid_tagvals), "\n";
+# if(@valid_tagvals)
+# {
+# if(grep { $name eq $_; } @valid_tagvals)
+# {
+# print "TAGVAL VALID\n";
+# $self->state($STATE_TAGVAL);
+# push(@{$self->{elements}}, ID3FS::PathElement::Tagval($name));
+# }
+# else
+# {
+# print "ERROR: unknown tagval: $tagval\n";
+# $self->state($STATE_INVALID);
+# }
+# }
when($STATE_TAGVAL)
{
print "SM: TAGVAL: $name\n";
$self->state($STATE_INVALID);
}
}
- when($STATE_ARTIST)
+ when($STATE_ALBUMS)
{
- print "SM: ARTIST: $name\n";
+ print "SM: ALBUM: $name\n";
+ if($name eq "TRACKS")
+ {
+ $self->state($STATE_TRACKLIST);
+ }
+ else
+ {
+ my $album=ID3FS::PathElement::Album->new($self->{db}, $name);
+ push(@{$self->{elements}}, $album);
+ if($album)
+ {
+ push(@{$self->{elements}}, $album);
+ $self->state($STATE_TRACKLIST);
+ }
+ else
+ {
+ $self->state($STATE_INVALID);
+ }
+ }
}
- when($STATE_ALBUM)
+ when($STATE_TRACKLIST)
{
- print "SM: ALBUM: $name\n";
+ print "SM: TRACKLIST: $name\n";
+ my $track=ID3FS::PathElement::File->new($self->{db}, $name);
+ push(@{$self->{elements}}, $track);
+ if($track)
+ {
+ push(@{$self->{elements}}, $track);
+ $self->state($STATE_FILE);
+ }
+ else
+ {
+ $self->state($STATE_INVALID);
+ }
}
when($STATE_FILE)
{
print "SM: FILE: $name\n";
+ # Can't have anything after a filename
+ $self->state($STATE_INVALID);
}
default
{