diff options
author | Björn Stenberg <bjorn@haxx.se> | 2005-01-17 13:50:08 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2005-01-17 13:50:08 +0000 |
commit | 7396d99027410feda4661f860df90509783b50c5 (patch) | |
tree | b3073fcdb86b59bae41c6b589b9d039d88bb0868 /tools | |
parent | 445d5d5a6eddd63baa8b38fb57f9aed304d3758f (diff) | |
download | rockbox-7396d99027410feda4661f860df90509783b50c5.tar.gz rockbox-7396d99027410feda4661f860df90509783b50c5.zip |
Don't die on opendir() failure. Index .mp2 files too.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5581 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/songdb.pl | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/tools/songdb.pl b/tools/songdb.pl index f61bc29661..bfea05314d 100755 --- a/tools/songdb.pl +++ b/tools/songdb.pl | |||
@@ -59,18 +59,22 @@ if(! -d $dir or $help) { | |||
59 | sub getdir { | 59 | sub getdir { |
60 | my ($dir) = @_; | 60 | my ($dir) = @_; |
61 | 61 | ||
62 | opendir(DIR, $dir) || die "can't opendir $dir: $!"; | 62 | if (opendir(DIR, $dir)) { |
63 | # my @mp3 = grep { /\.mp3$/ && -f "$dir/$_" } readdir(DIR); | 63 | # my @mp3 = grep { /\.mp3$/ && -f "$dir/$_" } readdir(DIR); |
64 | my @all = readdir(DIR); | 64 | my @all = readdir(DIR); |
65 | closedir DIR; | 65 | closedir DIR; |
66 | return @all; | 66 | return @all; |
67 | } | ||
68 | else { | ||
69 | warn "can't opendir $dir: $!\n"; | ||
70 | } | ||
67 | } | 71 | } |
68 | 72 | ||
69 | sub extractmp3 { | 73 | sub extractmp3 { |
70 | my ($dir, @files) = @_; | 74 | my ($dir, @files) = @_; |
71 | my @mp3; | 75 | my @mp3; |
72 | for(@files) { | 76 | for(@files) { |
73 | if( /\.mp3$/ && -f "$dir/$_" ) { | 77 | if( /\.mp[23]$/ && -f "$dir/$_" ) { |
74 | push @mp3, $_; | 78 | push @mp3, $_; |
75 | } | 79 | } |
76 | } | 80 | } |