TnSb/wofi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sorting will now fallback to basic sort order if the fancy sorts are identical

Browse Source
This commit is contained in:
Scoopta 2020-04-10 22:12:43 -07:00
parent 6ce49cd43d
commit 443b729de5
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/wofi.c
View File

@ -962,23 +962,43 @@ static gint do_sort(GtkFlowBoxChild* child1, GtkFlowBoxChild* child2, gpointer d
const gchar* text2 = wofi_property_box_get_property(WOFI_PROPERTY_BOX(box2), "filter"); const gchar* text2 = wofi_property_box_get_property(WOFI_PROPERTY_BOX(box2), "filter");
uint64_t index1 = strtol(wofi_property_box_get_property(WOFI_PROPERTY_BOX(box1), "index"), NULL, 10); uint64_t index1 = strtol(wofi_property_box_get_property(WOFI_PROPERTY_BOX(box1), "index"), NULL, 10);
uint64_t index2 = strtol(wofi_property_box_get_property(WOFI_PROPERTY_BOX(box2), "index"), NULL, 10); uint64_t index2 = strtol(wofi_property_box_get_property(WOFI_PROPERTY_BOX(box2), "index"), NULL, 10);
if(text1 == NULL || text2 == NULL) { if(text1 == NULL || text2 == NULL) {
return index1 - index2; return index1 - index2;
} }
if(filter == NULL || strcmp(filter, "") == 0) {
switch(sort_order) { uint64_t fallback = 0;
case SORT_ORDER_DEFAULT: switch(sort_order) {
return index1 - index2; case SORT_ORDER_DEFAULT:
case SORT_ORDER_ALPHABETICAL: fallback = index1 - index2;
return strcmp(text1, text2); break;
case SORT_ORDER_ALPHABETICAL:
if(insensitive) {
fallback = strcasecmp(text1, text2);
} else {
fallback = strcmp(text1, text2);
} }
break;
} }
if(filter == NULL || strcmp(filter, "") == 0) {
return fallback;
}
gint primary = 0;
switch(matching) { switch(matching) {
case MATCHING_MODE_CONTAINS: case MATCHING_MODE_CONTAINS:
return contains_sort(text1, text2); primary = contains_sort(text1, text2);
if(primary == 0) {
return fallback;
}
return primary;
case MATCHING_MODE_FUZZY: case MATCHING_MODE_FUZZY:
return fuzzy_sort(text1, text2); primary = fuzzy_sort(text1, text2);
if(primary == 0) {
return fallback;
}
return primary;
default: default:
return 0; return 0;
} }