From 8a676b3767d04a91018d608b690e89033db70acd Mon Sep 17 00:00:00 2001
From: Ian Beckwith <ianb@erislabs.net>
Date: Sat, 16 Oct 2010 11:36:54 +0100
Subject: [PATCH] use $PATH_* instead of hardcoded names for TRACKS, NOARTIST
 and NOALBUM dirs

---
 lib/ID3FS/Path.pm | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/lib/ID3FS/Path.pm b/lib/ID3FS/Path.pm
index 5555bb2..bb4eea0 100644
--- a/lib/ID3FS/Path.pm
+++ b/lib/ID3FS/Path.pm
@@ -16,6 +16,10 @@ our ($STATE_INVALID, $STATE_ROOT, $STATE_TAG, $STATE_TAGVAL,
 
 our %priorities=( "OR" => 0, "AND" => 1, "NOT" => 2 );
 
+our $PATH_ALLTRACKS="TRACKS";
+our $PATH_NOARTIST="NOARTIST";
+our $PATH_NOALBUM="NOALBUM";
+
 sub new
 {
     my $proto=shift;
@@ -75,7 +79,7 @@ sub dirents
 #    print "DIRENTS: FILE: $self->{path}\n";
     if($state==$STATE_ALL)
     {
-	push(@dents, qw(TRACKS NOARTIST), $self->artists());
+	push(@dents, $PATH_ALLTRACKS, $PATH_NOARTIST, $self->artists());
     }
     elsif($state==$STATE_TAG || $state==$STATE_TAGVAL)
     {
@@ -89,7 +93,7 @@ sub dirents
 	}
 	else
 	{
-	    push(@dents, qw(AND OR TRACKS NOARTIST), $self->artists());
+	    push(@dents, qw(AND OR), $PATH_ALLTRACKS, $PATH_NOARTIST, $self->artists());
 	}
     }
     elsif($state==$STATE_BOOLEAN)
@@ -109,7 +113,7 @@ sub dirents
     }
     elsif($state==$STATE_ALBUMS)
     {
-	@dents=(qw(TRACKS NOALBUM),$self->albums());
+	@dents=($PATH_ALLTRACKS, $PATH_NOALBUM, $self->albums());
     }
     elsif($state==$STATE_TRACKLIST)
     {
@@ -197,11 +201,11 @@ sub parse
 		    $self->state($STATE_INVALID);
 		}
 	    }
-	    elsif($name eq "TRACKS")
+	    elsif($name eq $PATH_ALLTRACKS)
 	    {
 		$self->state($STATE_TRACKLIST);
 	    }
-	    elsif($name eq "NOARTIST")
+	    elsif($name eq $PATH_NOARTIST)
 	    {
 		$self->state($STATE_TRACKLIST);
 	    }
@@ -263,11 +267,11 @@ sub parse
 	elsif($state==$STATE_ALBUMS)
 	{
 #	    print "SM: ALBUM: $name\n";
-	    if($name eq "TRACKS")
+	    if($name eq $PATH_ALLTRACKS)
 	    {
 		$self->state($STATE_TRACKLIST);
 	    }
-	    elsif($name eq "NOALBUM")
+	    elsif($name eq $PATH_NOALBUM)
 	    {
 		$self->state($STATE_TRACKLIST);
 	    }
@@ -307,12 +311,13 @@ sub parse
 	}
 	elsif($state==$STATE_ALL)
 	{
-	    if($name eq "TRACKS")
+	    if($name eq $PATH_ALLTRACKS)
 	    {
 		$self->state($STATE_TRACKLIST);
 	    }
-	    elsif($name eq "NOARTIST")
+	    elsif($name eq $PATH_NOARTIST)
 	    {
+		# FIXME
 		$self->state($STATE_TRACKLIST);
 	    }
 	    else
@@ -721,7 +726,7 @@ sub tracks
 		 "INNER JOIN files ON files.id=subselect.files_id\n");
     }
     $sql .= "INNER JOIN artists ON files.artists_id=artists.id\n";
-    if($self->{components}->[$#{$self->{components}}] eq "NOARTIST")
+    if($self->{components}->[$#{$self->{components}}] eq $PATH_NOARTIST)
     {
 	$sql .= "WHERE artists.name =''\n";
     }
-- 
2.11.0