artwork: sort filenames when finding first cover in a folder -- this helps prioritize first cover in when there are multiple with numbers, like 1.jpg, 2.jpg, etc.

Author: Oleksiy-Yakovenko

plugins/artwork/artwork.c

@@ -303,6 +303,14 @@ dir_scan_results (struct dirent *entry, const char *container, ddb_cover_info_t
     return -1;
 }
 
+static
+int _dirent_alpha_cmp_func(const void *a, const void *b) {
+    struct dirent * const *fa = a;
+    struct dirent * const *fb = b;
+
+    return strcmp((*fa)->d_name, (*fb)->d_name);
+}
+
 static int
 scan_local_path (const char *local_path, const char *uri, DB_vfs_t *vfsplug, ddb_cover_info_t *cover) {
     struct dirent **files = NULL;
@@ -322,7 +330,13 @@ scan_local_path (const char *local_path, const char *uri, DB_vfs_t *vfsplug, ddb
 
     int err = -1;
 
-    if (files != NULL) {
+    if (files != NULL && files_count > 0) {
+
+        // sort resulting files alphabetically, to ensure that numbered covers are prioritized correctly
+        struct dirent **sorted_files = calloc(files_count, sizeof (struct dirent *));
+        memcpy (sorted_files, files, files_count * sizeof (struct dirent *));
+        qsort(sorted_files, files_count, sizeof (struct dirent *), _dirent_alpha_cmp_func);
+
         const char *filemask_end = filemask + strlen (filemask);
         char *p;
         while ((p = strrchr (filemask, ';'))) {
@@ -331,12 +345,12 @@ scan_local_path (const char *local_path, const char *uri, DB_vfs_t *vfsplug, ddb
 
         for (char *mask = filemask; mask < filemask_end; mask += strlen (mask) + 1) {
             for (int i = 0; i < files_count; i++) {
-                if (!fnmatch (mask, files[i]->d_name, FNM_CASEFOLD)) {
+                if (!fnmatch (mask, sorted_files[i]->d_name, FNM_CASEFOLD)) {
                     if (uri) {
-                        err = vfs_scan_results (files[i], uri, cover, mask);
+                        err = vfs_scan_results (sorted_files[i], uri, cover, mask);
                     }
                     else {
-                        err = dir_scan_results (files[i], local_path, cover);
+                        err = dir_scan_results (sorted_files[i], local_path, cover);
                     }
                 }
                 if (!err) {
@@ -347,6 +361,7 @@ scan_local_path (const char *local_path, const char *uri, DB_vfs_t *vfsplug, ddb
                 break;
             }
         }
+        free (sorted_files);
         for (size_t i = 0; i < files_count; i++) {
             free (files[i]);
         }