/*
* Geeqie
* (C) 2006 John Ellis
+ * Copyright (C) 2008 - 2012 The Geeqie Team
*
* Author: John Ellis
*
#include "cache_maint.h"
#include "cache.h"
-#include "filelist.h"
+#include "filedata.h"
+#include "layout.h"
#include "thumb.h"
#include "thumb_standard.h"
#include "ui_fileops.h"
{
GList *list;
GList *done_list;
- gint idle_id;
+ guint idle_id; /* event source id */
GenericDialog *gd;
GtkWidget *entry;
GtkWidget *spinner;
GtkWidget *button_stop;
GtkWidget *button_close;
- gint clear;
- gint metadata;
+ gboolean clear;
+ gboolean metadata;
};
#define PURGE_DIALOG_WIDTH 400
*-------------------------------------------------------------------
*/
-static gint extension_truncate(gchar *path, const gchar *ext)
-{
- gint l;
- gint el;
-
- if (!path || !ext) return FALSE;
-
- l = strlen(path);
- el = strlen(ext);
-
- if (l < el || strcmp(path + (l - el), ext) != 0) return FALSE;
-
- path[l - el] = '\0';
-
- return TRUE;
-}
-
static gchar *extension_find_dot(gchar *path)
{
- gchar *ptr;
+ gchar *dot = NULL;
- if (!path || *path == '\0') return NULL;
+ if (!path) return NULL;
- ptr = path;
- while (*ptr != '\0') ptr++;
-
- while (ptr > path && *ptr != '.') ptr--;
-
- if (ptr == path) return NULL;
+ while (*path != '\0')
+ {
+ if (*path == '.') dot = path;
+ path++;
+ }
- return ptr;
+ return dot;
}
-static gint isempty(const gchar *path)
+static gboolean isempty(const gchar *path)
{
DIR *dp;
struct dirent *dir;
static void cache_maintain_home_close(CMData *cm)
{
- if (cm->idle_id != -1) g_source_remove(cm->idle_id);
+ if (cm->idle_id) g_source_remove(cm->idle_id);
if (cm->gd) generic_dialog_close(cm->gd);
- path_list_free(cm->list);
+ filelist_free(cm->list);
g_list_free(cm->done_list);
g_free(cm);
}
static void cache_maintain_home_stop(CMData *cm)
{
- if (cm->idle_id != -1)
+ if (cm->idle_id)
{
g_source_remove(cm->idle_id);
- cm->idle_id = -1;
+ cm->idle_id = 0;
}
gtk_entry_set_text(GTK_ENTRY(cm->entry), _("done"));
gtk_widget_set_sensitive(cm->button_close, TRUE);
}
-static gint cache_maintain_home_cb(gpointer data)
+static gboolean cache_maintain_home_cb(gpointer data)
{
CMData *cm = data;
GList *dlist = NULL;
GList *list = NULL;
- gchar *path;
- gint just_done = FALSE;
- gint still_have_a_file = TRUE;
- gint base_length;
+ FileData *fd;
+ gboolean just_done = FALSE;
+ gboolean still_have_a_file = TRUE;
+ gsize base_length;
const gchar *cache_folder;
if (cm->metadata)
{
- cache_folder = GQ_CACHE_RC_METADATA;
+ cache_folder = get_metadata_cache_dir();
}
else
{
- cache_folder = GQ_CACHE_RC_THUMB;
+ cache_folder = get_thumbnails_cache_dir();
}
- base_length = strlen(homedir()) + strlen("/") + strlen(cache_folder);
+ base_length = strlen(cache_folder);
if (!cm->list)
{
- if (debug) printf("purge chk done.\n");
- cm->idle_id = -1;
+ DEBUG_1("purge chk done.");
+ cm->idle_id = 0;
cache_maintain_home_stop(cm);
return FALSE;
}
- path = cm->list->data;
+ fd = cm->list->data;
- if (debug) printf("purge chk (%d) \"%s\"\n", (cm->clear && !cm->metadata), path);
+ DEBUG_1("purge chk (%d) \"%s\"", (cm->clear && !cm->metadata), fd->path);
- if (g_list_find(cm->done_list, path) == NULL)
+ if (g_list_find(cm->done_list, fd) == NULL)
{
- cm->done_list = g_list_prepend(cm->done_list, path);
+ cm->done_list = g_list_prepend(cm->done_list, fd);
- if (path_list(path, &list, &dlist))
+ if (filelist_read(fd, &list, &dlist))
{
GList *work;
just_done = TRUE;
still_have_a_file = FALSE;
-
+
work = list;
while (work)
{
- gchar *path_buf = work->data;
+ FileData *fd_list = work->data;
+ gchar *path_buf = g_strdup(fd_list->path);
gchar *dot;
-
+
dot = extension_find_dot(path_buf);
-
+
if (dot) *dot = '\0';
if ((!cm->metadata && cm->clear) ||
(strlen(path_buf) > base_length && !isfile(path_buf + base_length)) )
{
if (dot) *dot = '.';
- if (!unlink_file(path_buf)) printf("failed to delete:%s\n", path_buf);
+ if (!unlink_file(path_buf)) log_printf("failed to delete:%s\n", path_buf);
}
else
{
still_have_a_file = TRUE;
}
+ g_free(path_buf);
work = work->next;
}
}
}
- path_list_free(list);
+ filelist_free(list);
cm->list = g_list_concat(dlist, cm->list);
if (cm->list && g_list_find(cm->done_list, cm->list->data) != NULL)
{
/* check if the dir is empty */
-
- if (cm->list->data == path && just_done)
+
+ if (cm->list->data == fd && just_done)
{
- if (!still_have_a_file && !dlist && cm->list->next && !rmdir_utf8(path))
+ if (!still_have_a_file && !dlist && cm->list->next && !rmdir_utf8(fd->path))
{
- printf("Unable to delete dir: %s\n", path);
+ log_printf("Unable to delete dir: %s\n", fd->path);
}
}
else
{
/* must re-check for an empty dir */
- if (isempty(path) && cm->list->next && !rmdir_utf8(path))
+ if (isempty(fd->path) && cm->list->next && !rmdir_utf8(fd->path))
{
- printf("Unable to delete dir: %s\n", path);
+ log_printf("Unable to delete dir: %s\n", fd->path);
}
}
- path = cm->list->data;
- cm->done_list = g_list_remove(cm->done_list, path);
- cm->list = g_list_remove(cm->list, path);
- g_free(path);
+ fd = cm->list->data;
+ cm->done_list = g_list_remove(cm->done_list, fd);
+ cm->list = g_list_remove(cm->list, fd);
+ file_data_unref(fd);
}
if (cm->list)
{
const gchar *buf;
- path = cm->list->data;
- if (strlen(path) > base_length)
+ fd = cm->list->data;
+ if (strlen(fd->path) > base_length)
{
- buf = path + base_length;
+ buf = fd->path + base_length;
}
else
{
{
CMData *cm = data;
- if (!GTK_WIDGET_SENSITIVE(cm->button_close)) return;
+ if (!gtk_widget_get_sensitive(cm->button_close)) return;
cache_maintain_home_close(cm);
}
}
/* sorry for complexity (cm->done_list), but need it to remove empty dirs */
-void cache_maintain_home(gint metadata, gint clear, GtkWidget *parent)
+void cache_maintain_home(gboolean metadata, gboolean clear, GtkWidget *parent)
{
CMData *cm;
- GList *dlist = NULL;
- gchar *base;
+ GList *dlist;
+ FileData *dir_fd;
const gchar *msg;
const gchar *cache_folder;
GtkWidget *hbox;
if (metadata)
{
- cache_folder = GQ_CACHE_RC_METADATA;
+ cache_folder = get_metadata_cache_dir();
}
else
{
- cache_folder = GQ_CACHE_RC_THUMB;
+ cache_folder = get_thumbnails_cache_dir();
}
- base = g_strconcat(homedir(), "/", cache_folder, NULL);
-
- if (!path_list(base, NULL, &dlist))
+ dir_fd = file_data_new_dir(cache_folder);
+ if (!filelist_read(dir_fd, NULL, &dlist))
{
- g_free(base);
+ file_data_unref(dir_fd);
return;
}
- dlist = g_list_append(dlist, base);
+ dlist = g_list_append(dlist, dir_fd);
cm = g_new0(CMData, 1);
cm->list = dlist;
}
cm->gd = generic_dialog_new(_("Maintenance"),
- GQ_WMCLASS, "main_maintenance",
+ "main_maintenance",
parent, FALSE,
NULL, cm);
cm->gd->cancel_cb = cache_maintain_home_close_cb;
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);
cm->spinner = spinner_new(NULL, SPINNER_SPEED);
gtk_box_pack_start(GTK_BOX(hbox), cm->spinner, FALSE, FALSE, 0);
gtk_widget_show(cm->spinner);
-
+
gtk_widget_show(cm->gd->dialog);
cm->idle_id = g_idle_add(cache_maintain_home_cb, cm);
}
-/* 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 '.')
- */
-gint cache_maintain_home_dir(const gchar *dir, gint recursive, gint clear)
-{
- gchar *base;
- gint base_length;
- GList *dlist = NULL;
- GList *flist = NULL;
- gint still_have_a_file = FALSE;
-
- if (debug) printf("maintainance check: %s\n", dir);
-
- base_length = strlen(homedir()) + strlen("/") + strlen(GQ_CACHE_RC_THUMB);
- base = g_strconcat(homedir(), "/", GQ_CACHE_RC_THUMB, dir, NULL);
-
- if (path_list(base, &flist, &dlist))
- {
- GList *work;
-
- work = dlist;
- while(work)
- {
- gchar *path = work->data;
- if (recursive && strlen(path) > base_length &&
- !cache_maintain_home_dir(path + base_length, recursive, clear))
- {
- if (debug) printf("Deleting thumb dir: %s\n", path);
- if (!rmdir_utf8(path))
- {
- printf("Unable to delete dir: %s\n", path);
- }
- }
- else
- {
- still_have_a_file = TRUE;
- }
- work = work->next;
- }
-
- work = flist;
- while (work)
- {
- gchar *path = work->data;
- 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)) printf("failed to delete:%s\n", path);
- }
- else
- {
- still_have_a_file = TRUE;
- }
-
- work = work->next;
- }
- }
-
- path_list_free(dlist);
- path_list_free(flist);
- g_free(base);
-
- 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(const gchar *dir, gint recursive, gint clear)
-{
- GList *list = NULL;
- gchar *cachedir;
- gint still_have_a_file = FALSE;
- GList *work;
-
- cachedir = g_strconcat(dir, "/", GQ_CACHE_LOCAL_THUMB, NULL);
-
- path_list(cachedir, &list, NULL);
- work = list;
-
- while (work)
- {
- const gchar *path;
- gchar *source;
-
- path = work->data;
- work = work->next;
-
- source = g_strconcat(dir, "/", filename_from_path(path), 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(path))
- {
- if (debug) printf("Failed to remove cache file %s\n", path);
- still_have_a_file = TRUE;
- }
- }
- }
- else
- {
- still_have_a_file = TRUE;
- }
- g_free(source);
- }
-
- path_list_free(list);
- g_free(cachedir);
-
- if (recursive)
- {
- list = NULL;
-
- path_list(dir, NULL, &list);
- work = list;
- while (work)
- {
- const gchar *path = work->data;
- work = work->next;
-
- still_have_a_file |= cache_maintain_dir(path, recursive, clear);
- }
-
- path_list_free(list);
- }
-
- return still_have_a_file;
-}
-
static void cache_file_move(const gchar *src, const gchar *dest)
{
if (!dest || !src || !isfile(src)) return;
if (!move_file(src, dest))
{
- if (debug) printf("Failed to move cache file %s\nto %s\n", src, dest);
+ DEBUG_1("Failed to move cache file \"%s\" to \"%s\"", src, dest);
/* we remove it anyway - it's stale */
unlink_file(src);
}
}
-void cache_maint_moved(FileData *fd)
+static void cache_maint_moved(FileData *fd)
{
gchar *base;
mode_t mode = 0755;
if (!src || !dest) return;
base = cache_get_location(CACHE_TYPE_THUMB, dest, FALSE, &mode);
- if (cache_ensure_dir_exists(base, mode))
+ if (recursive_mkdir_if_not_exists(base, mode))
{
gchar *buf;
gchar *d;
}
else
{
- printf("Failed to create cache dir for move %s\n", base);
+ log_printf("Failed to create cache dir for move %s\n", base);
}
g_free(base);
base = cache_get_location(CACHE_TYPE_METADATA, dest, FALSE, &mode);
- if (cache_ensure_dir_exists(base, mode))
+ if (recursive_mkdir_if_not_exists(base, mode))
{
gchar *buf;
gchar *d;
-
+
buf = cache_find_location(CACHE_TYPE_METADATA, src);
d = cache_get_location(CACHE_TYPE_METADATA, dest, TRUE, NULL);
cache_file_move(buf, d);
{
if (path && isfile(path) && !unlink_file(path))
{
- if (debug) printf("Failed to remove cache file %s\n", path);
+ DEBUG_1("Failed to remove cache file %s", path);
}
}
-void cache_maint_removed(FileData *fd)
+static void cache_maint_removed(FileData *fd)
{
gchar *buf;
thumb_std_maint_removed(fd->path);
}
-void cache_maint_copied(FileData *fd)
+static void cache_maint_copied(FileData *fd)
{
gchar *dest_base;
gchar *src_cache;
if (!src_cache) return;
dest_base = cache_get_location(CACHE_TYPE_METADATA, fd->change->dest, FALSE, &mode);
- if (cache_ensure_dir_exists(dest_base, mode))
+ if (recursive_mkdir_if_not_exists(dest_base, mode))
{
gchar *path;
-
+
path = cache_get_location(CACHE_TYPE_METADATA, fd->change->dest, TRUE, NULL);
if (!copy_file(src_cache, path))
{
- if (debug) printf("failed to copy metadata %s to %s\n", src_cache, path);
+ DEBUG_1("failed to copy metadata %s to %s", src_cache, path);
}
g_free(path);
}
g_free(src_cache);
}
+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)
+ {
+ case FILEDATA_CHANGE_MOVE:
+ case FILEDATA_CHANGE_RENAME:
+ cache_maint_moved(fd);
+ break;
+ case FILEDATA_CHANGE_COPY:
+ cache_maint_copied(fd);
+ break;
+ case FILEDATA_CHANGE_DELETE:
+ cache_maint_removed(fd);
+ break;
+ case FILEDATA_CHANGE_UNSPECIFIED:
+ case FILEDATA_CHANGE_WRITE_METADATA:
+ break;
+ }
+}
+
+
/*
*-------------------------------------------------------------------
* new cache maintenance utilities
GList *list_dir;
gint days;
- gint clear;
+ gboolean clear;
GtkWidget *button_close;
GtkWidget *button_stop;
gint count_total;
gint count_done;
- gint local;
- gint recurse;
+ gboolean local;
+ gboolean recurse;
- gint idle_id;
+ guint idle_id; /* event source id */
};
static void cache_manager_render_reset(CleanData *cd)
{
- path_list_free(cd->list);
+ filelist_free(cd->list);
cd->list = NULL;
- path_list_free(cd->list_dir);
+ filelist_free(cd->list_dir);
cd->list_dir = NULL;
thumb_loader_free((ThumbLoader *)cd->tl);
{
CleanData *cd = data;
- if (!GTK_WIDGET_SENSITIVE(cd->button_close)) return;
+ if (!gtk_widget_get_sensitive(cd->button_close)) return;
cache_manager_render_reset(cd);
generic_dialog_close(cd->gd);
cache_manager_render_finish(cd);
}
-static void cache_manager_render_folder(CleanData *cd, const gchar *path)
+static void cache_manager_render_folder(CleanData *cd, FileData *dir_fd)
{
GList *list_d = NULL;
GList *list_f = NULL;
if (cd->recurse)
{
- path_list(path, &list_f, &list_d);
+ filelist_read(dir_fd, &list_f, &list_d);
}
else
{
- path_list(path, &list_f, NULL);
+ filelist_read(dir_fd, &list_f, NULL);
}
- list_f = path_list_filter(list_f, FALSE);
- list_d = path_list_filter(list_d, TRUE);
+ 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 gint cache_manager_render_file(CleanData *cd);
+static gboolean cache_manager_render_file(CleanData *cd);
static void cache_manager_render_thumb_done_cb(ThumbLoader *tl, gpointer data)
{
while (cache_manager_render_file(cd));
}
-static gint cache_manager_render_file(CleanData *cd)
+static gboolean cache_manager_render_file(CleanData *cd)
{
if (cd->list)
{
- gchar *path;
+ FileData *fd;
gint success;
- path = cd->list->data;
- cd->list = g_list_remove(cd->list, path);
+ fd = cd->list->data;
+ cd->list = g_list_remove(cd->list, fd);
cd->tl = (ThumbLoaderStd *)thumb_loader_new(options->thumbnails.max_width, options->thumbnails.max_height);
thumb_loader_set_callbacks((ThumbLoader *)cd->tl,
cache_manager_render_thumb_done_cb,
NULL, cd);
thumb_loader_set_cache((ThumbLoader *)cd->tl, TRUE, cd->local, TRUE);
- success = thumb_loader_start((ThumbLoader *)cd->tl, path);
+ success = thumb_loader_start((ThumbLoader *)cd->tl, fd);
if (success)
{
- gtk_entry_set_text(GTK_ENTRY(cd->progress), path);
+ gtk_entry_set_text(GTK_ENTRY(cd->progress), fd->path);
}
else
{
cd->tl = NULL;
}
- g_free(path);
+ file_data_unref(fd);
return (!success);
}
else if (cd->list_dir)
{
- gchar *path;
+ FileData *fd;
- path = cd->list_dir->data;
- cd->list_dir = g_list_remove(cd->list_dir, path);
+ fd = cd->list_dir->data;
+ cd->list_dir = g_list_remove(cd->list_dir, fd);
- cache_manager_render_folder(cd, path);
+ cache_manager_render_folder(cd, fd);
- g_free(path);
+ file_data_unref(fd);
return TRUE;
}
CleanData *cd = data;
gchar *path;
- if (cd->list || !GTK_WIDGET_SENSITIVE(cd->button_start)) return;
+ 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."),
+ _("The specified folder can not be found."),
GTK_STOCK_DIALOG_WARNING, cd->gd->dialog);
}
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);
spinner_set_interval(cd->spinner, SPINNER_SPEED);
- cache_manager_render_folder(cd, path);
+ dir_fd = file_data_new_dir(path);
+ cache_manager_render_folder(cd, dir_fd);
+ file_data_unref(dir_fd);
while (cache_manager_render_file(cd));
}
cd = g_new0(CleanData, 1);
cd->gd = generic_dialog_new(_("Create thumbnails"),
- GQ_WMCLASS, "create_thumbnails",
+ "create_thumbnails",
widget, FALSE,
NULL, cd);
gtk_window_set_default_size(GTK_WINDOW(cd->gd->dialog), PURGE_DIALOG_WIDTH, -1);
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);
{
CleanData *cd = data;
- if (!GTK_WIDGET_SENSITIVE(cd->button_close)) return;
+ if (!gtk_widget_get_sensitive(cd->button_close)) return;
generic_dialog_close(cd->gd);
thumb_loader_std_thumb_file_validate_cancel(cd->tl);
- path_list_free(cd->list);
+ filelist_free(cd->list);
g_free(cd);
}
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 != -1)
+ if (cd->idle_id)
{
g_source_remove(cd->idle_id);
- cd->idle_id = -1;
+ cd->idle_id = 0;
}
thumb_loader_std_thumb_file_validate_cancel(cd->tl);
cd->tl = NULL;
- path_list_free(cd->list);
+ filelist_free(cd->list);
cd->list = NULL;
}
if (cd->list)
{
- gchar *next_path;
+ FileData *next_fd;
- next_path = cd->list->data;
- cd->list = g_list_remove(cd->list, next_path);
+ next_fd = cd->list->data;
+ cd->list = g_list_remove(cd->list, next_fd);
- if (debug) printf("thumb removed: %s\n", next_path);
+ DEBUG_1("thumb removed: %s", next_fd->path);
- unlink_file(next_path);
- g_free(next_path);
+ unlink_file(next_fd->path);
+ file_data_unref(next_fd);
cd->count_done++;
if (cd->count_total != 0)
return TRUE;
}
- cd->idle_id = -1;
+ cd->idle_id = 0;
cache_manager_standard_clean_done(cd);
return FALSE;
}
-static void cache_manager_standard_clean_valid_cb(const gchar *path, gint valid, gpointer data)
+static void cache_manager_standard_clean_valid_cb(const gchar *path, gboolean valid, gpointer data)
{
CleanData *cd = data;
{
if (!valid)
{
- if (debug) printf("thumb cleaned: %s\n", path);
+ DEBUG_1("thumb cleaned: %s", path);
unlink_file(path);
}
cd->tl = NULL;
if (cd->list)
{
- gchar *next_path;
+ FileData *next_fd;
- next_path = cd->list->data;
- cd->list = g_list_remove(cd->list, next_path);
-
- cd->tl = thumb_loader_std_thumb_file_validate(next_path, cd->days,
+ next_fd = cd->list->data;
+ cd->list = g_list_remove(cd->list, next_fd);
+
+ cd->tl = thumb_loader_std_thumb_file_validate(next_fd->path, cd->days,
cache_manager_standard_clean_valid_cb, cd);
- g_free(next_path);
+ file_data_unref(next_fd);
}
else
{
CleanData *cd = data;
GList *list;
gchar *path;
+ FileData *dir_fd;
- if (cd->list || !GTK_WIDGET_SENSITIVE(cd->button_start)) return;
+ 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_progress_bar_set_text(GTK_PROGRESS_BAR(cd->progress), _("running..."));
- path = g_strconcat(homedir(), "/", THUMB_FOLDER_GLOBAL, "/", THUMB_FOLDER_NORMAL, NULL);
- list = NULL;
- path_list(path, &list, NULL);
+ path = g_build_filename(homedir(), THUMB_FOLDER_GLOBAL, 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_strconcat(homedir(), "/", THUMB_FOLDER_GLOBAL, "/", THUMB_FOLDER_LARGE, NULL);
- list = NULL;
- path_list(path, &list, NULL);
+ path = g_build_filename(homedir(), THUMB_FOLDER_GLOBAL, 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_strconcat(homedir(), "/", THUMB_FOLDER_GLOBAL, "/", THUMB_FOLDER_FAIL, NULL);
- list = NULL;
- path_list(path, &list, NULL);
+ path = g_build_filename(homedir(), THUMB_FOLDER_GLOBAL, 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);
+ file_data_unref(dir_fd);
g_free(path);
cd->count_total = g_list_length(cd->list);
}
}
-static void cache_manager_standard_process(GtkWidget *widget, gint clear)
+static void cache_manager_standard_process(GtkWidget *widget, gboolean clear)
{
CleanData *cd;
const gchar *stock_id;
}
cd->gd = generic_dialog_new(_("Maintenance"),
- GQ_WMCLASS, "standard_maintenance",
+ "standard_maintenance",
widget, FALSE,
NULL, cd);
cd->gd->cancel_cb = cache_manager_standard_clean_close_cb;
cd->days = 30;
cd->tl = NULL;
- cd->idle_id = -1;
+ cd->idle_id = 0;
gtk_widget_show(cd->gd->dialog);
}
GenericDialog *gd;
gd = generic_dialog_new(_("Clear cache"),
- GQ_WMCLASS, "clear_cache", parent, TRUE,
+ "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?"));
static void cache_manager_render_cb(GtkWidget *widget, gpointer data)
{
- cache_manager_render_dialog(widget, homedir());
+ const gchar *path = layout_get_path(NULL);
+
+ if (!path || !*path) path = homedir();
+ cache_manager_render_dialog(widget, path);
}
static void cache_manager_metadata_clean_cb(GtkWidget *widget, gpointer data)
cache_manager = NULL;
}
+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);
+ label = pref_label_new(group, buf);
+ g_free(buf);
+ gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+
+ return label;
+}
+
void cache_manager_show(void)
{
GenericDialog *gd;
GtkWidget *group;
GtkWidget *button;
- GtkWidget *label;
GtkWidget *table;
GtkSizeGroup *sizegroup;
- gchar *buf;
- gchar *title;
if (cache_manager)
{
cache_manager = g_new0(CacheManager, 1);
- title = g_strdup_printf("%s - %s", _("Cache Maintenance"), GQ_APPNAME);
- cache_manager->dialog = generic_dialog_new(title,
- GQ_WMCLASS, "cache_manager",
+ cache_manager->dialog = generic_dialog_new(_("Cache Maintenance"),
+ "cache_manager",
NULL, FALSE,
NULL, cache_manager);
- g_free(title);
gd = cache_manager->dialog;
gd->cancel_cb = cache_manager_close_cb;
group = pref_group_new(gd->vbox, FALSE, _("Thumbnail cache"), GTK_ORIENTATION_VERTICAL);
- buf = g_strconcat(_("Location:"), " ", homedir(), "/", GQ_CACHE_RC_THUMB, NULL);
- label = pref_label_new(group, buf);
- gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
- g_free(buf);
+ cache_manager_location_label(group, get_thumbnails_cache_dir());
table = pref_table_new(group, 2, 2, FALSE, FALSE);
group = pref_group_new(gd->vbox, FALSE, _("Shared thumbnail cache"), GTK_ORIENTATION_VERTICAL);
- buf = g_strconcat(_("Location:"), " ", homedir(), "/", THUMB_FOLDER_GLOBAL, NULL);
- label = pref_label_new(group, buf);
- gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
- g_free(buf);
+ cache_manager_location_label(group, THUMB_FOLDER_GLOBAL);
table = pref_table_new(group, 2, 2, FALSE, FALSE);
group = pref_group_new(gd->vbox, FALSE, _("Metadata"), GTK_ORIENTATION_VERTICAL);
- buf = g_strconcat(_("Location:"), " ", homedir(), "/", GQ_CACHE_RC_METADATA, NULL);
- label = pref_label_new(group, buf);
- gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
- g_free(buf);
+ cache_manager_location_label(group, get_metadata_cache_dir());
table = pref_table_new(group, 2, 1, FALSE, FALSE);
gtk_widget_show(cache_manager->dialog->dialog);
}
-
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
projects / geeqie.git / blobdiff