Fix #664: Recursive slideshow does not respect file sorting

https://github.com/BestImageViewer/geeqie/issues/664

diff --git a/src/filedata.c b/src/filedata.c
index af6e59d..240531f 100644 (file)
--- a/src/filedata.c
+++ b/src/filedata.c
@@ -1633,6 +1633,33 @@ static void filelist_recursive_append(GList **list, GList *dirs)
                }
 }
 
+static void filelist_recursive_append_full(GList **list, GList *dirs, SortType method, gboolean ascend)
+{
+       GList *work;
+
+       work = dirs;
+       while (work)
+               {
+               FileData *fd = (FileData *)(work->data);
+               GList *f;
+               GList *d;
+
+               if (filelist_read(fd, &f, &d))
+                       {
+                       f = filelist_filter(f, FALSE);
+                       f = filelist_sort_full(f, method, ascend, (GCompareFunc) filelist_sort_file_cb);
+                       *list = g_list_concat(*list, f);
+
+                       d = filelist_filter(d, TRUE);
+                       d = filelist_sort_path(d);
+                       filelist_recursive_append_full(list, d, method, ascend);
+                       filelist_free(d);
+                       }
+
+               work = work->next;
+               }
+}
+
 GList *filelist_recursive(FileData *dir_fd)
 {
        GList *list;
@@ -1650,6 +1677,23 @@ GList *filelist_recursive(FileData *dir_fd)
        return list;
 }
 
+GList *filelist_recursive_full(FileData *dir_fd, SortType method, gboolean ascend)
+{
+       GList *list;
+       GList *d;
+
+       if (!filelist_read(dir_fd, &list, &d)) return NULL;
+       list = filelist_filter(list, FALSE);
+       list = filelist_sort_full(list, method, ascend, (GCompareFunc) filelist_sort_file_cb);
+
+       d = filelist_filter(d, TRUE);
+       d = filelist_sort_path(d);
+       filelist_recursive_append_full(&list, d, method, ascend);
+       filelist_free(d);
+
+       return list;
+}
+
 /*
  *-----------------------------------------------------------------------------
  * file modification support

diff --git a/src/filedata.h b/src/filedata.h
index 878bbb9..8587dcd 100644 (file)
--- a/src/filedata.h
+++ b/src/filedata.h
@@ -86,6 +86,7 @@ GList *filelist_filter(GList *list, gboolean is_dir_list);
 
 GList *filelist_sort_path(GList *list);
 GList *filelist_recursive(FileData *dir_fd);
+GList *filelist_recursive_full(FileData *dir_fd, SortType method, gboolean ascend);
 
 typedef gboolean (* FileDataGetMarkFunc)(FileData *fd, gint n, gpointer data);
 typedef gboolean (* FileDataSetMarkFunc)(FileData *fd, gint n, gboolean value, gpointer data);

diff --git a/src/remote.c b/src/remote.c
index 708fded..b543544 100644 (file)
--- a/src/remote.c
+++ b/src/remote.c
@@ -495,7 +495,9 @@ static void gr_slideshow_start_rec(const gchar *text, GIOChannel *channel, gpoin
 {
        GList *list;
        FileData *dir_fd = file_data_new_dir(text);
-       list = filelist_recursive(dir_fd);
+
+       layout_valid(&lw_id);
+       list = filelist_recursive_full(dir_fd, lw_id->sort_method, lw_id->sort_ascend);
        file_data_unref(dir_fd);
        if (!list) return;
 //printf("length: %d\n", g_list_length(list));

diff --git a/src/view_dir.c b/src/view_dir.c
index f671bea..a98632d 100644 (file)
--- a/src/view_dir.c
+++ b/src/view_dir.c
@@ -476,7 +476,7 @@ static void vd_pop_menu_slide_rec_cb(GtkWidget *widget, gpointer data)
        if (!vd->layout) return;
        if (!vd->click_fd) return;
 
-       list = filelist_recursive(vd->click_fd);
+       list = filelist_recursive_full(vd->click_fd, vd->layout->sort_method, vd->layout->sort_ascend);
 
        layout_image_slideshow_stop(vd->layout);
        layout_image_slideshow_start_from_list(vd->layout, list);