#define SEARCH_BUFFER_MATCH_MISS 1
#define SEARCH_BUFFER_FLUSH_SIZE 99
+#define FORMAT_CLASS_BROKEN FILE_FORMAT_CLASSES + 1
+
typedef enum {
SEARCH_MATCH_NONE,
SEARCH_MATCH_EQUAL,
SEARCH_MATCH_CONTAINS,
+ SEARCH_MATCH_NAME_EQUAL,
+ SEARCH_MATCH_NAME_CONTAINS,
+ SEARCH_MATCH_PATH_CONTAINS,
SEARCH_MATCH_UNDER,
SEARCH_MATCH_OVER,
SEARCH_MATCH_BETWEEN,
SEARCH_MATCH_ALL,
- SEARCH_MATCH_ANY
+ SEARCH_MATCH_ANY,
+ SEARCH_MATCH_COLLECTION
} MatchType;
enum {
GtkWidget *label_progress;
GtkWidget *button_start;
GtkWidget *button_stop;
+ GtkWidget *button_close;
+ GtkWidget *button_help;
GtkWidget *spinner;
+ GtkWidget *collection;
+ GtkWidget *fd_button;
+ GtkWidget *collection_entry;
+
GtkWidget *box_search;
GtkWidget *menu_path;
gboolean match_rating_enable;
gboolean match_class_enable;
gboolean match_marks_enable;
+ gboolean match_broken_enable;
GList *search_folder_list;
GList *search_done_list;
static const MatchList text_search_menu_path[] = {
{ N_("folder"), SEARCH_MATCH_NONE },
{ N_("comments"), SEARCH_MATCH_ALL },
- { N_("results"), SEARCH_MATCH_CONTAINS }
+ { N_("results"), SEARCH_MATCH_CONTAINS },
+ { N_("collection"), SEARCH_MATCH_COLLECTION }
};
static const MatchList text_search_menu_name[] = {
- { N_("contains"), SEARCH_MATCH_CONTAINS },
- { N_("is"), SEARCH_MATCH_EQUAL }
+ { N_("name contains"), SEARCH_MATCH_NAME_CONTAINS },
+ { N_("name is"), SEARCH_MATCH_NAME_EQUAL },
+ { N_("path contains"), SEARCH_MATCH_PATH_CONTAINS }
};
static const MatchList text_search_menu_size[] = {
return -1;
}
+
static gboolean search_result_row_selected(SearchData *sd, FileData *fd)
{
GtkTreeModel *store;
if (mfd_n->fd == fd) found = TRUE;
work = work->next;
}
- g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL);
+ g_list_foreach(slist, (GFunc)gtk_tree_path_free_wrapper, NULL);
g_list_free(slist);
return found;
work = work->next;
}
- g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL);
+ g_list_foreach(slist, (GFunc)gtk_tree_path_free_wrapper, NULL);
g_list_free(slist);
if (bytes) *bytes = total;
flist = g_list_prepend(flist, mfd->fd);
work = work->next;
}
- g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL);
+ g_list_foreach(slist, (GFunc)gtk_tree_path_free_wrapper, NULL);
g_list_free(slist);
work = flist;
static void search_result_thumb_enable(SearchData *sd, gboolean enable)
{
+ GtkTreeViewColumn *column;
+
if (sd->thumb_enable == enable) return;
if (sd->thumb_enable)
search_progress_update(sd, TRUE, -1.0);
}
+ column = gtk_tree_view_get_column(GTK_TREE_VIEW(sd->result_view), SEARCH_COLUMN_THUMB - 1);
+ if (column)
+ {
+ gtk_tree_view_column_set_visible(column, enable);
+ }
+
sd->thumb_enable = enable;
search_result_thumb_height(sd);
return FALSE;
}
+
static gboolean search_result_keypress_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
SearchData *sd = data;
gtk_tree_model_get_iter(store, &iter, tpath);
gtk_tree_model_get(store, &iter, SEARCH_COLUMN_POINTER, &mfd, -1);
}
- g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL);
+ g_list_foreach(slist, (GFunc)gtk_tree_path_free_wrapper, NULL);
g_list_free(slist);
if (event->state & GDK_CONTROL_MASK)
filelist_free(sd->search_file_list);
sd->search_file_list = NULL;
+ sd->match_broken_enable = FALSE;
+
gtk_widget_set_sensitive(sd->box_search, TRUE);
spinner_set_interval(sd->spinner, -1);
gtk_widget_set_sensitive(sd->button_start, TRUE);
pixbuf = image_loader_get_pixbuf(sd->img_loader);
- if (cd && pixbuf)
+ /* Used to determnine if image is broken
+ */
+ if (cd && !pixbuf)
+ {
+ if (!cd->dimensions)
+ {
+ cache_sim_data_set_dimensions(cd, -1, -1);
+ }
+ }
+ else if (cd && pixbuf)
{
if (!cd->dimensions)
{
if (new_data)
{
- if ((sd->match_dimensions_enable && !sd->img_cd->dimensions) ||
- (sd->match_similarity_enable && !sd->img_cd->similarity))
+ if ((sd->match_dimensions_enable && !sd->img_cd->dimensions) || (sd->match_similarity_enable && !sd->img_cd->similarity) || sd->match_broken_enable)
{
sd->img_loader = image_loader_new(fd);
g_signal_connect(G_OBJECT(sd->img_loader), "error", (GCallback)search_file_load_done_cb, sd);
}
}
+ if (sd->match_broken_enable)
+ {
+ tested = TRUE;
+ tmatch = FALSE;
+ if (sd->match_class == SEARCH_MATCH_EQUAL && sd->img_cd->width == -1)
+ {
+ tmatch = TRUE;
+ }
+ else if (sd->match_class == SEARCH_MATCH_NONE && sd->img_cd->width != -1)
+ {
+ tmatch = TRUE;
+ }
+ }
+
if (tmatch && sd->match_dimensions_enable && sd->img_cd->dimensions)
{
CacheData *cd = sd->img_cd;
tested = TRUE;
match = FALSE;
- if (sd->match_name == SEARCH_MATCH_EQUAL)
+ if (sd->match_name == SEARCH_MATCH_NAME_EQUAL)
{
if (sd->search_name_match_case)
{
match = (g_ascii_strcasecmp(fd->name, sd->search_name) == 0);
}
}
- else if (sd->match_name == SEARCH_MATCH_CONTAINS)
+ else if (sd->match_name == SEARCH_MATCH_NAME_CONTAINS || sd->match_name == SEARCH_MATCH_PATH_CONTAINS)
{
+ const gchar *fd_name_or_path;
+ if (sd->match_name == SEARCH_MATCH_NAME_CONTAINS)
+ {
+ fd_name_or_path = fd->name;
+ }
+ else
+ {
+ fd_name_or_path = fd->path;
+ }
if (sd->search_name_match_case)
{
- match = g_regex_match(sd->search_name_regex, fd->name, 0, NULL);
+ match = g_regex_match(sd->search_name_regex, fd_name_or_path, 0, NULL);
}
else
{
/* sd->search_name is converted in search_start() */
- gchar *haystack = g_utf8_strdown(fd->name, -1);
+ gchar *haystack = g_utf8_strdown(fd_name_or_path, -1);
match = g_regex_match(sd->search_name_regex, haystack, 0, NULL);
g_free(haystack);
}
{
search_class = FORMAT_CLASS_META;
}
- else
+ else if (g_strcmp0(gtk_combo_box_text_get_active_text(
+ GTK_COMBO_BOX_TEXT(sd->class_type)), _("Unknown")) == 0)
{
search_class = FORMAT_CLASS_UNKNOWN;
}
+ else
+ {
+ search_class = FORMAT_CLASS_BROKEN;
+ }
- class = fd->format_class;
- if (sd->match_class == SEARCH_MATCH_EQUAL)
+ if (search_class != FORMAT_CLASS_BROKEN)
{
- match = (class == search_class);
+ 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);
+ }
}
- else if (sd->match_class == SEARCH_MATCH_NONE)
+ else
{
- match = (class != search_class);
+ if (fd->format_class == FORMAT_CLASS_IMAGE || fd->format_class == FORMAT_CLASS_RAWIMAGE || fd->format_class == FORMAT_CLASS_VIDEO || fd->format_class == FORMAT_CLASS_DOCUMENT)
+ {
+ sd->match_broken_enable = TRUE;
+ match = TRUE;
+ }
+ else
+ {
+ sd->match_broken_enable = FALSE;
+ }
}
}
}
}
- if ((match || extra_only) && (sd->match_dimensions_enable ||
- sd ->match_similarity_enable))
+ if ((match || extra_only) && (sd->match_dimensions_enable || sd->match_similarity_enable || sd->match_broken_enable))
{
tested = TRUE;
GtkTreeViewColumn *column;
gchar *path;
gchar *entry_text;
+ gchar *collection;
if (sd->search_folder_list)
{
sd->search_file_list = g_list_concat(sd->search_file_list, list);
}
+ else if (sd->search_type == SEARCH_MATCH_COLLECTION)
+ {
+ collection = g_strdup(gtk_entry_get_text(GTK_ENTRY(sd->collection_entry)));
+
+ if (is_collection(collection))
+ {
+ GList *list = NULL;
+
+ list = collection_contents_fd(collection);
+
+ file_data_unref(sd->search_dir_fd);
+ sd->search_dir_fd = NULL;
+
+ search_start(sd);
+
+ sd->search_file_list = g_list_concat(sd->search_file_list, list);
+ }
+ else
+ {
+ file_util_warning_dialog(_("Collection not found"), _("Please enter an existing collection name."), GTK_STOCK_DIALOG_WARNING, sd->window);
+ }
+ g_free(collection);
+ }
}
/*
menu_choice_set_visible(gtk_widget_get_parent(sd->check_recurse),
(sd->search_type == SEARCH_MATCH_NONE));
+ menu_choice_set_visible(sd->collection, (sd->search_type == SEARCH_MATCH_COLLECTION));
}
static void menu_choice_name_cb(GtkWidget *combo, gpointer data)
gtk_widget_destroy(sd->window);
}
+static void search_window_close_cb(GtkWidget *widget, gpointer data)
+{
+ SearchData *sd = data;
+
+ search_window_close(sd);
+}
+
+static void search_window_help_cb(GtkWidget *widget, gpointer data)
+{
+ help_window_show("GuideImageSearchSearch.html");
+}
+
static gboolean search_window_delete_cb(GtkWidget *widget, GdkEventAny *event, gpointer data)
{
SearchData *sd = data;
g_free(sd);
}
+static void select_collection_dialog_close_cb(FileDialog *fdlg, gpointer data)
+{
+ file_dialog_close(fdlg);
+}
+
+static void select_collection_dialog_ok_cb(FileDialog *fdlg, gpointer data)
+{
+ SearchData *sd = data;
+ gchar *path;
+ gchar *path_noext;
+ gchar *collection;
+
+ path = g_strdup(gtk_entry_get_text(GTK_ENTRY(fdlg->entry)));
+ path_noext = remove_extension_from_path(path);
+ collection = g_path_get_basename(path_noext);
+
+ gtk_entry_set_text(GTK_ENTRY(sd->collection_entry), collection);
+ file_dialog_close(fdlg);
+
+ g_free(path);
+ g_free(path_noext);
+ g_free(collection);
+}
+
+static void select_collection_clicked_cb(GtkWidget *widget, gpointer data)
+{
+ SearchData *sd = data;
+ FileDialog *fdlg;
+ const gchar *title;
+ const gchar *btntext;
+ gpointer btnfunc;
+ const gchar *stock_id;
+
+ title = _("Select collection");
+ btntext = NULL;
+ btnfunc = select_collection_dialog_ok_cb;
+ stock_id = GTK_STOCK_OK;
+
+ fdlg = file_util_file_dlg(title, "dlg_collection", sd->window, select_collection_dialog_close_cb, sd);
+
+ generic_dialog_add_message(GENERIC_DIALOG(fdlg), NULL, title, NULL, FALSE);
+ file_dialog_add_button(fdlg, stock_id, btntext, btnfunc, TRUE);
+
+ file_dialog_add_path_widgets(fdlg, get_collections_dir(), NULL, "search_collection", GQ_COLLECTION_EXT, _("Collection Files"));
+
+ gtk_widget_show(GENERIC_DIALOG(fdlg)->dialog);
+}
+
void search_new(FileData *dir_fd, FileData *example_file)
{
SearchData *sd;
GtkListStore *store;
GtkTreeSortable *sortable;
GtkTreeSelection *selection;
+ GtkTreeViewColumn *column;
GtkWidget *combo;
GdkGeometry geometry;
gint i;
sd->search_type = SEARCH_MATCH_NONE;
- sd->match_name = SEARCH_MATCH_CONTAINS;
+ sd->match_name = SEARCH_MATCH_NAME_CONTAINS;
sd->match_size = SEARCH_MATCH_EQUAL;
sd->match_date = SEARCH_MATCH_EQUAL;
sd->match_dimensions = SEARCH_MATCH_EQUAL;
sd->check_recurse = pref_checkbox_new_int(hbox2, _("Recurse"),
sd->search_path_recurse, &sd->search_path_recurse);
+ sd->collection = pref_box_new(hbox, TRUE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
+ sd->collection_entry = gtk_entry_new();
+ gtk_entry_set_text(GTK_ENTRY(sd->collection_entry), "");
+ gtk_box_pack_start(GTK_BOX(sd->collection), sd->collection_entry, TRUE, TRUE, 0);
+ gtk_widget_show(sd->collection_entry);
+
+ sd->fd_button = gtk_button_new_with_label("...");
+ g_signal_connect(G_OBJECT(sd->fd_button), "clicked", G_CALLBACK(select_collection_clicked_cb), sd);
+ gtk_box_pack_start(GTK_BOX(sd->collection), sd->fd_button, FALSE, FALSE, 0);
+ gtk_widget_show(sd->fd_button);
+
+ gtk_widget_hide(sd->collection);
+
/* Search for file name */
hbox = menu_choice(sd->box_search, &sd->check_name, &sd->menu_name,
- _("File name"), &sd->match_name_enable,
+ _("File"), &sd->match_name_enable,
text_search_menu_name, sizeof(text_search_menu_name) / sizeof(MatchList),
G_CALLBACK(menu_choice_name_cb), sd);
combo = history_combo_new(&sd->entry_name, "", "search_name", -1);
gtk_widget_show(combo);
pref_checkbox_new_int(hbox, _("Match case"),
sd->search_name_match_case, &sd->search_name_match_case);
- gtk_widget_set_tooltip_text(GTK_WIDGET(combo), "When set to \"contains\", this field uses Perl Compatible Regular Expressions.\ne.g. use \n.*\\.jpg\n and not \n*.jpg\n\nSee the Help file.");
+ gtk_widget_set_tooltip_text(GTK_WIDGET(combo), "When set to \"contains\" or \"path contains\", this field uses Perl Compatible Regular Expressions.\ne.g. use \n.*\\.jpg\n and not \n*.jpg\n\nSee the Help file.");
/* Search for file size */
hbox = menu_choice(sd->box_search, &sd->check_size, &sd->menu_size,
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->class_type), _("Document"));
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_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->class_type), _("Broken"));
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);
gtk_tree_view_set_enable_search(GTK_TREE_VIEW(sd->result_view), FALSE);
search_result_add_column(sd, SEARCH_COLUMN_RANK, _("Rank"), FALSE, FALSE);
- search_result_add_column(sd, SEARCH_COLUMN_THUMB, "", TRUE, FALSE);
+ search_result_add_column(sd, SEARCH_COLUMN_THUMB, _("Thumb"), TRUE, FALSE);
search_result_add_column(sd, SEARCH_COLUMN_NAME, _("Name"), FALSE, FALSE);
search_result_add_column(sd, SEARCH_COLUMN_SIZE, _("Size"), FALSE, TRUE);
search_result_add_column(sd, SEARCH_COLUMN_DATE, _("Date"), FALSE, TRUE);
gtk_box_pack_start(GTK_BOX(hbox), sd->spinner, FALSE, FALSE, 0);
gtk_widget_show(sd->spinner);
+ sd->button_help = pref_button_new(hbox, GTK_STOCK_HELP, NULL, FALSE, G_CALLBACK(search_window_help_cb), sd);
+ gtk_widget_set_sensitive(sd->button_help, TRUE);
+ pref_spacer(hbox, PREF_PAD_BUTTON_GAP);
sd->button_start = pref_button_new(hbox, GTK_STOCK_FIND, NULL, FALSE,
G_CALLBACK(search_start_cb), sd);
pref_spacer(hbox, PREF_PAD_BUTTON_GAP);
sd->button_stop = pref_button_new(hbox, GTK_STOCK_STOP, NULL, FALSE,
G_CALLBACK(search_start_cb), sd);
gtk_widget_set_sensitive(sd->button_stop, FALSE);
+ pref_spacer(hbox, PREF_PAD_BUTTON_GAP);
+ sd->button_close = pref_button_new(hbox, GTK_STOCK_CLOSE, NULL, FALSE, G_CALLBACK(search_window_close_cb), sd);
+ gtk_widget_set_sensitive(sd->button_close, TRUE);
+
+ search_result_thumb_enable(sd, TRUE);
+ search_result_thumb_enable(sd, FALSE);
+ column = gtk_tree_view_get_column(GTK_TREE_VIEW(sd->result_view), SEARCH_COLUMN_RANK - 1);
+ gtk_tree_view_column_set_visible(column, FALSE);
search_status_update(sd);
search_progress_update(sd, FALSE, -1.0);
projects / geeqie.git / blobdiff