From: Ian Beckwith <ianb@erislabs.net>
Date: Sun, 17 Oct 2010 06:03:23 +0000 (+0100)
Subject: revert dirent reordering
X-Git-Tag: debian/1.0-1~75
X-Git-Url: http://erislabs.net/gitweb/?p=id3fs.git;a=commitdiff_plain;h=816412478a46e87db92c44a11101cc4b0b172325

revert dirent reordering
---

diff --git a/lib/ID3FS/Path.pm b/lib/ID3FS/Path.pm
index 4ef3a54..0455375 100644
--- a/lib/ID3FS/Path.pm
+++ b/lib/ID3FS/Path.pm
@@ -81,7 +81,7 @@ sub dirents
 #    print "DIRENTS: FILE: $self->{path}\n";
     if($state==$STATE_ALL)
     {
-	@dents=($self->artists(), $PATH_ALLTRACKS, $PATH_NOARTIST);
+	@dents=($PATH_ALLTRACKS, $PATH_NOARTIST, $self->artists());
     }
     elsif($state==$STATE_TAG || $state==$STATE_TAGVAL)
     {
@@ -95,27 +95,27 @@ sub dirents
 	}
 	else
 	{
-	    @dents=($self->artists(), qw(AND OR), $PATH_ALLTRACKS, $PATH_NOARTIST);
+	    @dents=(qw(AND OR), $PATH_ALLTRACKS, $PATH_NOARTIST, $self->artists());
 	}
     }
     elsif($state==$STATE_BOOLEAN)
     {
-	@dents=$self->tags();
 	my $parent=$self->tail();
 	unless(defined($parent) &&
 	       ref($parent) eq "ID3FS::PathElement::Boolean" &&
 	       $parent->{name} eq "NOT")
 	{
-	    push(@dents, "NOT");
+	    @dents=("NOT");
 	}
+	push(@dents,$self->tags());
     }
     elsif($state==$STATE_ROOT)
     {
-	@dents=($self->tags(), qw(ALL NOT));
+	@dents=(qw(ALL NOT), $self->tags());
     }
     elsif($state==$STATE_ALBUMS)
     {
-	@dents=($self->albums(), $PATH_ALLTRACKS, $PATH_NOALBUM);
+	@dents=($PATH_ALLTRACKS, $PATH_NOALBUM, $self->albums());
     }
     elsif($state==$STATE_TRACKLIST)
     {