start implementing albums

[id3fs.git] / lib / ID3FS / Path.pm

diff --git a/lib/ID3FS/Path.pm b/lib/ID3FS/Path.pm
index c76c9e6..36eaba2 100644 (file)
--- a/lib/ID3FS/Path.pm
+++ b/lib/ID3FS/Path.pm
@@ -10,8 +10,9 @@ use ID3FS::PathElement::File;
 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_ARTISTS, $STATE_ALBUMS, $STATE_TRACKLIST,
+     $STATE_FILE)=(0..9);
 
 sub new
 {
@@ -47,32 +48,49 @@ sub isvalid
 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 ARTISTS ALBUMS TRACKS);
        }
        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_ARTISTS)
+       {
+           @dents=$self->{db}->artists(@{$self->{elements}});
+       }
+       when($STATE_ALBUMS)
+       {
+           @dents=$self->{db}->albums(@{$self->{elements}});
+       }
+       when($STATE_TRACKLIST)
+       {
+           @dents=$self->{db}->tracks(@{$self->{elements}});
        }
        default
        {
            print "DIRENTS: UNHANDLED STATE: $_\n";
        }
     }
+    return(@dents);
 }
 
 sub parse
@@ -81,7 +99,7 @@ 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}};
@@ -102,7 +120,7 @@ sub parse
                print "SM: ROOT: $name\n";
                if($name eq "ALL")
                {
-                   $self->state($STATE_ARTIST);
+                   $self->state($STATE_ARTISTS);
                }
                else
                {
@@ -128,9 +146,19 @@ sub parse
                        $self->state($STATE_BOOLEAN);
 #                      push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($name));
                    }
-#                  when("ARTISTS") { ; }
-#                  when("ALBUMS")  { ; }
-#                  when("TRACKS")  { ; }
+                   when("ARTISTS")
+                   {
+                       $self->state($STATE_ARTISTS);
+                   }
+                   when("ALBUMS")
+                   {
+                       $self->state($STATE_ALBUMS);
+                   }
+                   when("TRACKS")
+                   {
+                       $self->state($STATE_TRACKLIST);
+                   }
+
 #                  when("OR")  { ; }
 #                  when("NOT") { ; }
                    default
@@ -140,7 +168,7 @@ sub parse
                }
            }
 
-           when($STATE_WANTMORE)
+           when(255) #FIXME - dead code
            {
                print "SM: WANTMORE: $name\n";
                $tag=ID3FS::PathElement::Tag->new($self->{db}, $name);
@@ -192,17 +220,56 @@ sub parse
                    $self->state($STATE_INVALID);
                }
            }
-           when($STATE_ARTIST)
+           when($STATE_ARTISTS)
            {
                print "SM: ARTIST: $name\n";
+               my $artist=ID3FS::PathElement::Artist->new($self->{db}, $name);
+               push(@{$self->{elements}}, $tag);
+               if($artist)
+               {
+                   push(@{$self->{elements}}, $artist);
+                   $self->state($STATE_ALBUMS);
+               }
+               else
+               {
+                   $self->state($STATE_INVALID);
+               }
            }
-           when($STATE_ALBUM)
+           when($STATE_ALBUMS)
            {
                print "SM: ALBUM: $name\n";
+               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_TRACKLIST)
+           {
+               print "SM: TRACKS: $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
            {