[#89] Fix recursive playback

Author: jesperpedersen

src/libhrmp/utils.c

@@ -484,6 +484,8 @@ hrmp_get_files(char* base, bool recursive, struct list* files)
 {
    DIR* dir = NULL;
    struct dirent* entry;
+   char** names = NULL;
+   size_t names_size = 0;
 
    if (base == NULL || files == NULL)
    {
@@ -498,19 +500,39 @@ hrmp_get_files(char* base, bool recursive, struct list* files)
 
    while ((entry = readdir(dir)) != NULL)
    {
-      char* d = NULL;
-
       if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0)
       {
          continue;
       }
 
+      char** tmp = realloc(names, (names_size + 1) * sizeof(char*));
+      if (tmp == NULL)
+      {
+         goto error;
+      }
+
+      names = tmp;
+      names[names_size] = strdup(entry->d_name);
+      if (names[names_size] == NULL)
+      {
+         goto error;
+      }
+
+      names_size++;
+   }
+
+   hrmp_sort(names_size, names);
+
+   for (size_t i = 0; i < names_size; i++)
+   {
+      char* d = NULL;
+
       d = hrmp_append(d, base);
       if (!hrmp_ends_with(d, "/"))
       {
          d = hrmp_append_char(d, '/');
       }
-      d = hrmp_append(d, entry->d_name);
+      d = hrmp_append(d, names[i]);
 
       if (hrmp_is_file(d))
       {
@@ -522,8 +544,11 @@ hrmp_get_files(char* base, bool recursive, struct list* files)
       }
 
       free(d);
+      free(names[i]);
    }
 
+   free(names);
+
    closedir(dir);
 
    return 0;
@@ -535,6 +560,15 @@ hrmp_get_files(char* base, bool recursive, struct list* files)
       closedir(dir);
    }
 
+   if (names != NULL)
+   {
+      for (size_t i = 0; i < names_size; i++)
+      {
+         free(names[i]);
+      }
+      free(names);
+   }
+
    return 1;
 }
 

src/main.c

@@ -421,6 +421,40 @@ main(int argc, char** argv)
             }
          }
 
+         /* Filter unsupported files: display them, but don't keep them in the list. */
+         struct list* supported_files = NULL;
+         if (hrmp_list_create(&supported_files))
+         {
+            printf("Error creating files list\n");
+            goto error;
+         }
+
+         for (files_entry = hrmp_list_head(files);
+              files_entry != NULL;
+              files_entry = hrmp_list_next(files_entry))
+         {
+            struct file_metadata* fm = NULL;
+
+            if (hrmp_file_metadata(files_entry->value, &fm))
+            {
+               printf("Not supported: %s\n", files_entry->value);
+               continue;
+            }
+
+            if (hrmp_list_append(supported_files, files_entry->value))
+            {
+               free(fm);
+               hrmp_list_destroy(supported_files);
+               printf("Error creating files list\n");
+               goto error;
+            }
+
+            free(fm);
+         }
+
+         hrmp_list_destroy(files);
+         files = supported_files;
+
          /* Keyboard */
          hrmp_keyboard_mode(true);
 
@@ -446,6 +480,7 @@ main(int argc, char** argv)
             if (hrmp_file_metadata(files_entry->value, &fm))
             {
                printf("Not supported: %s\n", files_entry->value);
+               files_entry = hrmp_list_next(files_entry);
                continue;
             }