Improvements on listDir function of SDIndex - Posibility to scan only the parent directory

[hash6iron]

Hi @pschatzmann,

I'd like to propose you an improvement in this function below, the possibility to scan files for AudioSourceIdxSDFAT and AudioSourceSDFAT only on parent directory and not in the rest of directories (next directories level)

The original version

  void listDir(Print &idxfile, const char *dirname) {
    LOGD("listDir: %s", dirname);
    FileT root = open(dirname);
    if (!root) {
      LOGE("Open failed: %s", dirname);
      popPath();
      return;
    }
    if (!isDirectory(root)) {
      LOGD("Is not directory: %s", dirname);
      popPath();
      return;
    }
    if (StrView(dirname).startsWith(".")) {
      LOGD("Invalid file: %s", dirname);
      popPath();
      return;
    }

    rewind(root);
    FileT file = openNext(root);
    while (file) {
      if (isDirectory(file)) {
        String name = String(fileNamePath(file));
        LOGD("name: %s", name.c_str());
        pushPath(fileName(file));
        listDir(idxfile, name.c_str());
      } else {
        const char *fn = fileNamePath(file);
        if (isValidAudioFile(file)) {
          LOGD("Adding file to index: %s", fn);
          idxfile.println(fn);
        } else {
          LOGD("Ignoring %s", fn);
        }
      }
      file = openNext(root);
    }
    popPath();
  }

One example of proposal function

  void listDir(Print &idxfile, const char *dirname, bool onlyParentDir = false) {
    LOGD("listDir: %s", dirname);
    FileT root = open(dirname);
    if (!root) {
      LOGE("Open failed: %s", dirname);
      popPath();
      return;
    }
    if (!isDirectory(root)) {
      LOGD("Is not directory: %s", dirname);
      popPath();
      return;
    }
    if (StrView(dirname).startsWith(".")) {
      LOGD("Invalid file: %s", dirname);
      popPath();
      return;
    }

    rewind(root);
    FileT file = openNext(root);
    while (file) {
      if (isDirectory(file)) {
        if(!onlyParentDir) {
          String name = String(fileNamePath(file));
          LOGD("name: %s", name.c_str());
          pushPath(fileName(file));
          listDir(idxfile, name.c_str());
        }
      } else {
        const char *fn = fileNamePath(file);
        if (isValidAudioFile(file)) {
          LOGD("Adding file to index: %s", fn);
          idxfile.println(fn);
        } else {
          LOGD("Ignoring %s", fn);
        }
      }
      file = openNext(root);
    }
    popPath();
  }

Then, in AudioSourceSDFAT and AudioSourceIdxSDFAT for example

SdFat32 sdf;
AudioSourceIdxSDFAT<SdFat32> source(sdf);
source.listFilesOnParenDirOnly(true);

Thanks in advance.

[pschatzmann]

The following new classes might be fitting better:

AudioSourceVector A flexible DataSource that can dynamically store (file) paths
AudioSourceArray An efficient data source that can use an Array of file names preferrably stored in PROGMEM

You can fill the AudioSourceVector with the help of the ls() method provided by the sdfat library like in this test or just by calling the addName() method.

[hash6iron]

But Can be used then with AudioPlayer?

[pschatzmann]

Any AudioSource sublass can be used!

[hash6iron]

Could you show me an example of uses the library please?

[pschatzmann]

Just have a look at the test mentioned above!

[hash6iron]

Hi @pschatzmann .

I use AddName() and I create a vector with names of files and its full path on each one, but player now doesn't initialized (before that using of AudioSourceVector, with AudioSourceIdxSDFAT all was ok) the content of Vector is ok I can see all files in the selected directory.

The content of vector

/MP3/Dance/A saco mix/- a saco mix - radio version.mp3
/MP3/Dance/A saco mix/- bazooka - activity.mp3
/MP3/Dance/A saco mix/- blokka - dig deep.mp3
/MP3/Dance/A saco mix/- boom bastic - 99 red ballons.mp3
/MP3/Dance/A saco mix/- cj rolo - dreams.mp3
/MP3/Dance/A saco mix/- dasha - luna embrujada.mp3
/MP3/Dance/A saco mix/- ddt - my dj sobad.mp3
/MP3/Dance/A saco mix/- doctor kucho - no te pares.mp3
/MP3/Dance/A saco mix/- doctor one - who's gonna ride your wild horses.mp3
/MP3/Dance/A saco mix/- dr. who - extasia.mp3
/MP3/Dance/A saco mix/- fun factory - close to you.mp3
/MP3/Dance/A saco mix/- global bassline - bassline beat.mp3
/MP3/Dance/A saco mix/- gregory - world of dreams (paramount mix).mp3
/MP3/Dance/A saco mix/- head 2 head - love taker.mp3
/MP3/Dance/A saco mix/- jhon wesley - lover why.mp3
/MP3/Dance/A saco mix/- kadok - rock the bells.mp3
/MP3/Dance/A saco mix/- korpus - rainbow.mp3
/MP3/Dance/A saco mix/- promise - think.mp3
/MP3/Dance/A saco mix/- skandalo - smushing & drilling.mp3
/MP3/Dance/A saco mix/- thoma house - echological gas.mp3
/MP3/Dance/A saco mix/- velocity - lust.mp3

I have saw thet AudioSource.h sais me that a file selected doesn't exist, but the path is correct and file can be opened without problems.

What could be happend?

[pschatzmann]

Your file names somehow look wrong: do they really start with a - ?

I am not sure if I understand you correctly, but avoid to use a separate vector and use the AudioSourceVector to store and retrieve the data.

I created a new integration test sketch and this works like a charm!

The log starts with

12:34:01.113 -> [I] AudioSource.h : 340 - addName: '/Bob Dylan/Bringing It All Back Home/04 Love minus zero_no limit.mp3'
12:34:01.113 -> [I] AudioSource.h : 340 - addName: '/Bob Dylan/Bringing It All Back Home/11 It's all over now, Baby Blue.mp3'
12:34:01.113 -> [I] AudioSource.h : 340 - addName: '/Bob Dylan/Bringing It All Back Home/06 On the road again.mp3'
12:34:01.113 -> [I] AudioSource.h : 340 - addName: '/Bob Dylan/Bringing It All Back Home/08 Mr. Tambourine Man.mp3'
12:34:01.217 -> [I] AudioSource.h : 340 - addName: '/Bob Dylan/Bringing It All Back Home/10 It's alright, Ma (I'm only bl.mp3'
12:34:01.217 -> [I] AudioSource.h : 340 - addName: '/Bob Dylan/Bringing It All Back Home/02 She belongs to me.mp3'
12:34:01.217 -> [I] AudioSource.h : 340 - addName: '/Bob Dylan/Bringing It All Back Home/03 Maggie's farm.mp3'
12:34:01.220 -> [I] AudioSource.h : 340 - addName: '/Bob Dylan/Bringing It All Back Home/01 Subterranean homesick blues.mp3'
12:34:01.220 -> [I] AudioSource.h : 340 - addName: '/Bob Dylan/Bringing It All Back Home/07 Bob Dylan's 115th dream.mp3'
12:34:01.220 -> [I] AudioSource.h : 340 - addName: '/Bob Dylan/Bringing It All Back Home/05 Outlaw blues.mp3'
12:34:01.220 -> [I] AudioSource.h : 340 - addName: '/Bob Dylan/Bringing It All Back Home/09 Gates of Eden.mp3'