SpaceFile: Refactor sorting and filtering of filelist.

New code shall be more easy to maintain and extend.
Sorting is now handled quite the same as filtering, and all filtering parameters
are now packed into a sub-struct to help extending it later.

Also done some optimizations in filelist refresh, and sorting/filtering area.
Now we should avoid re-sorting and re-filtering too often, also removed
calls to those in read_xxx funcs.

Note thumbnail job is still started basically on each call to `file_refresh()`,
will be addressed in next commit.

1 files changed, 24 insertions, 30 deletions

diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c
index fa65053ca8e..a4a216fb515 100644
--- a/source/blender/editors/space_file/space_file.c
+++ b/source/blender/editors/space_file/space_file.c
@@ -193,51 +193,43 @@ static void file_refresh(const bContext *C, ScrArea *UNUSED(sa))
 	SpaceFile *sfile = CTX_wm_space_file(C);
 	FileSelectParams *params = ED_fileselect_get_params(sfile);
 
-	if (!sfile->folders_prev)
+	if (!sfile->folders_prev) {
 		sfile->folders_prev = folderlist_new();
+	}
 	if (!sfile->files) {
 		sfile->files = filelist_new(params->type);
 		filelist_setdir(sfile->files, params->dir);
 		params->active_file = -1; // added this so it opens nicer (ton)
 	}
-	filelist_hidedot(sfile->files, params->flag & FILE_HIDE_DOT);
-	filelist_setfilter(sfile->files, params->flag & FILE_FILTER ? params->filter : 0);
-	filelist_setfilter_types(sfile->files, params->filter_glob);
+	filelist_setsorting(sfile->files, params->sort);
+	filelist_setfilter_options(sfile->files, params->flag & FILE_HIDE_DOT,
+	                                         false, /* TODO hide_parent, should be controllable? */
+	                                         params->flag & FILE_FILTER ? params->filter : 0,
+	                                         params->filter_glob);
 
 	if (filelist_empty(sfile->files)) {
 		thumbnails_stop(wm, sfile->files);
 		filelist_readdir(sfile->files);
-		if (params->sort != FILE_SORT_NONE) {
-			filelist_sort(sfile->files, params->sort);
-		}
+		filelist_sort(sfile->files);
 		BLI_strncpy(params->dir, filelist_dir(sfile->files), FILE_MAX);
-		if (params->display == FILE_IMGDISPLAY) {
+	}
+	else if (filelist_need_sorting(sfile->files)) {
+		thumbnails_stop(wm, sfile->files);
+		filelist_sort(sfile->files);
+	}
+
+	if ((params->display == FILE_IMGDISPLAY)) {
+		if (!thumbnails_running(wm, sfile->files)) {
 			thumbnails_start(sfile->files, C);
 		}
 	}
 	else {
-		if (params->sort != FILE_SORT_NONE) {
-			thumbnails_stop(wm, sfile->files);
-			filelist_sort(sfile->files, params->sort);
-			if (params->display == FILE_IMGDISPLAY) {
-				thumbnails_start(sfile->files, C);
-			}
-		}
-		else {
-			if (params->display == FILE_IMGDISPLAY) {
-				if (!thumbnails_running(wm, sfile->files)) {
-					thumbnails_start(sfile->files, C);
-				}
-			}
-			else {
-				/* stop any running thumbnail jobs if we're not 
-				 * displaying them - speedup for NFS */
-				thumbnails_stop(wm, sfile->files);
-			}
-			filelist_filter(sfile->files);
-		}
+		/* stop any running thumbnail jobs if we're not displaying them - speedup for NFS */
+		thumbnails_stop(wm, sfile->files);
 	}
-	
+
+	filelist_filter(sfile->files);
+
 	if (params->renamefile[0] != '\0') {
 		int idx = filelist_find(sfile->files, params->renamefile);
 		if (idx >= 0) {
@@ -249,8 +241,10 @@ static void file_refresh(const bContext *C, ScrArea *UNUSED(sa))
 		BLI_strncpy(sfile->params->renameedit, sfile->params->renamefile, sizeof(sfile->params->renameedit));
 		params->renamefile[0] = '\0';
 	}
-	if (sfile->layout) sfile->layout->dirty = true;
 
+	if (sfile->layout) {
+		sfile->layout->dirty = true;
+	}
 }
 
 static void file_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn)