mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-11-09 21:22:39 -05:00
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
This commit is contained in:
parent
445d5d5a6e
commit
7396d99027
1 changed files with 10 additions and 6 deletions
|
|
@ -59,18 +59,22 @@ if(! -d $dir or $help) {
|
||||||
sub getdir {
|
sub getdir {
|
||||||
my ($dir) = @_;
|
my ($dir) = @_;
|
||||||
|
|
||||||
opendir(DIR, $dir) || die "can't opendir $dir: $!";
|
if (opendir(DIR, $dir)) {
|
||||||
# my @mp3 = grep { /\.mp3$/ && -f "$dir/$_" } readdir(DIR);
|
# my @mp3 = grep { /\.mp3$/ && -f "$dir/$_" } readdir(DIR);
|
||||||
my @all = readdir(DIR);
|
my @all = readdir(DIR);
|
||||||
closedir DIR;
|
closedir DIR;
|
||||||
return @all;
|
return @all;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
warn "can't opendir $dir: $!\n";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
sub extractmp3 {
|
sub extractmp3 {
|
||||||
my ($dir, @files) = @_;
|
my ($dir, @files) = @_;
|
||||||
my @mp3;
|
my @mp3;
|
||||||
for(@files) {
|
for(@files) {
|
||||||
if( /\.mp3$/ && -f "$dir/$_" ) {
|
if( /\.mp[23]$/ && -f "$dir/$_" ) {
|
||||||
push @mp3, $_;
|
push @mp3, $_;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue