File list

File list diff -r 226c02528774 -r f090fbf9362f src/collect.c --- a/src/collect.c Wed Jan 03 16:10:35 2018 +0000 +++ b/src/collect.c Wed Jan 03 17:49:15 2018 +0000 @@ -172,6 +172,10 @@ case SORT_PATH: return utf8_compare(cia->fd->path, cib->fd->path, options->file_sort.case_sensitive); break; + case SORT_CLASS: + if (cia->fd->format_class < cib->fd->format_class) return -1; + if (cia->fd->format_class > cib->fd->format_class) return 1; + break; #ifdef HAVE_STRVERSCMP case SORT_NUMBER: return strverscmp(cia->fd->name, cib->fd->name); diff -r 226c02528774 -r f090fbf9362f src/filedata.c --- a/src/filedata.c Wed Jan 03 16:10:35 2018 +0000 +++ b/src/filedata.c Wed Jan 03 17:49:15 2018 +0000 @@ -1051,6 +1051,11 @@ if (fa->rating > fb->rating) return 1; /* fall back to name */ break; + case SORT_CLASS: + if (fa->format_class < fb->format_class) return -1; + if (fa->format_class > fb->format_class) return 1; + /* fall back to name */ + break; #ifdef HAVE_STRVERSCMP case SORT_NUMBER: ret = strverscmp(fa->name, fb->name); diff -r 226c02528774 -r f090fbf9362f src/menu.c --- a/src/menu.c Wed Jan 03 16:10:35 2018 +0000 +++ b/src/menu.c Wed Jan 03 17:49:15 2018 +0000 @@ -163,6 +163,9 @@ case SORT_RATING: return _("Sort by rating"); break; + case SORT_CLASS: + return _("Sort by class"); + break; case SORT_NAME: default: return _("Sort by name"); @@ -211,6 +214,7 @@ submenu_add_sort_item(submenu, func, SORT_EXIFTIME, show_current, type); submenu_add_sort_item(submenu, func, SORT_SIZE, show_current, type); submenu_add_sort_item(submenu, func, SORT_RATING, show_current, type); + submenu_add_sort_item(submenu, func, SORT_CLASS, show_current, type); if (include_path) submenu_add_sort_item(submenu, func, SORT_PATH, show_current, type); if (include_none) submenu_add_sort_item(submenu, func, SORT_NONE, show_current, type); diff -r 226c02528774 -r f090fbf9362f src/search.c --- a/src/search.c Wed Jan 03 16:10:35 2018 +0000 +++ b/src/search.c Wed Jan 03 17:49:15 2018 +0000 @@ -144,6 +144,10 @@ GtkWidget *spin_rating; GtkWidget *spin_rating_end; + GtkWidget *check_class; + GtkWidget *menu_class; + GtkWidget *class_type; + FileData *search_dir_fd; gboolean search_path_recurse; gchar *search_name; @@ -180,6 +184,7 @@ MatchType match_comment; MatchType match_rating; MatchType match_gps; + MatchType match_class; gboolean match_name_enable; gboolean match_size_enable; @@ -189,6 +194,7 @@ gboolean match_keywords_enable; gboolean match_comment_enable; gboolean match_rating_enable; + gboolean match_class_enable; GList *search_folder_list; GList *search_done_list; @@ -290,6 +296,11 @@ { N_("greater than"), SEARCH_MATCH_OVER } }; +static const MatchList text_search_menu_class[] = { + { N_("is"), SEARCH_MATCH_EQUAL }, + { N_("is not"), SEARCH_MATCH_NONE } +}; + static GList *search_window_list = NULL; @@ -2032,6 +2043,49 @@ } } + if (match && sd->match_class_enable) + { + tested = TRUE; + match = FALSE; + gint class; + FileFormatClass search_class; + + if (g_strcmp0(gtk_combo_box_text_get_active_text( + GTK_COMBO_BOX_TEXT(sd->class_type)), _("Image")) == 0) + { + search_class = FORMAT_CLASS_IMAGE; + } + else if (g_strcmp0(gtk_combo_box_text_get_active_text( + GTK_COMBO_BOX_TEXT(sd->class_type)), _("Raw Image")) == 0) + { + search_class = FORMAT_CLASS_RAWIMAGE; + } + else if (g_strcmp0(gtk_combo_box_text_get_active_text( + GTK_COMBO_BOX_TEXT(sd->class_type)), _("Video")) == 0) + { + search_class = FORMAT_CLASS_VIDEO; + } + else if (g_strcmp0(gtk_combo_box_text_get_active_text( + GTK_COMBO_BOX_TEXT(sd->class_type)), _("Metadata")) == 0) + { + search_class = FORMAT_CLASS_META; + } + else + { + search_class = FORMAT_CLASS_UNKNOWN; + } + + class = fd->format_class; + if (sd->match_class == SEARCH_MATCH_EQUAL) + { + match = (class == search_class); + } + else if (sd->match_class == SEARCH_MATCH_NONE) + { + match = (class != search_class); + } + } + if (match && sd->match_gps_enable) { /* Calculate the distance the image is from the specified origin. @@ -2618,6 +2672,13 @@ (sd->match_rating == SEARCH_MATCH_BETWEEN)); } +static void menu_choice_class_cb(GtkWidget *combo, gpointer data) +{ + SearchData *sd = data; + + if (!menu_choice_get_match_type(combo, &sd->match_class)) return; +} + static void menu_choice_date_cb(GtkWidget *combo, gpointer data) { SearchData *sd = data; @@ -2847,6 +2908,7 @@ sd->match_keywords = SEARCH_MATCH_ALL; sd->match_comment = SEARCH_MATCH_CONTAINS; sd->match_rating = SEARCH_MATCH_EQUAL; + sd->match_class = SEARCH_MATCH_EQUAL; sd->match_name_enable = TRUE; @@ -3062,6 +3124,22 @@ gtk_widget_show(sd->entry_gps_coord); + /* Search for image class */ + hbox = menu_choice(sd->box_search, &sd->check_class, &sd->menu_class, + _("Image class"), &sd->match_class_enable, + text_search_menu_class, sizeof(text_search_menu_class) / sizeof(MatchList), + G_CALLBACK(menu_choice_class_cb), sd); + + sd->class_type = gtk_combo_box_text_new(); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->class_type), _("Image")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->class_type), _("Raw Image")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->class_type), _("Video")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->class_type), _("Metadata")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->class_type), _("Unknown")); + gtk_box_pack_start(GTK_BOX(hbox), sd->class_type, FALSE, FALSE, 0); + gtk_combo_box_set_active(GTK_COMBO_BOX(sd->class_type), 0); + gtk_widget_show(sd->class_type); + /* Done the types of searches */ scrolled = gtk_scrolled_window_new(NULL, NULL); diff -r 226c02528774 -r f090fbf9362f src/typedefs.h --- a/src/typedefs.h Wed Jan 03 16:10:35 2018 +0000 +++ b/src/typedefs.h Wed Jan 03 17:49:15 2018 +0000 @@ -74,7 +74,8 @@ SORT_PATH, SORT_NUMBER, SORT_EXIFTIME, - SORT_RATING + SORT_RATING, + SORT_CLASS } SortType; typedef enum { diff -r 226c02528774 -r f090fbf9362f web/help/GuideImageSearchSearch.html --- a/web/help/GuideImageSearchSearch.html Wed Jan 03 16:10:35 2018 +0000 +++ b/web/help/GuideImageSearchSearch.html Wed Jan 03 17:49:15 2018 +0000 @@ -606,6 +606,19 @@ for details on how to create this file. +

+ Class +

+ The search will match if the file's class is, or is not, one of the following types. +

Unknown
Image
Raw Image
Video
Metadata

diff -r 226c02528774 -r f090fbf9362f web/help/GuideMainWindowStatusBar.html --- a/web/help/GuideMainWindowStatusBar.html Wed Jan 03 16:10:35 2018 +0000 +++ b/web/help/GuideMainWindowStatusBar.html Wed Jan 03 17:49:15 2018 +0000 @@ -516,7 +516,26 @@ Size

Image are sorted by file size on disk.

Images are sorted by file size on disk.

+ Rating +

Image are sorted by Xmp.xmp.Rating.

+ Class +

Image are sorted by class. The class types, and sort order, is:

Unknown
Image
Raw Image
Video
Metadata

Ascending @@ -525,7 +544,7 @@

Toggles between increasing and decreasing sort order. A check will appear next to this entry to indicate ascending sort order.

When images have equal rank, for example in rating or class sorts, within each section images will be sorted by filename.

2.6.3. File list