/*
* Geeqie
* (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
*
* Author: John Ellis
*
{
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
*-------------------------------------------------------------------
*/
-#if 0
-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;
-}
-#endif
-
static gchar *extension_find_dot(gchar *path)
{
gchar *dot = NULL;
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);
filelist_free(cm->list);
g_list_free(cm->done_list);
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;
if (!cm->list)
{
DEBUG_1("purge chk done.");
- cm->idle_id = -1;
+ cm->idle_id = 0;
cache_maintain_home_stop(cm);
return FALSE;
}
{
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;
cache_folder = get_thumbnails_cache_dir();
}
- dir_fd = file_data_new_simple(cache_folder);
+ dir_fd = file_data_new_dir(cache_folder);
if (!filelist_read(dir_fd, NULL, &dlist))
{
file_data_unref(dir_fd);
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->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 '.')
- */
-gint cache_maintain_home_dir(const gchar *dir, gint recursive, gint clear)
-{
- gchar *base;
- gint base_length;
- GList *dlist = NULL;
- FileData *dir_fd;
- GList *flist = NULL;
- gint 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_simple(base);
- g_free(base);
-
- if (filelist_read(dir_fd, &flist, &dlist))
- {
- 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;
- }
- }
-
- 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;
- gint still_have_a_file = FALSE;
- GList *work;
-
- cachedir = g_build_filename(dir, GQ_CACHE_LOCAL_THUMB, NULL);
- cachedir_fd = file_data_new_simple(cachedir);
- g_free(cachedir);
-
- filelist_read(cachedir_fd, &list, NULL);
- work = list;
-
- while (work)
- {
- 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);
- }
-
- filelist_free(list);
- file_data_unref(cachedir_fd);
-
- if (recursive)
- {
- list = NULL;
-
- filelist_read(dir_fd, NULL, &list);
- work = list;
- while (work)
- {
- FileData *fd = work->data;
- work = work->next;
-
- still_have_a_file |= cache_maintain_dir(fd->path, recursive, clear);
- }
-
- filelist_free(list);
- }
-
- return still_have_a_file;
-}
-#endif
-
static void cache_file_move(const gchar *src, const gchar *dest)
{
if (!dest || !src || !isfile(src)) return;
void cache_notify_cb(FileData *fd, NotifyType type, gpointer data)
{
- if (type != NOTIFY_TYPE_CHANGE || !fd->change) return;
-
- switch(fd->change->type)
+ 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:
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)
{
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);
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)
{
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);
spinner_set_interval(cd->spinner, SPINNER_SPEED);
- dir_fd = file_data_new_simple(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));
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);
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);
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;
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_build_filename(homedir(), THUMB_FOLDER_GLOBAL, THUMB_FOLDER_NORMAL, NULL);
- dir_fd = file_data_new_simple(path);
+ 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);
- dir_fd = file_data_new_simple(path);
+ 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);
- dir_fd = file_data_new_simple(path);
+ 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);
}
}
-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->days = 30;
cd->tl = NULL;
- cd->idle_id = -1;
+ cd->idle_id = 0;
gtk_widget_show(cd->gd->dialog);
}
label = pref_label_new(group, buf);
g_free(buf);
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-
+
return label;
}
projects / geeqie.git / blobdiff