Cache maintenance - paths with spaces not handled
[geeqie.git] / src / cache_maint.c
index 743fcd9..2b551a8 100644 (file)
@@ -1,21 +1,32 @@
 /*
- * Geeqie
- * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2010 The Geeqie Team
+ * Copyright (C) 2006 John Ellis
+ * Copyright (C) 2008 - 2016 The Geeqie Team
  *
  * Author: John Ellis
  *
- * This software is released under the GNU General Public License (GNU GPL).
- * Please read the included file COPYING for more information.
- * This software comes with no warranty of any kind, use at your own risk!
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include "main.h"
 #include "cache_maint.h"
 
 #include "cache.h"
+#include "cache-loader.h"
 #include "filedata.h"
 #include "layout.h"
+#include "pixbuf_util.h"
 #include "thumb.h"
 #include "thumb_standard.h"
 #include "ui_fileops.h"
@@ -23,6 +34,7 @@
 #include "ui_spinner.h"
 #include "ui_tabcomp.h"
 #include "ui_utildlg.h"
+#include "window.h"
 
 
 typedef struct _CMData CMData;
@@ -38,35 +50,76 @@ struct _CMData
        GtkWidget *button_close;
        gboolean clear;
        gboolean metadata;
+       gboolean remote;
 };
 
 #define PURGE_DIALOG_WIDTH 400
 
-
 /*
- *-------------------------------------------------------------------
- * cache maintenance
- *-------------------------------------------------------------------
+ *-----------------------------------------------------------------------------
+ * Command line cache maintenance program functions *-----------------------------------------------------------------------------
  */
+static gchar *cache_maintenance_path = NULL;
+static GtkStatusIcon *status_icon;
+
+static void cache_maintenance_sim_stop_cb(gpointer data)
+{
+       exit(EXIT_SUCCESS);
+}
 
-#if 0
-static gint extension_truncate(gchar *path, const gchar *ext)
+static void cache_maintenance_render_stop_cb(gpointer data)
 {
-       gint l;
-       gint el;
+       gtk_status_icon_set_tooltip_text(status_icon, _("Geeqie: Creating sim data..."));
+       cache_manager_sim_remote(cache_maintenance_path, TRUE, (GDestroyNotify *)cache_maintenance_sim_stop_cb);
+}
 
-       if (!path || !ext) return FALSE;
+static void cache_maintenance_clean_stop_cb(gpointer data)
+{
+       gtk_status_icon_set_tooltip_text(status_icon, _("Geeqie: Creating thumbs..."));
+       cache_manager_render_remote(cache_maintenance_path, TRUE, options->thumbnails.cache_into_dirs, (GDestroyNotify *)cache_maintenance_render_stop_cb);
+}
 
-       l = strlen(path);
-       el = strlen(ext);
+static void cache_maintenance_user_cancel_cb()
+{
+       exit(EXIT_FAILURE);
+}
 
-       if (l < el || strcmp(path + (l - el), ext) != 0) return FALSE;
+static void cache_maintenance_status_icon_activate_cb(GtkStatusIcon *status, gpointer data)
+{
+       GtkWidget *menu;
+       GtkWidget *item;
 
-       path[l - el] = '\0';
+       menu = gtk_menu_new();
 
-       return TRUE;
+       item = gtk_menu_item_new_with_label("Exit Geeqie Cache Maintenance");
+
+       g_signal_connect(G_OBJECT(item), "activate", cache_maintenance_user_cancel_cb, item);
+       gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+       gtk_widget_show(item);
+
+       /* take ownership of menu */
+       g_object_ref_sink(G_OBJECT(menu));
+
+       gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time());
 }
-#endif
+
+void cache_maintenance(const gchar *path)
+{
+       cache_maintenance_path = g_strdup(path);
+
+       status_icon = gtk_status_icon_new_from_pixbuf(pixbuf_inline(PIXBUF_INLINE_ICON));
+       gtk_status_icon_set_tooltip_text(status_icon, _("Geeqie: Cleaning thumbs..."));
+       gtk_status_icon_set_visible(status_icon, TRUE);
+       g_signal_connect(G_OBJECT(status_icon), "activate", G_CALLBACK(cache_maintenance_status_icon_activate_cb), NULL);
+
+       cache_maintain_home_remote(FALSE, FALSE, (GDestroyNotify *)cache_maintenance_clean_stop_cb);
+}
+
+/*
+ *-------------------------------------------------------------------
+ * cache maintenance
+ *-------------------------------------------------------------------
+ */
 
 static gchar *extension_find_dot(gchar *path)
 {
@@ -126,11 +179,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)
@@ -143,6 +199,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)
                {
@@ -167,6 +224,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);
@@ -203,6 +267,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);
@@ -233,7 +299,7 @@ static gboolean cache_maintain_home_cb(gpointer data)
                file_data_unref(fd);
                }
 
-       if (cm->list)
+       if (cm->list && !cm->remote)
                {
                const gchar *buf;
 
@@ -256,11 +322,7 @@ static void cache_maintain_home_close_cb(GenericDialog *gd, gpointer data)
 {
        CMData *cm = data;
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (!gtk_widget_get_sensitive(cm->button_close)) return;
-#else
-       if (!GTK_WIDGET_SENSITIVE(cm->button_close)) return;
-#endif
 
        cache_maintain_home_close(cm);
 }
@@ -305,6 +367,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)
                {
@@ -330,7 +393,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);
@@ -338,7 +401,7 @@ void cache_maintain_home(gboolean metadata, gboolean clear, GtkWidget *parent)
        gtk_widget_show(hbox);
 
        cm->entry = gtk_entry_new();
-       GTK_WIDGET_UNSET_FLAGS(cm->entry, GTK_CAN_FOCUS);
+       gtk_widget_set_can_focus(cm->entry, FALSE);
        gtk_editable_set_editable(GTK_EDITABLE(cm->entry), FALSE);
        gtk_box_pack_start(GTK_BOX(hbox), cm->entry, TRUE, TRUE, 0);
        gtk_widget_show(cm->entry);
@@ -352,159 +415,48 @@ void cache_maintain_home(gboolean metadata, gboolean clear, GtkWidget *parent)
        cm->idle_id = g_idle_add(cache_maintain_home_cb, cm);
 }
 
-#if 0
-/* This checks all files in ~/GQ_RC_DIR/thumbnails and
- * removes them if thay have no source counterpart.
- * (this assumes all cache files have an extension of 4 chars including '.')
+/**
+ * @brief Clears or culls cached data
+ * @param metadata TRUE - work on metadata cache, FALSE - work on thumbnail cache
+ * @param clear TRUE - clear cache, FALSE - delete orphaned cached items
+ * @param func Function called when idle loop function terminates
+ * 
+ * 
  */
-gint cache_maintain_home_dir(const gchar *dir, gint recursive, gint clear)
+void cache_maintain_home_remote(gboolean metadata, gboolean clear, GDestroyNotify *func)
 {
-       gchar *base;
-       gint base_length;
-       GList *dlist = NULL;
+       CMData *cm;
+       GList *dlist;
        FileData *dir_fd;
-       GList *flist = NULL;
-       gboolean still_have_a_file = FALSE;
-
-       DEBUG_1("maintainance check: %s", dir);
-
-       base_length = strlen(homedir()) + strlen("/") + strlen(GQ_CACHE_RC_THUMB);
-       base = g_strconcat(homedir(), "/", GQ_CACHE_RC_THUMB, dir, NULL);
-       dir_fd = file_data_new_dir(base);
-       g_free(base);
+       const gchar *cache_folder;
 
-       if (filelist_read(dir_fd, &flist, &dlist))
+       if (metadata)
                {
-               GList *work;
-
-               work = dlist;
-               while (work)
-                       {
-                       FileData *fd = work->data;
-                       if (recursive && strlen(fd->path) > base_length &&
-                           !cache_maintain_home_dir(fd->path + base_length, recursive, clear))
-                               {
-                               DEBUG_1("Deleting thumb dir: %s", fd->path);
-                               if (!rmdir_utf8(fd->path))
-                                       {
-                                       log_printf("Unable to delete dir: %s\n", fd->path);
-                                       }
-                               }
-                       else
-                               {
-                               still_have_a_file = TRUE;
-                               }
-                       work = work->next;
-                       }
-
-               work = flist;
-               while (work)
-                       {
-                       FileData *fd = work->data;
-                       gchar *path = g_strdup(fd->path);
-                       gchar *dot;
-
-                       dot = extension_find_dot(path);
-
-                       if (dot) *dot = '\0';
-                       if (clear ||
-                           (strlen(path) > base_length && !isfile(path + base_length)) )
-                               {
-                               if (dot) *dot = '.';
-                               if (!unlink_file(path)) log_printf("failed to delete:%s\n", path);
-                               }
-                       else
-                               {
-                               still_have_a_file = TRUE;
-                               }
-                       g_free(path);
-
-                       work = work->next;
-                       }
+               cache_folder = get_metadata_cache_dir();
                }
-
-       filelist_free(dlist);
-       filelist_free(flist);
-       file_data_unref(dir_fd);
-
-       return still_have_a_file;
-}
-
-/* This checks relative caches in dir/.thumbnails and
- * removes them if they have no source counterpart.
- */
-gint cache_maintain_dir(FileData *dir_fd, gint recursive, gint clear)
-{
-       GList *list = NULL;
-       gchar *cachedir;
-       FileData *cachedir_fd;
-       gboolean still_have_a_file = FALSE;
-       GList *work;
-
-       cachedir = g_build_filename(dir, GQ_CACHE_LOCAL_THUMB, NULL);
-       cachedir_fd = file_data_new_dir(cachedir);
-       g_free(cachedir);
-
-       filelist_read(cachedir_fd, &list, NULL);
-       work = list;
-
-       while (work)
+       else
                {
-               FileData *fd;
-               gchar *source;
-
-               fd = work->data;
-               work = work->next;
-
-               source = g_build_filename(dir->path, fd->name, NULL);
-
-               if (clear ||
-                   extension_truncate(source, GQ_CACHE_EXT_THUMB) ||
-                   extension_truncate(source, GQ_CACHE_EXT_SIM))
-                       {
-                       if (!clear && isfile(source))
-                               {
-                               still_have_a_file = TRUE;
-                               }
-                       else
-                               {
-                               if (!unlink_file(fd->path))
-                                       {
-                                       DEBUG_1("Failed to remove cache file %s", fd->path);
-                                       still_have_a_file = TRUE;
-                                       }
-                               }
-                       }
-               else
-                       {
-                       still_have_a_file = TRUE;
-                       }
-               g_free(source);
+               cache_folder = get_thumbnails_cache_dir();
                }
 
-       filelist_free(list);
-       file_data_unref(cachedir_fd);
-
-       if (recursive)
+       dir_fd = file_data_new_dir(cache_folder);
+       if (!filelist_read(dir_fd, NULL, &dlist))
                {
-               list = NULL;
-
-               filelist_read(dir_fd, NULL, &list);
-               work = list;
-               while (work)
-                       {
-                       FileData *fd = work->data;
-                       work = work->next;
+               file_data_unref(dir_fd);
+               return;
+               }
 
-                       still_have_a_file |= cache_maintain_dir(fd->path, recursive, clear);
-                       }
+       dlist = g_list_append(dlist, dir_fd);
 
-               filelist_free(list);
-               }
+       cm = g_new0(CMData, 1);
+       cm->list = dlist;
+       cm->done_list = NULL;
+       cm->clear = clear;
+       cm->metadata = metadata;
+       cm->remote = TRUE;
 
-       return still_have_a_file;
+       cm->idle_id = g_idle_add_full(G_PRIORITY_LOW, cache_maintain_home_cb, cm, (GDestroyNotify)func);
 }
-#endif
 
 static void cache_file_move(const gchar *src, const gchar *dest)
 {
@@ -626,7 +578,7 @@ static void cache_maint_copied(FileData *fd)
 void cache_notify_cb(FileData *fd, NotifyType type, gpointer data)
 {
        if (!(type & NOTIFY_CHANGE) || !fd->change) return;
-       
+
        DEBUG_1("Notify cache_maint: %s %04x", fd->path, type);
        switch (fd->change->type)
                {
@@ -666,11 +618,13 @@ struct _CacheManager
        gint count_done;
 };
 
-typedef struct _CleanData CleanData;
-struct _CleanData
+typedef struct _CacheOpsData CacheOpsData;
+struct _CacheOpsData
 {
        GenericDialog *gd;
        ThumbLoaderStd *tl;
+       CacheLoader *cl;
+       GDestroyNotify *destroy_func; /* Used by the command line prog. functions */
 
        GList *list;
        GList *list_dir;
@@ -682,6 +636,7 @@ struct _CleanData
        GtkWidget *button_stop;
        GtkWidget *button_start;
        GtkWidget *progress;
+       GtkWidget *progress_bar;
        GtkWidget *spinner;
 
        GtkWidget *group;
@@ -693,10 +648,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;
@@ -710,40 +667,39 @@ 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_CHECK_VERSION(2,20,0)
        if (!gtk_widget_get_sensitive(cd->button_close)) return;
-#else
-       if (!GTK_WIDGET_SENSITIVE(cd->button_close)) return;
-#endif
 
        cache_manager_render_reset(cd);
        generic_dialog_close(cd->gd);
        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;
@@ -764,11 +720,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;
@@ -776,7 +732,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)
                {
@@ -795,7 +751,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
                        {
@@ -821,40 +782,87 @@ static gboolean cache_manager_render_file(CleanData *cd)
                return TRUE;
                }
 
+       if (!cd->remote)
+               {
+               gtk_entry_set_text(GTK_ENTRY(cd->progress), _("done"));
+               }
        cache_manager_render_finish(cd);
 
+       if (cd->destroy_func)
+               {
+               g_idle_add((GSourceFunc)cd->destroy_func, NULL);
+               }
+
        return FALSE;
 }
 
 static void cache_manager_render_start_cb(GenericDialog *fd, gpointer data)
 {
-       CleanData *cd = data;
+       CacheOpsData *cd = data;
        gchar *path;
+       GList *list_total = NULL;
 
-#if GTK_CHECK_VERSION(2,20,0)
-       if (cd->list || !gtk_widget_get_sensitive(cd->button_start)) return;
-#else
-       if (cd->list || !GTK_WIDGET_SENSITIVE(cd->button_start)) return;
-#endif
+       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);
+                       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;
+
+       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);
@@ -867,12 +875,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",
@@ -888,7 +897,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);
@@ -897,7 +906,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);
@@ -910,12 +919,16 @@ static void cache_manager_render_dialog(GtkWidget *widget, const gchar *path)
        hbox = pref_box_new(cd->gd->vbox, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
 
        cd->progress = gtk_entry_new();
-       GTK_WIDGET_UNSET_FLAGS(cd->progress, GTK_CAN_FOCUS);
+       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);
@@ -925,18 +938,33 @@ static void cache_manager_render_dialog(GtkWidget *widget, const gchar *path)
        gtk_widget_show(cd->gd->dialog);
 }
 
+/**
+ * @brief Create thumbnails
+ * @param path Path to image folder
+ * @param recurse 
+ * @param local Create thumbnails in same folder as images
+ * @param func Function called when idle loop function terminates
+ * 
+ * 
+ */
+void cache_manager_render_remote(const gchar *path, gboolean recurse, gboolean local, GDestroyNotify *func)
+{
+       CacheOpsData *cd;
 
+       cd = g_new0(CacheOpsData, 1);
+       cd->recurse = recurse;
+       cd->local = local;
+       cd->remote = TRUE;
+       cd->destroy_func = func;
 
+       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_CHECK_VERSION(2,20,0)
        if (!gtk_widget_get_sensitive(cd->button_close)) return;
-#else
-       if (!GTK_WIDGET_SENSITIVE(cd->button_close)) return;
-#endif
 
        generic_dialog_close(cd->gd);
 
@@ -945,14 +973,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);
@@ -968,14 +998,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)
                {
@@ -990,10 +1020,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;
@@ -1006,7 +1039,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)
                {
@@ -1017,10 +1050,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);
+                               }
                        }
                }
 
@@ -1042,40 +1078,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 GTK_CHECK_VERSION(2,20,0)
-       if (cd->list || !gtk_widget_get_sensitive(cd->button_start)) return;
-#else
-       if (cd->list || !GTK_WIDGET_SENSITIVE(cd->button_start)) return;
-#endif
+       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);
@@ -1096,14 +1131,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)
                {
@@ -1129,10 +1170,13 @@ 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"));
+#if GTK_CHECK_VERSION(3,0,0)
+       gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(cd->progress), TRUE);
+#endif
        gtk_box_pack_start(GTK_BOX(cd->gd->vbox), cd->progress, FALSE, FALSE, 0);
        gtk_widget_show(cd->progress);
 
@@ -1143,6 +1187,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);
@@ -1178,7 +1236,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);
@@ -1213,22 +1271,424 @@ static void cache_manager_close_cb(GenericDialog *gd, gpointer data)
        cache_manager = NULL;
 }
 
+static void cache_manager_help_cb(GenericDialog *gd, gpointer data)
+{
+       help_window_show("GuideReferenceManagement.html");
+}
+
 static GtkWidget *cache_manager_location_label(GtkWidget *group, const gchar *subdir)
 {
        GtkWidget *label;
        gchar *buf;
-       gchar *path;
 
-       path = g_build_filename(homedir(), subdir, NULL);
-       buf = g_strdup_printf(_("Location: %s"), path);
-       g_free(path);
+       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 void cache_manager_sim_start_sim_remote(CacheOpsData *cd, const gchar *user_path)
+{
+       gchar *path;
+
+       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_sim_folder(cd, dir_fd);
+               file_data_unref(dir_fd);
+               while (cache_manager_sim_file(cd));
+               }
+
+       g_free(path);
+}
+
+/**
+ * @brief Generate .sim files
+ * @param path Path to image folder
+ * @param recurse 
+ * @param func Function called when idle loop function terminates
+ * 
+ * 
+ */
+void cache_manager_sim_remote(const gchar *path, gboolean recurse, GDestroyNotify *func)
+{
+       CacheOpsData *cd;
+
+       cd = g_new0(CacheOpsData, 1);
+       cd->recurse = recurse;
+       cd->remote = TRUE;
+       cd->destroy_func = func;
+
+       cache_manager_sim_start_sim_remote(cd, path);
+}
+
+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);
+
+               if (!cd->remote)
+                       {
+                       gtk_entry_set_text(GTK_ENTRY(cd->progress), fd->path);
+                       }
+
+               file_data_unref(fd);
+               cd->count_done = cd->count_done + 1;
+               if (!cd->remote)
+                       {
+                       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;
+               }
+
+               if (!cd->remote)
+                       {
+                       gtk_entry_set_text(GTK_ENTRY(cd->progress), _("done"));
+                       }
+
+       cache_manager_sim_finish((CacheOpsData *)cd);
+
+       if (cd->destroy_func)
+               {
+               g_idle_add((GSourceFunc)cd->destroy_func, NULL);
+               }
+
+       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);
+}
+
+static void cache_manager_cache_maintenance_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_cache_maintenance_start_cb(GenericDialog *fd, gpointer data)
+{
+       CacheOpsData *cd = data;
+       gchar *path;
+       GList *list_total = NULL;
+       gchar *cmd_line;
+
+       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
+               {
+               cmd_line = g_strdup_printf("%s --cache-maintenance \"%s\"", gq_executable_path, path);
+
+               g_spawn_command_line_async(cmd_line, NULL);
+
+               g_free(cmd_line);
+               generic_dialog_close(cd->gd);
+               cache_manager_sim_reset(cd);
+               g_free(cd);
+               }
+
+       g_free(path);
+}
+
+static void cache_manager_cache_maintenance_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(_("Background cache maintenance"), "background_cache_maintenance", widget, FALSE, NULL, cd);
+       gtk_window_set_default_size(GTK_WINDOW(cd->gd->dialog), PURGE_DIALOG_WIDTH, -1);
+       cd->gd->cancel_cb = cache_manager_cache_maintenance_close_cb;
+       cd->button_close = generic_dialog_add_button(cd->gd, GTK_STOCK_CLOSE, NULL,
+                                                    cache_manager_cache_maintenance_close_cb, FALSE);
+       cd->button_start = generic_dialog_add_button(cd->gd, GTK_STOCK_OK, _("S_tart"),
+                                                    cache_manager_cache_maintenance_start_cb, FALSE);
+
+       generic_dialog_add_message(cd->gd, NULL, _("Recursively delete orphaned thumbnails\nand .sim files, and create new\nthumbnails and .sim files"), 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);
+
+       cd->list = NULL;
+
+       gtk_widget_show(cd->gd->dialog);
+}
+
+static void cache_manager_cache_maintenance_load_cb(GtkWidget *widget, gpointer data)
+{
+       const gchar *path = layout_get_path(NULL);
+
+       if (!path || !*path) path = homedir();
+       cache_manager_cache_maintenance_load_dialog(widget, path);
+}
+
 void cache_manager_show(void)
 {
        GenericDialog *gd;
@@ -1236,6 +1696,7 @@ void cache_manager_show(void)
        GtkWidget *button;
        GtkWidget *table;
        GtkSizeGroup *sizegroup;
+       gchar *path;
 
        if (cache_manager)
                {
@@ -1254,12 +1715,14 @@ void cache_manager_show(void)
        gd->cancel_cb = cache_manager_close_cb;
        generic_dialog_add_button(gd, GTK_STOCK_CLOSE, NULL,
                                  cache_manager_close_cb, FALSE);
+       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());
 
@@ -1268,17 +1731,19 @@ 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);
 
-       cache_manager_location_label(group, THUMB_FOLDER_GLOBAL);
+       path = g_build_filename(get_thumbnails_standard_cache_dir(), NULL);
+       cache_manager_location_label(group, path);
+       g_free(path);
 
        table = pref_table_new(group, 2, 2, FALSE, FALSE);
 
@@ -1300,6 +1765,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);
 
@@ -1312,6 +1788,16 @@ void cache_manager_show(void)
        gtk_size_group_add_widget(sizegroup, button);
        pref_table_label(table, 1, 0, _("Remove orphaned keywords and comments."), 0.0);
 
+       group = pref_group_new(gd->vbox, FALSE, _("Background cache maintenance"), GTK_ORIENTATION_VERTICAL);
+
+       table = pref_table_new(group, 3, 2, FALSE, FALSE);
+
+       button = pref_table_button(table, 0, 0, GTK_STOCK_EXECUTE, _("Select"), FALSE,
+                                  G_CALLBACK(cache_manager_cache_maintenance_load_cb), cache_manager);
+       gtk_size_group_add_widget(sizegroup, button);
+       pref_table_label(table, 1, 0, _("Run cache maintenance as a background job."), 0.0);
+       gtk_widget_set_sensitive(group, options->thumbnails.enable_caching);
+
        gtk_widget_show(cache_manager->dialog->dialog);
 }
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */