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

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) {
 sub getdir {
     my ($dir) = @_;
 
-    opendir(DIR, $dir) || die "can't opendir $dir: $!";
-    #   my @mp3 = grep { /\.mp3$/ && -f "$dir/$_" } readdir(DIR);
-    my @all = readdir(DIR);
-    closedir DIR;
-    return @all;
+    if (opendir(DIR, $dir)) {
+        #   my @mp3 = grep { /\.mp3$/ && -f "$dir/$_" } readdir(DIR);
+        my @all = readdir(DIR);
+        closedir DIR;
+        return @all;
+    }
+    else {
+        warn "can't opendir $dir: $!\n";
+    }
 }
 
 sub extractmp3 {
     my ($dir, @files) = @_;
     my @mp3;
     for(@files) {
-        if( /\.mp3$/ && -f "$dir/$_" ) {
+        if( /\.mp[23]$/ && -f "$dir/$_" ) {
             push @mp3, $_;
         }
     }