projects
/
id3fs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b98ccb0
)
use $PATH_* instead of hardcoded names for TRACKS, NOARTIST and NOALBUM dirs
author
Ian Beckwith
<ianb@erislabs.net>
Sat, 16 Oct 2010 10:36:54 +0000
(11:36 +0100)
committer
Ian Beckwith
<ianb@erislabs.net>
Sat, 16 Oct 2010 10:36:54 +0000
(11:36 +0100)
lib/ID3FS/Path.pm
patch
|
blob
|
history
diff --git
a/lib/ID3FS/Path.pm
b/lib/ID3FS/Path.pm
index
5555bb2
..
bb4eea0
100644
(file)
--- 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 %priorities=( "OR" => 0, "AND" => 1, "NOT" => 2 );
+our $PATH_ALLTRACKS="TRACKS";
+our $PATH_NOARTIST="NOARTIST";
+our $PATH_NOALBUM="NOALBUM";
+
sub new
{
my $proto=shift;
sub new
{
my $proto=shift;
@@
-75,7
+79,7
@@
sub dirents
# print "DIRENTS: FILE: $self->{path}\n";
if($state==$STATE_ALL)
{
# 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)
{
}
elsif($state==$STATE_TAG || $state==$STATE_TAGVAL)
{
@@
-89,7
+93,7
@@
sub dirents
}
else
{
}
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)
}
}
elsif($state==$STATE_BOOLEAN)
@@
-109,7
+113,7
@@
sub dirents
}
elsif($state==$STATE_ALBUMS)
{
}
elsif($state==$STATE_ALBUMS)
{
- @dents=(
qw(TRACKS NOALBUM),
$self->albums());
+ @dents=(
$PATH_ALLTRACKS, $PATH_NOALBUM,
$self->albums());
}
elsif($state==$STATE_TRACKLIST)
{
}
elsif($state==$STATE_TRACKLIST)
{
@@
-197,11
+201,11
@@
sub parse
$self->state($STATE_INVALID);
}
}
$self->state($STATE_INVALID);
}
}
- elsif($name eq
"TRACKS"
)
+ elsif($name eq
$PATH_ALLTRACKS
)
{
$self->state($STATE_TRACKLIST);
}
{
$self->state($STATE_TRACKLIST);
}
- elsif($name eq
"NOARTIST"
)
+ elsif($name eq
$PATH_NOARTIST
)
{
$self->state($STATE_TRACKLIST);
}
{
$self->state($STATE_TRACKLIST);
}
@@
-263,11
+267,11
@@
sub parse
elsif($state==$STATE_ALBUMS)
{
# print "SM: ALBUM: $name\n";
elsif($state==$STATE_ALBUMS)
{
# print "SM: ALBUM: $name\n";
- if($name eq
"TRACKS"
)
+ if($name eq
$PATH_ALLTRACKS
)
{
$self->state($STATE_TRACKLIST);
}
{
$self->state($STATE_TRACKLIST);
}
- elsif($name eq
"NOALBUM"
)
+ elsif($name eq
$PATH_NOALBUM
)
{
$self->state($STATE_TRACKLIST);
}
{
$self->state($STATE_TRACKLIST);
}
@@
-307,12
+311,13
@@
sub parse
}
elsif($state==$STATE_ALL)
{
}
elsif($state==$STATE_ALL)
{
- if($name eq
"TRACKS"
)
+ if($name eq
$PATH_ALLTRACKS
)
{
$self->state($STATE_TRACKLIST);
}
{
$self->state($STATE_TRACKLIST);
}
- elsif($name eq
"NOARTIST"
)
+ elsif($name eq
$PATH_NOARTIST
)
{
{
+ # FIXME
$self->state($STATE_TRACKLIST);
}
else
$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";
"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";
}
{
$sql .= "WHERE artists.name =''\n";
}