diff options
| author | Jonas Häggqvist <rasher@rasher.dk> | 2005-04-13 12:52:34 +0000 |
|---|---|---|
| committer | Jonas Häggqvist <rasher@rasher.dk> | 2005-04-13 12:52:34 +0000 |
| commit | c5056b1d7f6e1d9811b01ef14b3afe2724db0a3b (patch) | |
| tree | 7e2cbd2f25e892e5696bec7c099f73d2c782be0b | |
| parent | a32a74e5910e979714b5e3384be369cc722ae03d (diff) | |
| download | rockbox-c5056b1d7f6e1d9811b01ef14b3afe2724db0a3b.tar.gz rockbox-c5056b1d7f6e1d9811b01ef14b3afe2724db0a3b.zip | |
Almost supports multiple-artist albums - needs a special case for songs with no album tag
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6279 a1c6a512-1295-4272-9138-f99709370657
| -rwxr-xr-x | tools/songdb.pl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/songdb.pl b/tools/songdb.pl index 69a3b0ae1b..987fb61972 100755 --- a/tools/songdb.pl +++ b/tools/songdb.pl | |||
| @@ -181,11 +181,11 @@ sub dodir { | |||
| 181 | $$id3{'ALBUM'} = "<no album tag>" if ($$id3{'ALBUM'} eq ""); | 181 | $$id3{'ALBUM'} = "<no album tag>" if ($$id3{'ALBUM'} eq ""); |
| 182 | $$id3{'TITLE'} = "<no title tag>" if ($$id3{'TITLE'} eq ""); | 182 | $$id3{'TITLE'} = "<no title tag>" if ($$id3{'TITLE'} eq ""); |
| 183 | 183 | ||
| 184 | # prepend Artist name to handle duplicate album names from other | 184 | # Append dirname, to handle multi-artist albums |
| 185 | # artists | 185 | $$id3{'DIR'} = $dir; |
| 186 | my $albumid = $id3->{'ALBUM'}."___".$id3->{'ARTIST'}; | 186 | my $albumid = $id3->{'ALBUM'}."___".$$id3{'DIR'}; |
| 187 | 187 | ||
| 188 | if($albumid ne "<no album tag>___<no artist tag>") { | 188 | if($id3->{'ALBUM'}."___".$id3->{'ARTIST'} ne "<no album tag>___<no artist tag>") { |
| 189 | my $num = ++$albums{$albumid}; | 189 | my $num = ++$albums{$albumid}; |
| 190 | if($num > $maxsongperalbum) { | 190 | if($num > $maxsongperalbum) { |
| 191 | $maxsongperalbum = $num; | 191 | $maxsongperalbum = $num; |
| @@ -443,7 +443,7 @@ if ($db) { | |||
| 443 | 443 | ||
| 444 | for (sort keys %{$artist2albums{$artist}}) { | 444 | for (sort keys %{$artist2albums{$artist}}) { |
| 445 | my $id3 = $artist2albums{$artist}{$_}; | 445 | my $id3 = $artist2albums{$artist}{$_}; |
| 446 | my $a = $albumcount{"$$id3{'ALBUM'}___$$id3{'ARTIST'}"} * $albumentrysize; | 446 | my $a = $albumcount{"$$id3{'ALBUM'}___$$id3{'DIR'}"} * $albumentrysize; |
| 447 | dumpint($a + $albumindex); | 447 | dumpint($a + $albumindex); |
| 448 | } | 448 | } |
| 449 | 449 | ||