Include a Other Software section in Help file
[geeqie.git] / src / cache_maint.c
index 2e5a7bb..d76ee8c 100644 (file)
@@ -23,6 +23,7 @@
 #include "cache_maint.h"
 
 #include "cache.h"
+#include "cache-loader.h"
 #include "filedata.h"
 #include "layout.h"
 #include "thumb.h"
@@ -48,6 +49,7 @@ struct _CMData
        GtkWidget *button_close;
        gboolean clear;
        gboolean metadata;
+       gboolean remote;
 };
 
 #define PURGE_DIALOG_WIDTH 400
@@ -117,11 +119,14 @@ static void cache_maintain_home_stop(CMData *cm)
                cm->idle_id = 0;
                }
 
-       gtk_entry_set_text(GTK_ENTRY(cm->entry), _("done"));
-       spinner_set_interval(cm->spinner, -1);
+       if (!cm->remote)
+               {
+               gtk_entry_set_text(GTK_ENTRY(cm->entry), _("done"));
+               spinner_set_interval(cm->spinner, -1);
 
-       gtk_widget_set_sensitive(cm->button_stop, FALSE);
-       gtk_widget_set_sensitive(cm->button_close, TRUE);
+               gtk_widget_set_sensitive(cm->button_stop, FALSE);
+               gtk_widget_set_sensitive(cm->button_close, TRUE);
+               }
 }
 
 static gboolean cache_maintain_home_cb(gpointer data)
@@ -134,6 +139,7 @@ static gboolean cache_maintain_home_cb(gpointer data)
        gboolean still_have_a_file = TRUE;
        gsize base_length;
        const gchar *cache_folder;
+       gboolean filter_disable;
 
        if (cm->metadata)
                {
@@ -158,6 +164,13 @@ static gboolean cache_maintain_home_cb(gpointer data)
 
        DEBUG_1("purge chk (%d) \"%s\"", (cm->clear && !cm->metadata), fd->path);
 
+/**
+ * It is necessary to disable the file filter when clearing the cache,
+ * otherwise the .sim (file similarity) files are not deleted.
+ */
+       filter_disable = options->file_filter.disable;
+       options->file_filter.disable = TRUE;
+
        if (g_list_find(cm->done_list, fd) == NULL)
                {
                cm->done_list = g_list_prepend(cm->done_list, fd);
@@ -194,6 +207,8 @@ static gboolean cache_maintain_home_cb(gpointer data)
                                }
                        }
                }
+       options->file_filter.disable = filter_disable;
+
        filelist_free(list);
 
        cm->list = g_list_concat(dlist, cm->list);
@@ -224,7 +239,7 @@ static gboolean cache_maintain_home_cb(gpointer data)
                file_data_unref(fd);
                }
 
-       if (cm->list)
+       if (cm->list && !cm->remote)
                {
                const gchar *buf;
 
@@ -292,6 +307,7 @@ void cache_maintain_home(gboolean metadata, gboolean clear, GtkWidget *parent)
        cm->done_list = NULL;
        cm->clear = clear;
        cm->metadata = metadata;
+       cm->remote = FALSE;
 
        if (metadata)
                {
@@ -317,7 +333,7 @@ void cache_maintain_home(gboolean metadata, gboolean clear, GtkWidget *parent)
        cm->button_stop = generic_dialog_add_button(cm->gd, GTK_STOCK_STOP, NULL,
                                                    cache_maintain_home_stop_cb, FALSE);
 
-       generic_dialog_add_message(cm->gd, NULL, msg, NULL);
+       generic_dialog_add_message(cm->gd, NULL, msg, NULL, FALSE);
        gtk_window_set_default_size(GTK_WINDOW(cm->gd->dialog), PURGE_DIALOG_WIDTH, -1);
 
        hbox = gtk_hbox_new(FALSE, 0);
@@ -339,6 +355,41 @@ void cache_maintain_home(gboolean metadata, gboolean clear, GtkWidget *parent)
        cm->idle_id = g_idle_add(cache_maintain_home_cb, cm);
 }
 
+void cache_maintain_home_remote(gboolean metadata, gboolean clear)
+{
+       CMData *cm;
+       GList *dlist;
+       FileData *dir_fd;
+       const gchar *cache_folder;
+
+       if (metadata)
+               {
+               cache_folder = get_metadata_cache_dir();
+               }
+       else
+               {
+               cache_folder = get_thumbnails_cache_dir();
+               }
+
+       dir_fd = file_data_new_dir(cache_folder);
+       if (!filelist_read(dir_fd, NULL, &dlist))
+               {
+               file_data_unref(dir_fd);
+               return;
+               }
+
+       dlist = g_list_append(dlist, dir_fd);
+
+       cm = g_new0(CMData, 1);
+       cm->list = dlist;
+       cm->done_list = NULL;
+       cm->clear = clear;
+       cm->metadata = metadata;
+       cm->remote = TRUE;
+
+       cm->idle_id = g_idle_add(cache_maintain_home_cb, cm);
+}
+
 static void cache_file_move(const gchar *src, const gchar *dest)
 {
        if (!dest || !src || !isfile(src)) return;
@@ -499,11 +550,12 @@ struct _CacheManager
        gint count_done;
 };
 
-typedef struct _CleanData CleanData;
-struct _CleanData
+typedef struct _CacheOpsData CacheOpsData;
+struct _CacheOpsData
 {
        GenericDialog *gd;
        ThumbLoaderStd *tl;
+       CacheLoader *cl;
 
        GList *list;
        GList *list_dir;
@@ -515,6 +567,7 @@ struct _CleanData
        GtkWidget *button_stop;
        GtkWidget *button_start;
        GtkWidget *progress;
+       GtkWidget *progress_bar;
        GtkWidget *spinner;
 
        GtkWidget *group;
@@ -526,10 +579,12 @@ struct _CleanData
        gboolean local;
        gboolean recurse;
 
+       gboolean remote;
+
        guint idle_id; /* event source id */
 };
 
-static void cache_manager_render_reset(CleanData *cd)
+static void cache_manager_render_reset(CacheOpsData *cd)
 {
        filelist_free(cd->list);
        cd->list = NULL;
@@ -543,7 +598,7 @@ static void cache_manager_render_reset(CleanData *cd)
 
 static void cache_manager_render_close_cb(GenericDialog *fd, gpointer data)
 {
-       CleanData *cd = data;
+       CacheOpsData *cd = data;
 
        if (!gtk_widget_get_sensitive(cd->button_close)) return;
 
@@ -552,27 +607,30 @@ static void cache_manager_render_close_cb(GenericDialog *fd, gpointer data)
        g_free(cd);
 }
 
-static void cache_manager_render_finish(CleanData *cd)
+static void cache_manager_render_finish(CacheOpsData *cd)
 {
        cache_manager_render_reset(cd);
+       if (!cd->remote)
+               {
+               gtk_entry_set_text(GTK_ENTRY(cd->progress), _("done"));
+               spinner_set_interval(cd->spinner, -1);
 
-       gtk_entry_set_text(GTK_ENTRY(cd->progress), _("done"));
-       spinner_set_interval(cd->spinner, -1);
-
-       gtk_widget_set_sensitive(cd->group, TRUE);
-       gtk_widget_set_sensitive(cd->button_start, TRUE);
-       gtk_widget_set_sensitive(cd->button_stop, FALSE);
-       gtk_widget_set_sensitive(cd->button_close, TRUE);
+               gtk_widget_set_sensitive(cd->group, TRUE);
+               gtk_widget_set_sensitive(cd->button_start, TRUE);
+               gtk_widget_set_sensitive(cd->button_stop, FALSE);
+               gtk_widget_set_sensitive(cd->button_close, TRUE);
+               }
 }
 
 static void cache_manager_render_stop_cb(GenericDialog *fd, gpointer data)
 {
-       CleanData *cd = data;
+       CacheOpsData *cd = data;
 
+       gtk_entry_set_text(GTK_ENTRY(cd->progress), _("stopped"));
        cache_manager_render_finish(cd);
 }
 
-static void cache_manager_render_folder(CleanData *cd, FileData *dir_fd)
+static void cache_manager_render_folder(CacheOpsData *cd, FileData *dir_fd)
 {
        GList *list_d = NULL;
        GList *list_f = NULL;
@@ -593,11 +651,11 @@ static void cache_manager_render_folder(CleanData *cd, FileData *dir_fd)
        cd->list_dir = g_list_concat(list_d, cd->list_dir);
 }
 
-static gboolean cache_manager_render_file(CleanData *cd);
+static gboolean cache_manager_render_file(CacheOpsData *cd);
 
 static void cache_manager_render_thumb_done_cb(ThumbLoader *tl, gpointer data)
 {
-       CleanData *cd = data;
+       CacheOpsData *cd = data;
 
        thumb_loader_free((ThumbLoader *)cd->tl);
        cd->tl = NULL;
@@ -605,7 +663,7 @@ static void cache_manager_render_thumb_done_cb(ThumbLoader *tl, gpointer data)
        while (cache_manager_render_file(cd));
 }
 
-static gboolean cache_manager_render_file(CleanData *cd)
+static gboolean cache_manager_render_file(CacheOpsData *cd)
 {
        if (cd->list)
                {
@@ -624,7 +682,12 @@ static gboolean cache_manager_render_file(CleanData *cd)
                success = thumb_loader_start((ThumbLoader *)cd->tl, fd);
                if (success)
                        {
-                       gtk_entry_set_text(GTK_ENTRY(cd->progress), fd->path);
+                       if (!cd->remote)
+                               {
+                               gtk_entry_set_text(GTK_ENTRY(cd->progress), fd->path);
+                               cd->count_done = cd->count_done + 1;
+                               gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(cd->progress_bar), (gdouble)cd->count_done / cd->count_total);
+                               }
                        }
                else
                        {
@@ -650,6 +713,7 @@ static gboolean cache_manager_render_file(CleanData *cd)
                return TRUE;
                }
 
+       gtk_entry_set_text(GTK_ENTRY(cd->progress), _("done"));
        cache_manager_render_finish(cd);
 
        return FALSE;
@@ -657,29 +721,71 @@ static gboolean cache_manager_render_file(CleanData *cd)
 
 static void cache_manager_render_start_cb(GenericDialog *fd, gpointer data)
 {
-       CleanData *cd = data;
+       CacheOpsData *cd = data;
        gchar *path;
+       GList *list_total = NULL;
 
-       if (cd->list || !gtk_widget_get_sensitive(cd->button_start)) return;
+       if(!cd->remote)
+               {
+               if (cd->list || !gtk_widget_get_sensitive(cd->button_start)) return;
+               }
 
        path = remove_trailing_slash((gtk_entry_get_text(GTK_ENTRY(cd->entry))));
        parse_out_relatives(path);
 
        if (!isdir(path))
                {
-               warning_dialog(_("Invalid folder"),
-                               _("The specified folder can not be found."),
-                              GTK_STOCK_DIALOG_WARNING, cd->gd->dialog);
+               if (!cd->remote)
+                       {
+                       warning_dialog(_("Invalid folder"),
+                       _("The specified folder can not be found."),
+                       GTK_STOCK_DIALOG_WARNING, cd->gd->dialog);
+                       }
+               else
+                       {
+                       log_printf("The specified folder can not be found: %s\n", path);
+                       }
                }
        else
                {
                FileData *dir_fd;
-               gtk_widget_set_sensitive(cd->group, FALSE);
-               gtk_widget_set_sensitive(cd->button_start, FALSE);
-               gtk_widget_set_sensitive(cd->button_stop, TRUE);
-               gtk_widget_set_sensitive(cd->button_close, FALSE);
+               if(!cd->remote)
+                       {
+                       gtk_widget_set_sensitive(cd->group, FALSE);
+                       gtk_widget_set_sensitive(cd->button_start, FALSE);
+                       gtk_widget_set_sensitive(cd->button_stop, TRUE);
+                       gtk_widget_set_sensitive(cd->button_close, FALSE);
+
+                       spinner_set_interval(cd->spinner, SPINNER_SPEED);
+                       }
+               dir_fd = file_data_new_dir(path);
+               cache_manager_render_folder(cd, dir_fd);
+               list_total = filelist_recursive(dir_fd);
+               cd->count_total = g_list_length(list_total);
+               file_data_unref(dir_fd);
+               g_list_free(list_total);
+               cd->count_done = 0;
+
+               while (cache_manager_render_file(cd));
+               }
+
+       g_free(path);
+}
+
+static void cache_manager_render_start_render_remote(CacheOpsData *cd, const gchar *user_path)
+{
+       gchar *path;
 
-               spinner_set_interval(cd->spinner, SPINNER_SPEED);
+       path = remove_trailing_slash(user_path);
+       parse_out_relatives(path);
+
+       if (!isdir(path))
+               {
+               log_printf("The specified folder can not be found: %s\n", path);
+               }
+       else
+               {
+               FileData *dir_fd;
 
                dir_fd = file_data_new_dir(path);
                cache_manager_render_folder(cd, dir_fd);
@@ -692,12 +798,13 @@ static void cache_manager_render_start_cb(GenericDialog *fd, gpointer data)
 
 static void cache_manager_render_dialog(GtkWidget *widget, const gchar *path)
 {
-       CleanData *cd;
+       CacheOpsData *cd;
        GtkWidget *hbox;
        GtkWidget *label;
        GtkWidget *button;
 
-       cd = g_new0(CleanData, 1);
+       cd = g_new0(CacheOpsData, 1);
+       cd->remote = FALSE;
 
        cd->gd = generic_dialog_new(_("Create thumbnails"),
                                    "create_thumbnails",
@@ -713,7 +820,7 @@ static void cache_manager_render_dialog(GtkWidget *widget, const gchar *path)
                                                    cache_manager_render_stop_cb, FALSE);
        gtk_widget_set_sensitive(cd->button_stop, FALSE);
 
-       generic_dialog_add_message(cd->gd, NULL, _("Create thumbnails"), NULL);
+       generic_dialog_add_message(cd->gd, NULL, _("Create thumbnails"), NULL, FALSE);
 
        hbox = pref_box_new(cd->gd->vbox, FALSE, GTK_ORIENTATION_HORIZONTAL, 0);
        pref_spacer(hbox, PREF_PAD_INDENT);
@@ -722,7 +829,7 @@ static void cache_manager_render_dialog(GtkWidget *widget, const gchar *path)
        hbox = pref_box_new(cd->group, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
        pref_label_new(hbox, _("Folder:"));
 
-       label = tab_completion_new(&cd->entry, path, NULL, NULL);
+       label = tab_completion_new(&cd->entry, path, NULL, NULL, NULL, NULL);
        tab_completion_add_select_button(cd->entry,_("Select folder") , TRUE);
        gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
        gtk_widget_show(label);
@@ -741,6 +848,10 @@ static void cache_manager_render_dialog(GtkWidget *widget, const gchar *path)
        gtk_box_pack_start(GTK_BOX(hbox), cd->progress, TRUE, TRUE, 0);
        gtk_widget_show(cd->progress);
 
+       cd->progress_bar = gtk_progress_bar_new();
+       gtk_box_pack_start(GTK_BOX(cd->gd->vbox), cd->progress_bar, TRUE, TRUE, 0);
+       gtk_widget_show(cd->progress_bar);
+
        cd->spinner = spinner_new(NULL, -1);
        gtk_box_pack_start(GTK_BOX(hbox), cd->spinner, FALSE, FALSE, 0);
        gtk_widget_show(cd->spinner);
@@ -750,12 +861,21 @@ static void cache_manager_render_dialog(GtkWidget *widget, const gchar *path)
        gtk_widget_show(cd->gd->dialog);
 }
 
+void cache_manager_render_remote(const gchar *path, gboolean recurse, gboolean local)
+{
+       CacheOpsData *cd;
 
+       cd = g_new0(CacheOpsData, 1);
+       cd->recurse = recurse;
+       cd->local = local;
+       cd->remote = TRUE;
 
+       cache_manager_render_start_render_remote(cd, path);
+}
 
 static void cache_manager_standard_clean_close_cb(GenericDialog *gd, gpointer data)
 {
-       CleanData *cd = data;
+       CacheOpsData *cd = data;
 
        if (!gtk_widget_get_sensitive(cd->button_close)) return;
 
@@ -766,14 +886,16 @@ static void cache_manager_standard_clean_close_cb(GenericDialog *gd, gpointer da
        g_free(cd);
 }
 
-static void cache_manager_standard_clean_done(CleanData *cd)
+static void cache_manager_standard_clean_done(CacheOpsData *cd)
 {
-       gtk_widget_set_sensitive(cd->button_stop, FALSE);
-       gtk_widget_set_sensitive(cd->button_close, TRUE);
-
-       gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(cd->progress), 1.0);
-       gtk_progress_bar_set_text(GTK_PROGRESS_BAR(cd->progress), _("done"));
+       if (!cd->remote)
+               {
+               gtk_widget_set_sensitive(cd->button_stop, FALSE);
+               gtk_widget_set_sensitive(cd->button_close, TRUE);
 
+               gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(cd->progress), 1.0);
+               gtk_progress_bar_set_text(GTK_PROGRESS_BAR(cd->progress), _("done"));
+               }
        if (cd->idle_id)
                {
                g_source_remove(cd->idle_id);
@@ -789,14 +911,14 @@ static void cache_manager_standard_clean_done(CleanData *cd)
 
 static void cache_manager_standard_clean_stop_cb(GenericDialog *gd, gpointer data)
 {
-       CleanData *cd = data;
+       CacheOpsData *cd = data;
 
        cache_manager_standard_clean_done(cd);
 }
 
 static gint cache_manager_standard_clean_clear_cb(gpointer data)
 {
-       CleanData *cd = data;
+       CacheOpsData *cd = data;
 
        if (cd->list)
                {
@@ -811,10 +933,13 @@ static gint cache_manager_standard_clean_clear_cb(gpointer data)
                file_data_unref(next_fd);
 
                cd->count_done++;
-               if (cd->count_total != 0)
+               if (!cd->remote)
                        {
-                       gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(cd->progress),
-                                                     (gdouble)cd->count_done / cd->count_total);
+                       if (cd->count_total != 0)
+                               {
+                               gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(cd->progress),
+                                                             (gdouble)cd->count_done / cd->count_total);
+                               }
                        }
 
                return TRUE;
@@ -827,7 +952,7 @@ static gint cache_manager_standard_clean_clear_cb(gpointer data)
 
 static void cache_manager_standard_clean_valid_cb(const gchar *path, gboolean valid, gpointer data)
 {
-       CleanData *cd = data;
+       CacheOpsData *cd = data;
 
        if (path)
                {
@@ -838,10 +963,13 @@ static void cache_manager_standard_clean_valid_cb(const gchar *path, gboolean va
                        }
 
                cd->count_done++;
-               if (cd->count_total != 0)
+               if (!cd->remote)
                        {
-                       gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(cd->progress),
-                                                     (gdouble)cd->count_done / cd->count_total);
+                       if (cd->count_total != 0)
+                               {
+                               gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(cd->progress),
+                                                             (gdouble)cd->count_done / cd->count_total);
+                               }
                        }
                }
 
@@ -863,36 +991,39 @@ static void cache_manager_standard_clean_valid_cb(const gchar *path, gboolean va
                }
 }
 
-static void cache_manager_standard_clean_start_cb(GenericDialog *gd, gpointer data)
+static void cache_manager_standard_clean_start(GenericDialog *gd, gpointer data)
 {
-       CleanData *cd = data;
+       CacheOpsData *cd = data;
        GList *list;
        gchar *path;
        FileData *dir_fd;
 
-       if (cd->list || !gtk_widget_get_sensitive(cd->button_start)) return;
+       if (!cd->remote)
+       {
+               if (cd->list || !gtk_widget_get_sensitive(cd->button_start)) return;
 
-       gtk_widget_set_sensitive(cd->button_start, FALSE);
-       gtk_widget_set_sensitive(cd->button_stop, TRUE);
-       gtk_widget_set_sensitive(cd->button_close, FALSE);
+               gtk_widget_set_sensitive(cd->button_start, FALSE);
+               gtk_widget_set_sensitive(cd->button_stop, TRUE);
+               gtk_widget_set_sensitive(cd->button_close, FALSE);
 
-       gtk_progress_bar_set_text(GTK_PROGRESS_BAR(cd->progress), _("running..."));
+               gtk_progress_bar_set_text(GTK_PROGRESS_BAR(cd->progress), _("running..."));
+       }
 
-       path = g_build_filename(homedir(), THUMB_FOLDER_GLOBAL, THUMB_FOLDER_NORMAL, NULL);
+       path = g_build_filename(get_thumbnails_standard_cache_dir(), THUMB_FOLDER_NORMAL, NULL);
        dir_fd = file_data_new_dir(path);
        filelist_read(dir_fd, &list, NULL);
        cd->list = list;
        file_data_unref(dir_fd);
        g_free(path);
 
-       path = g_build_filename(homedir(), THUMB_FOLDER_GLOBAL, THUMB_FOLDER_LARGE, NULL);
+       path = g_build_filename(get_thumbnails_standard_cache_dir(), THUMB_FOLDER_LARGE, NULL);
        dir_fd = file_data_new_dir(path);
        filelist_read(dir_fd, &list, NULL);
        cd->list = g_list_concat(cd->list, list);
        file_data_unref(dir_fd);
        g_free(path);
 
-       path = g_build_filename(homedir(), THUMB_FOLDER_GLOBAL, THUMB_FOLDER_FAIL, NULL);
+       path = g_build_filename(get_thumbnails_standard_cache_dir(), THUMB_FOLDER_FAIL, NULL);
        dir_fd = file_data_new_dir(path);
        filelist_read(dir_fd, &list, NULL);
        cd->list = g_list_concat(cd->list, list);
@@ -913,14 +1044,20 @@ static void cache_manager_standard_clean_start_cb(GenericDialog *gd, gpointer da
                }
 }
 
+static void cache_manager_standard_clean_start_cb(GenericDialog *gd, gpointer data)
+{
+       cache_manager_standard_clean_start(gd, data);
+}
+
 static void cache_manager_standard_process(GtkWidget *widget, gboolean clear)
 {
-       CleanData *cd;
+       CacheOpsData *cd;
        const gchar *stock_id;
        const gchar *msg;
 
-       cd = g_new0(CleanData, 1);
+       cd = g_new0(CacheOpsData, 1);
        cd->clear = clear;
+       cd->remote = FALSE;
 
        if (clear)
                {
@@ -946,7 +1083,7 @@ static void cache_manager_standard_process(GtkWidget *widget, gboolean clear)
                                                    cache_manager_standard_clean_stop_cb, FALSE);
        gtk_widget_set_sensitive(cd->button_stop, FALSE);
 
-       generic_dialog_add_message(cd->gd, stock_id, msg, NULL);
+       generic_dialog_add_message(cd->gd, stock_id, msg, NULL, FALSE);
 
        cd->progress = gtk_progress_bar_new();
        gtk_progress_bar_set_text(GTK_PROGRESS_BAR(cd->progress), _("click start to begin"));
@@ -963,6 +1100,20 @@ static void cache_manager_standard_process(GtkWidget *widget, gboolean clear)
        gtk_widget_show(cd->gd->dialog);
 }
 
+void cache_manager_standard_process_remote(gboolean clear)
+{
+       CacheOpsData *cd;
+
+       cd = g_new0(CacheOpsData, 1);
+       cd->clear = clear;
+       cd->days = 30;
+       cd->tl = NULL;
+       cd->idle_id = 0;
+       cd->remote = TRUE;
+
+       cache_manager_standard_clean_start(NULL, cd);
+}
+
 static void cache_manager_standard_clean_cb(GtkWidget *widget, gpointer data)
 {
        cache_manager_standard_process(widget, FALSE);
@@ -998,7 +1149,7 @@ void cache_manager_main_clear_confirm(GtkWidget *parent)
                                "clear_cache", parent, TRUE,
                                dummy_cancel_cb, NULL);
        generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION, _("Clear cache"),
-                                  _("This will remove all thumbnails that have\nbeen saved to disk, continue?"));
+                                  _("This will remove all thumbnails and sim. files\nthat have been saved to disk, continue?"), TRUE);
        generic_dialog_add_button(gd, GTK_STOCK_OK, NULL, cache_manager_main_clear_ok_cb, TRUE);
 
        gtk_widget_show(gd->dialog);
@@ -1046,11 +1197,253 @@ static GtkWidget *cache_manager_location_label(GtkWidget *group, const gchar *su
        buf = g_strdup_printf(_("Location: %s"), subdir);
        label = pref_label_new(group, buf);
        g_free(buf);
+#if GTK_CHECK_VERSION(3,16,0)
+       gtk_label_set_xalign(GTK_LABEL(label), 0.0);
+       gtk_label_set_yalign(GTK_LABEL(label), 0.5);
+#else
        gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+#endif
 
        return label;
 }
 
+static gboolean cache_manager_sim_file(CacheOpsData *cd);
+
+static void cache_manager_sim_reset(CacheOpsData *cd)
+{
+       filelist_free(cd->list);
+       cd->list = NULL;
+
+       filelist_free(cd->list_dir);
+       cd->list_dir = NULL;
+
+       cache_loader_free((CacheLoader *)cd->cl);
+       cd->cl = NULL;
+}
+
+static void cache_manager_sim_close_cb(GenericDialog *fd, gpointer data)
+{
+       CacheOpsData *cd = data;
+
+       if (!gtk_widget_get_sensitive(cd->button_close)) return;
+
+       cache_manager_sim_reset(cd);
+       generic_dialog_close(cd->gd);
+       g_free(cd);
+}
+
+static void cache_manager_sim_finish(CacheOpsData *cd)
+{
+       cache_manager_sim_reset(cd);
+       if (!cd->remote)
+               {
+               spinner_set_interval(cd->spinner, -1);
+
+               gtk_widget_set_sensitive(cd->group, TRUE);
+               gtk_widget_set_sensitive(cd->button_start, TRUE);
+               gtk_widget_set_sensitive(cd->button_stop, FALSE);
+               gtk_widget_set_sensitive(cd->button_close, TRUE);
+               }
+}
+
+static void cache_manager_sim_stop_cb(GenericDialog *fd, gpointer data)
+{
+       CacheOpsData *cd = data;
+
+       gtk_entry_set_text(GTK_ENTRY(cd->progress), _("stopped"));
+       cache_manager_sim_finish(cd);
+}
+
+static void cache_manager_sim_folder(CacheOpsData *cd, FileData *dir_fd)
+{
+       GList *list_d = NULL;
+       GList *list_f = NULL;
+
+       if (cd->recurse)
+               {
+               filelist_read(dir_fd, &list_f, &list_d);
+               }
+       else
+               {
+               filelist_read(dir_fd, &list_f, NULL);
+               }
+
+       list_f = filelist_filter(list_f, FALSE);
+       list_d = filelist_filter(list_d, TRUE);
+
+       cd->list = g_list_concat(list_f, cd->list);
+       cd->list_dir = g_list_concat(list_d, cd->list_dir);
+}
+
+static void cache_manager_sim_file_done_cb(CacheLoader *cl, gint error, gpointer data)
+{
+       CacheOpsData *cd = data;
+
+       cache_loader_free((CacheLoader *)cd->cl);
+       cd->cl = NULL;
+
+       while (cache_manager_sim_file(cd));
+}
+
+static gboolean cache_manager_sim_file(CacheOpsData *cd)
+{
+       CacheDataType load_mask;
+
+       if (cd->list)
+               {
+               FileData *fd;
+               fd = cd->list->data;
+               cd->list = g_list_remove(cd->list, fd);
+
+               load_mask = CACHE_LOADER_DIMENSIONS | CACHE_LOADER_DATE | CACHE_LOADER_MD5SUM | CACHE_LOADER_SIMILARITY;
+               cd->cl = (CacheLoader *)cache_loader_new(fd, load_mask, (cache_manager_sim_file_done_cb), cd);
+
+               gtk_entry_set_text(GTK_ENTRY(cd->progress), fd->path);
+
+               file_data_unref(fd);
+               cd->count_done = cd->count_done + 1;
+               gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(cd->progress_bar), (gdouble)cd->count_done / cd->count_total);
+
+               return FALSE;
+               }
+       else if (cd->list_dir)
+               {
+               FileData *fd;
+
+               fd = cd->list_dir->data;
+               cd->list_dir = g_list_remove(cd->list_dir, fd);
+
+               cache_manager_sim_folder((CacheOpsData *)cd, fd);
+               file_data_unref(fd);
+
+               return TRUE;
+               }
+
+       gtk_entry_set_text(GTK_ENTRY(cd->progress), _("done"));
+       cache_manager_sim_finish((CacheOpsData *)cd);
+
+       return FALSE;
+}
+
+static void cache_manager_sim_start_cb(GenericDialog *fd, gpointer data)
+{
+       CacheOpsData *cd = data;
+       gchar *path;
+       GList *list_total = NULL;
+
+       if (!cd->remote)
+               {
+               if (cd->list || !gtk_widget_get_sensitive(cd->button_start)) return;
+               }
+
+       path = remove_trailing_slash((gtk_entry_get_text(GTK_ENTRY(cd->entry))));
+       parse_out_relatives(path);
+
+       if (!isdir(path))
+               {
+               if (!cd->remote)
+                       {
+                       warning_dialog(_("Invalid folder"),
+                       _("The specified folder can not be found."),
+                       GTK_STOCK_DIALOG_WARNING, cd->gd->dialog);
+                       }
+               else
+                       {
+                       log_printf("The specified folder can not be found: %s\n", path);
+                       }
+               }
+       else
+               {
+               FileData *dir_fd;
+               if(!cd->remote)
+                       {
+                       gtk_widget_set_sensitive(cd->group, FALSE);
+                       gtk_widget_set_sensitive(cd->button_start, FALSE);
+                       gtk_widget_set_sensitive(cd->button_stop, TRUE);
+                       gtk_widget_set_sensitive(cd->button_close, FALSE);
+
+                       spinner_set_interval(cd->spinner, SPINNER_SPEED);
+                       }
+               dir_fd = file_data_new_dir(path);
+               cache_manager_sim_folder(cd, dir_fd);
+               list_total = filelist_recursive(dir_fd);
+               cd->count_total = g_list_length(list_total);
+               file_data_unref(dir_fd);
+               g_list_free(list_total);
+               cd->count_done = 0;
+
+               while (cache_manager_sim_file((CacheOpsData *)cd));
+               }
+
+       g_free(path);
+}
+
+static void cache_manager_sim_load_dialog(GtkWidget *widget, const gchar *path)
+{
+       CacheOpsData *cd;
+       GtkWidget *hbox;
+       GtkWidget *label;
+
+       cd = g_new0(CacheOpsData, 1);
+       cd->remote = FALSE;
+       cd->recurse = TRUE;
+
+       cd->gd = generic_dialog_new(_("Create sim. files"), "create_sim_files", widget, FALSE, NULL, cd);
+       gtk_window_set_default_size(GTK_WINDOW(cd->gd->dialog), PURGE_DIALOG_WIDTH, -1);
+       cd->gd->cancel_cb = cache_manager_sim_close_cb;
+       cd->button_close = generic_dialog_add_button(cd->gd, GTK_STOCK_CLOSE, NULL,
+                                                    cache_manager_sim_close_cb, FALSE);
+       cd->button_start = generic_dialog_add_button(cd->gd, GTK_STOCK_OK, _("S_tart"),
+                                                    cache_manager_sim_start_cb, FALSE);
+       cd->button_stop = generic_dialog_add_button(cd->gd, GTK_STOCK_STOP, NULL,
+                                                   cache_manager_sim_stop_cb, FALSE);
+       gtk_widget_set_sensitive(cd->button_stop, FALSE);
+
+       generic_dialog_add_message(cd->gd, NULL, _("Create sim. files recursively"), NULL, FALSE);
+
+       hbox = pref_box_new(cd->gd->vbox, FALSE, GTK_ORIENTATION_HORIZONTAL, 0);
+       pref_spacer(hbox, PREF_PAD_INDENT);
+       cd->group = pref_box_new(hbox, TRUE, GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
+
+       hbox = pref_box_new(cd->group, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
+       pref_label_new(hbox, _("Folder:"));
+
+       label = tab_completion_new(&cd->entry, path, NULL, NULL, NULL, NULL);
+       tab_completion_add_select_button(cd->entry,_("Select folder") , TRUE);
+       gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
+       gtk_widget_show(label);
+
+       pref_line(cd->gd->vbox, PREF_PAD_SPACE);
+       hbox = pref_box_new(cd->gd->vbox, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
+
+       cd->progress = gtk_entry_new();
+       gtk_widget_set_can_focus(cd->progress, FALSE);
+       gtk_editable_set_editable(GTK_EDITABLE(cd->progress), FALSE);
+       gtk_entry_set_text(GTK_ENTRY(cd->progress), _("click start to begin"));
+       gtk_box_pack_start(GTK_BOX(hbox), cd->progress, TRUE, TRUE, 0);
+       gtk_widget_show(cd->progress);
+
+       cd->progress_bar = gtk_progress_bar_new();
+       gtk_box_pack_start(GTK_BOX(cd->gd->vbox), cd->progress_bar, TRUE, TRUE, 0);
+       gtk_widget_show(cd->progress_bar);
+
+       cd->spinner = spinner_new(NULL, -1);
+       gtk_box_pack_start(GTK_BOX(hbox), cd->spinner, FALSE, FALSE, 0);
+       gtk_widget_show(cd->spinner);
+
+       cd->list = NULL;
+
+       gtk_widget_show(cd->gd->dialog);
+}
+
+static void cache_manager_sim_load_cb(GtkWidget *widget, gpointer data)
+{
+       const gchar *path = layout_get_path(NULL);
+
+       if (!path || !*path) path = homedir();
+       cache_manager_sim_load_dialog(widget, path);
+}
+
 void cache_manager_show(void)
 {
        GenericDialog *gd;
@@ -1080,11 +1473,11 @@ void cache_manager_show(void)
        generic_dialog_add_button(gd, GTK_STOCK_HELP, NULL,
                                  cache_manager_help_cb, FALSE);
 
-       generic_dialog_add_message(gd, NULL, _("Cache and Data Maintenance"), NULL);
+       generic_dialog_add_message(gd, NULL, _("Cache and Data Maintenance"), NULL, FALSE);
 
        sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 
-       group = pref_group_new(gd->vbox, FALSE, _("Thumbnail cache"), GTK_ORIENTATION_VERTICAL);
+       group = pref_group_new(gd->vbox, FALSE, _("Geeqie thumbnail and sim. cache"), GTK_ORIENTATION_VERTICAL);
 
        cache_manager_location_label(group, get_thumbnails_cache_dir());
 
@@ -1093,17 +1486,17 @@ void cache_manager_show(void)
        button = pref_table_button(table, 0, 0, GTK_STOCK_CLEAR, _("Clean up"), FALSE,
                                   G_CALLBACK(cache_manager_main_clean_cb), cache_manager);
        gtk_size_group_add_widget(sizegroup, button);
-       pref_table_label(table, 1, 0, _("Remove orphaned or outdated thumbnails."), 0.0);
+       pref_table_label(table, 1, 0, _("Remove orphaned or outdated thumbnails and sim. files."), 0.0);
 
        button = pref_table_button(table, 0, 1, GTK_STOCK_DELETE, _("Clear cache"), FALSE,
                                   G_CALLBACK(cache_manager_main_clear_cb), cache_manager);
        gtk_size_group_add_widget(sizegroup, button);
-       pref_table_label(table, 1, 1, _("Delete all cached thumbnails."), 0.0);
+       pref_table_label(table, 1, 1, _("Delete all cached data."), 0.0);
 
 
        group = pref_group_new(gd->vbox, FALSE, _("Shared thumbnail cache"), GTK_ORIENTATION_VERTICAL);
 
-       path = g_build_filename(homedir(), THUMB_FOLDER_GLOBAL, NULL);
+       path = g_build_filename(get_thumbnails_standard_cache_dir(), NULL);
        cache_manager_location_label(group, path);
        g_free(path);
 
@@ -1127,6 +1520,17 @@ void cache_manager_show(void)
                                   G_CALLBACK(cache_manager_render_cb), cache_manager);
        gtk_size_group_add_widget(sizegroup, button);
        pref_table_label(table, 1, 1, _("Render thumbnails for a specific folder."), 0.0);
+       gtk_widget_set_sensitive(group, options->thumbnails.enable_caching);
+
+       group = pref_group_new(gd->vbox, FALSE, _("File similarity cache"), GTK_ORIENTATION_VERTICAL);
+
+       table = pref_table_new(group, 3, 2, FALSE, FALSE);
+
+       button = pref_table_button(table, 0, 0, GTK_STOCK_EXECUTE, _("Create"), FALSE,
+                                  G_CALLBACK(cache_manager_sim_load_cb), cache_manager);
+       gtk_size_group_add_widget(sizegroup, button);
+       pref_table_label(table, 1, 0, _("Create sim. files recursively."), 0.0);
+       gtk_widget_set_sensitive(group, options->thumbnails.enable_caching);
 
        group = pref_group_new(gd->vbox, FALSE, _("Metadata"), GTK_ORIENTATION_VERTICAL);