X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2FID3FS%2FPath.pm;h=25e4092b59e6306ebea4b41508dff77e7ea11ec9;hb=eb98d37f4a2ff614889f70f0dfa639ac8600a920;hp=1babe7de7597a5278fd862556d04d9bb2068e591;hpb=fa93319dda0cc1919e135d6c93e93f8a11c8d1c6;p=id3fs.git

diff --git a/lib/ID3FS/Path.pm b/lib/ID3FS/Path.pm
index 1babe7d..25e4092 100644
--- a/lib/ID3FS/Path.pm
+++ b/lib/ID3FS/Path.pm
@@ -2,7 +2,6 @@ package ID3FS::Path;
 
 use strict;
 use warnings;
-use feature 'switch';
 use ID3FS::PathElement::Artist;
 use ID3FS::PathElement::Album;
 use ID3FS::PathElement::Boolean;
@@ -11,8 +10,8 @@ use ID3FS::PathElement::Tag;
 use ID3FS::PathElement::Tagval;
 
 our ($STATE_INVALID, $STATE_ROOT, $STATE_TAG, $STATE_TAGVAL,
-     $STATE_BOOLEAN, $STATE_ARTISTS, $STATE_ALBUMS, $STATE_TRACKLIST,
-     $STATE_FILE)=(0..8);
+     $STATE_BOOLEAN, $STATE_ALBUMS, $STATE_TRACKLIST,
+     $STATE_FILE)=(0..7);
 
 sub new
 {
@@ -24,21 +23,28 @@ sub new
     $self->{db}=shift;
     $self->{path}=shift;
     $self->parse();
-    print "STATE: ", $self->state(), "\n";
+#    print "STATE: ", $self->state(), "\n";
     return $self;
 }
 
 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)=@_;
@@ -47,10 +53,10 @@ sub isvalid
 
 sub dest
 {
-    my($self)=@_;
+    my($self, $mountpoint)=@_;
     if($self->state() == $STATE_FILE)
     {
-	return $self->{db}->filename(@{$self->{elements}});
+	return $self->{db}->filename($mountpoint, @{$self->{elements}});
     }
     return "ERROR"; #should never happen?
 }
@@ -59,36 +65,50 @@ sub dirents
 {
     my($self)=@_;
     my @dents=();
-    given($self->state())
+    my $state=$self->state();
+#    print "DIRENTS: STATE: $state\n";
+    if($state==$STATE_TAG || $state==$STATE_TAGVAL)
     {
-	when($STATE_TAG)
-	{
-	    @dents=qw(AND ARTISTS ALBUMS TRACKS);
-	}
-	when($STATE_BOOLEAN)
-	{
-	    @dents=$self->{db}->tags(@{$self->{elements}});
-	}
-	when($STATE_ROOT)
-	{
-	    @dents=("ALL", $self->{db}->tags(@{$self->{elements}}));
-	}
-	when($STATE_ARTISTS)
+	my $tag=$self->{elements}->[$#{$self->{elements}}];
+	if($state==$STATE_TAG &&
+	   defined($tag) &&
+	   ref($tag) eq "ID3FS::PathElement::Tag" &&
+	   $self->{db}->tag_has_values($tag->{id}))
 	{
-	    @dents=$self->{db}->artists(@{$self->{elements}});
+	    @dents=$self->{db}->tag_values($tag->{id});
 	}
-	when($STATE_ALBUMS)
+	else
 	{
-	    @dents=$self->{db}->albums(@{$self->{elements}});
+	    @dents=(qw(AND OR TRACKS NOARTIST),
+		    $self->{db}->artists(@{$self->{elements}}));
 	}
-	when($STATE_TRACKLIST)
-	{
-	    @dents=$self->{db}->tracks(@{$self->{elements}});
-	}
-	default
+    }
+    elsif($state==$STATE_BOOLEAN)
+    {
+	my $parent=$self->{elements}->[$#{$self->{elements}}];
+	unless(defined($parent) &&
+	       ref($parent) eq "ID3FS::PathElement::Boolean" &&
+	       $parent->{name} eq "NOT")
 	{
-	    print "DIRENTS: UNHANDLED STATE: $_\n";
+	    push(@dents, "NOT");
 	}
+	push(@dents, $self->{db}->tags(@{$self->{elements}}));
+    }
+    elsif($state==$STATE_ROOT)
+    {
+	@dents=(qw(ALL NOT), $self->{db}->tags(@{$self->{elements}}));
+    }
+    elsif($state==$STATE_ALBUMS)
+    {
+	@dents=(qw(TRACKS NOALBUM),$self->{db}->albums(@{$self->{elements}}));
+    }
+    elsif($state==$STATE_TRACKLIST)
+    {
+	@dents=$self->{db}->tracks(@{$self->{elements}});
+    }
+    else
+    {
+	print "DIRENTS: UNHANDLED STATE: $state\n";
     }
     return(@dents);
 }
@@ -98,8 +118,7 @@ sub parse
     my($self)=@_;
     @{$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 "PATH: $self->{path}\n";
     $self->state($STATE_ROOT);
     return if($self->{path} eq "/");
     my @parts=@{$self->{components}};
@@ -107,124 +126,81 @@ sub parse
     $self->{elements}=[];
     while(my $name=shift @parts)
     {
-	print "NAME: $name\n";
-	given($self->state())
+#	print "NAME: $name\n";
+	my $state=$self->state();
+	if($state==$STATE_INVALID)
+	{
+#	    print "SM: INVALID: $name\n";
+	    return;
+	}
+	elsif($state==$STATE_ROOT)
 	{
-	    when($STATE_INVALID)
+#	    print "SM: ROOT: $name\n";
+	    if($name eq "ALL")
 	    {
-		print "SM: INVALID: $name\n";
-		return;
+		$self->state($STATE_TAG);
 	    }
-	    when($STATE_ROOT)
+	    elsif($name eq "NOT")
 	    {
-		print "SM: ROOT: $name\n";
-		if($name eq "ALL")
-		{
-		    $self->state($STATE_ARTISTS);
-		}
-		else
-		{
-		    $tag=ID3FS::PathElement::Tag->new($self->{db}, $name);
-		    if($tag)
-		    {
-			push(@{$self->{elements}}, $tag);
-			$self->state($STATE_TAG);
-		    }
-		    else
-		    {
-			$self->state($STATE_INVALID);
-		    }
-		}
-	    }
-	    when($STATE_TAG)
-	    {
-		print "SM: TAG: $name\n";
-		given($name)
-		{
-		    when("AND")
-		    {
-			$self->state($STATE_BOOLEAN);
-#			push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($name));
-		    }
-		    when("ARTISTS")
-		    {
-			$self->state($STATE_ARTISTS);
-		    }
-		    when("ALBUMS")
-		    {
-			$self->state($STATE_ALBUMS);
-		    }
-		    when("TRACKS")
-		    {
-			$self->state($STATE_TRACKLIST);
-		    }
-
-#		    when("OR")  { ; }
-#		    when("NOT") { ; }
-		    default
-		    {
-			$self->state($STATE_INVALID);
-		    }
-		}
+	        push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($name));
+		$self->state($STATE_BOOLEAN);
 	    }
-
-	    when(255) #FIXME - dead code
+	    else
 	    {
-		print "SM: WANTMORE: $name\n";
 		$tag=ID3FS::PathElement::Tag->new($self->{db}, $name);
 		if($tag)
 		{
 		    push(@{$self->{elements}}, $tag);
-#		    $self->state($STATE_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)
+	    }
+	}
+	elsif($state==$STATE_TAG || $state==$STATE_TAGVAL)
+	{
+#	    print "SM: TAG/TAGVAL($state): $name\n";
+	    my $tag=$self->{elements}->[$#{$self->{elements}}];
+	    if($state==$STATE_TAG &&
+	       defined($tag) &&
+	       ref($tag) eq "ID3FS::PathElement::Tag" &&
+	       $self->{db}->tag_has_values($tag->{id}))
+	    {
+		my $tagval=ID3FS::PathElement::Tagval->new($name);
+		if(defined($tagval))
 		{
-		    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);
-		    }
+		    $self->state($STATE_TAGVAL);
+		    # stay in tag state
+		    push(@{$self->{elements}}, $tagval);
 		}
 		else
 		{
 		    $self->state($STATE_INVALID);
 		}
 	    }
-	    when($STATE_TAGVAL)
+	    elsif($name eq "TRACKS")
 	    {
-		print "SM: TAGVAL: $name\n";
+		$self->state($STATE_TRACKLIST);
 	    }
-	    when($STATE_BOOLEAN)
+	    elsif($name eq "NOARTIST")
 	    {
-		print "SM: BOOLEAN: $name\n";
-		my $tag=ID3FS::PathElement::Tag->new($self->{db}, $name);
-		if($tag)
-		{
-		    push(@{$self->{elements}}, $tag);
-		    $self->state($STATE_TAG);
-		}
-		else
-		{
-		    $self->state($STATE_INVALID);
-		}
+		$self->state($STATE_TRACKLIST);
+	    }
+	    elsif($name eq "AND")
+	    {
+		$self->state($STATE_BOOLEAN);
+	        push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($name));
+	    }
+	    elsif($name eq "OR")
+	    {
+		$self->state($STATE_BOOLEAN);
+	        push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($name));
 	    }
-	    when($STATE_ARTISTS)
+	    else
 	    {
-		print "SM: ARTIST: $name\n";
 		my $artist=ID3FS::PathElement::Artist->new($self->{db}, $name);
-		push(@{$self->{elements}}, $tag);
 		if($artist)
 		{
 		    push(@{$self->{elements}}, $artist);
@@ -235,48 +211,87 @@ sub parse
 		    $self->state($STATE_INVALID);
 		}
 	    }
-	    when($STATE_ALBUMS)
+	}
+	elsif($state==$STATE_BOOLEAN)
+	{
+#	    print "SM: BOOLEAN: $name\n";
+	    my $parent=$self->{elements}->[$#{$self->{elements}}];
+	    my $allownot=1;
+	    if(defined($parent) &&
+	       ref($parent) eq "ID3FS::PathElement::Boolean" &&
+	       $parent->{name} eq "NOT")
 	    {
-		print "SM: ALBUM: $name\n";
-		my $album=ID3FS::PathElement::Album->new($self->{db}, $name);
-		push(@{$self->{elements}}, $album);
-		if($album)
+		$allownot=0;
+	    }
+	    if($allownot && $name eq "NOT")
+	    {
+		$self->state($STATE_BOOLEAN);
+	        push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($name));
+	    }
+	    else
+	    {
+		my $tag=ID3FS::PathElement::Tag->new($self->{db}, $name);
+		if($tag)
 		{
-		    push(@{$self->{elements}}, $album);
-		    $self->state($STATE_TRACKLIST);
+		    push(@{$self->{elements}}, $tag);
+		    $self->state($STATE_TAG);
 		}
 		else
 		{
 		    $self->state($STATE_INVALID);
 		}
 	    }
-	    when($STATE_TRACKLIST)
+	}
+	elsif($state==$STATE_ALBUMS)
+	{
+#	    print "SM: ALBUM: $name\n";
+	    if($name eq "TRACKS")
 	    {
-		print "SM: TRACKS: $name\n";
-		my $track=ID3FS::PathElement::File->new($self->{db}, $name);
-		push(@{$self->{elements}}, $track);
-		if($track)
+		$self->state($STATE_TRACKLIST);
+	    }
+	    elsif($name eq "NOALBUM")
+	    {
+		$self->state($STATE_TRACKLIST);
+	    }
+	    else
+	    {
+		my $album=ID3FS::PathElement::Album->new($self->{db}, $name);
+		if($album)
 		{
-		    push(@{$self->{elements}}, $track);
-		    $self->state($STATE_FILE);
+		    push(@{$self->{elements}}, $album);
+		    $self->state($STATE_TRACKLIST);
 		}
 		else
 		{
 		    $self->state($STATE_INVALID);
 		}
 	    }
-	    when($STATE_FILE)
+	}
+	elsif($state==$STATE_TRACKLIST)
+	{
+#	    print "SM: TRACKLIST: $name\n";
+	    my $track=ID3FS::PathElement::File->new($self->{db}, $name);
+	    if($track)
 	    {
-		print "SM: FILE: $name\n";
-		# Can't have anything after a filename
-		$self->state($STATE_INVALID);
+		push(@{$self->{elements}}, $track);
+		$self->state($STATE_FILE);
 	    }
-	    default
+	    else
 	    {
-		print "SM: ERROR: UNKNOWN STATE: $self->{state}\n";
 		$self->state($STATE_INVALID);
 	    }
 	}
+	elsif($state==$STATE_FILE)
+	{
+#	    print "SM: FILE: $name\n";
+	    # Can't have anything after a filename
+	    $self->state($STATE_INVALID);
+	}
+	else
+	{
+	    print "SM: ERROR: UNKNOWN STATE: $self->{state}\n";
+	    $self->state($STATE_INVALID);
+	}
     }
 }