Use util_clip_triangle() in pan_item_tri_new()
[geeqie.git] / src / collect-io.c
diff --git a/src/collect-io.c b/src/collect-io.c
deleted file mode 100644 (file)
index 9fb9d12..0000000
+++ /dev/null
@@ -1,933 +0,0 @@
-/*
- * Geeqie
- * (C) 2004 John Ellis
- * Copyright (C) 2008 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!
- */
-
-
-#include "main.h"
-#include "collect-io.h"
-
-#include "collect.h"
-#include "filelist.h"
-#include "layout_util.h"
-#include "rcfile.h"
-#include "secure_save.h"
-#include "thumb.h"
-#include "ui_fileops.h"
-
-
-#define GQ_COLLECTION_MARKER "#" GQ_APPNAME
-
-#define GQ_COLLECTION_FAIL_MIN     300
-#define GQ_COLLECTION_FAIL_PERCENT 98
-#define GQ_COLLECTION_READ_BUFSIZE 4096
-
-typedef struct _CollectManagerEntry CollectManagerEntry;
-
-static void collection_load_thumb_step(CollectionData *cd);
-static gint collection_save_private(CollectionData *cd, const gchar *path);
-
-static CollectManagerEntry *collect_manager_get_entry(const gchar *path);
-static void collect_manager_entry_reset(CollectManagerEntry *entry);
-static gint collect_manager_process_action(CollectManagerEntry *entry, gchar **path_ptr);
-
-
-static gint scan_geometry(gchar *buffer, gint *x, gint *y, gint *w, gint *h)
-{
-       gint nx, ny, nw, nh;
-
-       if(sscanf(buffer, "%d %d %d %d", &nx, &ny, &nw, &nh) != 4) return FALSE;
-
-       *x = nx;
-       *y = ny;
-       *w = nw;
-       *h = nh;
-
-       return TRUE;
-}
-
-static gint collection_load_private(CollectionData *cd, const gchar *path, CollectionLoadFlags flags)
-{
-       gchar s_buf[GQ_COLLECTION_READ_BUFSIZE];
-       FILE *f;
-       gchar *pathl;
-       gint limit_failures = TRUE;
-       gint success = TRUE;
-       gint has_official_header = FALSE;
-       gint has_geometry_header = FALSE;
-       gint has_gqview_header   = FALSE;
-       gint need_header         = TRUE;
-       guint total = 0;
-       guint fail = 0;
-       gboolean changed = FALSE;
-       CollectManagerEntry *entry = NULL;
-       guint flush = !!(flags & COLLECTION_LOAD_FLUSH);
-       guint append = !!(flags & COLLECTION_LOAD_APPEND);
-       guint only_geometry = !!(flags & COLLECTION_LOAD_GEOMETRY);
-
-       if (!only_geometry)
-               {
-               collection_load_stop(cd);
-
-               if (flush)
-                       collect_manager_flush();
-               else
-                       entry = collect_manager_get_entry(path);
-
-               if (!append)
-                       {
-                       collection_list_free(cd->list);
-                       cd->list = NULL;
-                       }
-               }
-
-       if (!path && !cd->path) return FALSE;
-
-       if (!path) path = cd->path;
-
-       if (debug) printf("collection load: append=%d flush=%d only_geometry=%d path=%s\n",
-                         append, flush, only_geometry, path);
-
-       /* load it */
-       pathl = path_from_utf8(path);
-       f = fopen(pathl, "r");
-       g_free(pathl);
-       if (!f)
-               {
-               printf("Failed to open collection file: \"%s\"\n", path);
-               return FALSE;
-               }
-
-       while (fgets(s_buf, sizeof(s_buf), f))
-               {
-               gchar *buf;
-               gchar *p = s_buf;
-
-               /* Skip whitespaces and empty lines */
-               while (*p && g_ascii_isspace(*p)) p++;
-               if (*p == '\n' || *p == '\r') continue;
-
-               /* Parse comments */
-               if (*p == '#')
-                       {
-                       if (!need_header) continue;
-                       if (strncasecmp(p, GQ_COLLECTION_MARKER, strlen(GQ_COLLECTION_MARKER)) == 0)
-                               {
-                               /* Looks like an official collection, allow unchecked input.
-                                * All this does is allow adding files that may not exist,
-                                * which is needed for the collection manager to work.
-                                * Also unofficial files abort after too many invalid entries.
-                                */
-                               has_official_header = TRUE;
-                               limit_failures = FALSE;
-                               }
-                       else if (strncmp(p, "#geometry:", 10 ) == 0 &&
-                                scan_geometry(p + 10, &cd->window_x, &cd->window_y, &cd->window_w, &cd->window_h))
-                               {
-                               has_geometry_header = TRUE;
-                               cd->window_read = TRUE;
-                               if (only_geometry) break;
-                               }
-                       else if (strncasecmp(p, "#GQview collection", strlen("#GQview collection")) == 0)
-                               {
-                               /* As 2008/04/15 there is no difference between our collection file format
-                                * and GQview 2.1.5 collection file format so ignore failures as well. */
-                               has_gqview_header = TRUE;
-                               limit_failures = FALSE;
-                               }
-                       need_header = (!has_official_header && !has_gqview_header) || !has_geometry_header;
-                       continue;
-                       }
-
-               /* Read filenames */
-               buf = quoted_value(p, NULL);
-               if (buf)
-                       {
-                       gint valid;
-
-                       if (!flush)
-                               changed |= collect_manager_process_action(entry, &buf);
-
-                       valid = (buf[0] == '/' && collection_add_check(cd, file_data_new_simple(buf), FALSE, TRUE));
-                       if (debug && !valid) printf("collection invalid file: %s\n", buf);
-                       g_free(buf);
-
-                       total++;
-                       if (!valid)
-                               {
-                               fail++;
-                               if (limit_failures &&
-                                   fail > GQ_COLLECTION_FAIL_MIN &&
-                                   fail * 100 / total > GQ_COLLECTION_FAIL_PERCENT)
-                                       {
-                                       printf("%d invalid filenames in unofficial collection file, closing: %s\n", fail, path);
-                                       success = FALSE;
-                                       break;
-                                       }
-                               }
-                       }
-               }
-
-       if (debug) printf("collection files: total = %d fail = %d official=%d gqview=%d geometry=%d\n",
-                         total, fail, has_official_header, has_gqview_header, has_geometry_header);
-
-       fclose(f);
-       if (only_geometry) return has_geometry_header;
-
-       if (!flush)
-               {
-               gchar *buf = NULL;
-               while (collect_manager_process_action(entry, &buf))
-                       {
-                       collection_add_check(cd, file_data_new_simple(buf), FALSE, TRUE);
-                       changed = TRUE;
-                       g_free(buf);
-                       buf = NULL;
-                       }
-               }
-
-       cd->list = collection_list_sort(cd->list, cd->sort_method);
-
-       if (!flush && changed && success)
-               collection_save_private(cd, path);
-
-       if (!flush)
-               collect_manager_entry_reset(entry);
-
-       if (!append) cd->changed = FALSE;
-
-       return success;
-}
-
-gint collection_load(CollectionData *cd, const gchar *path, CollectionLoadFlags flags)
-{
-       if (collection_load_private(cd, path, flags | COLLECTION_LOAD_FLUSH))
-               {
-               layout_recent_add_path(cd->path);
-               return TRUE;
-               }
-
-       return FALSE;
-}
-
-static void collection_load_thumb_do(CollectionData *cd)
-{
-       GdkPixbuf *pixbuf;
-
-       if (!cd->thumb_loader || !g_list_find(cd->list, cd->thumb_info)) return;
-
-       pixbuf = thumb_loader_get_pixbuf(cd->thumb_loader, TRUE);
-       collection_info_set_thumb(cd->thumb_info, pixbuf);
-       g_object_unref(pixbuf);
-
-       if (cd->info_updated_func) cd->info_updated_func(cd, cd->thumb_info, cd->info_updated_data);
-}
-
-static void collection_load_thumb_error_cb(ThumbLoader *tl, gpointer data)
-{
-       CollectionData *cd = data;
-
-       collection_load_thumb_do(cd);
-       collection_load_thumb_step(cd);
-}
-
-static void collection_load_thumb_done_cb(ThumbLoader *tl, gpointer data)
-{
-       CollectionData *cd = data;
-
-       collection_load_thumb_do(cd);
-       collection_load_thumb_step(cd);
-}
-
-static void collection_load_thumb_step(CollectionData *cd)
-{
-       GList *work;
-       CollectInfo *ci;
-
-       if (!cd->list)
-               {
-               collection_load_stop(cd);
-               return;
-               }
-
-       work = cd->list;
-       ci = work->data;
-       work = work->next;
-       /* find first unloaded thumb */
-       while (work && ci->pixbuf)
-               {
-               ci = work->data;
-               work = work->next;
-               }
-
-       if (!ci || ci->pixbuf)
-               {
-               /* done */
-               collection_load_stop(cd);
-
-               /* send a NULL CollectInfo to notify end */
-               if (cd->info_updated_func) cd->info_updated_func(cd, NULL, cd->info_updated_data);
-
-               return;
-               }
-
-       /* setup loader and call it */
-       cd->thumb_info = ci;
-       thumb_loader_free(cd->thumb_loader);
-       cd->thumb_loader = thumb_loader_new(options->thumbnails.max_width, options->thumbnails.max_height);
-       thumb_loader_set_callbacks(cd->thumb_loader,
-                                  collection_load_thumb_done_cb,
-                                  collection_load_thumb_error_cb,
-                                  NULL,
-                                  cd);
-
-       /* start it */
-       if (!thumb_loader_start(cd->thumb_loader, ci->fd->path))
-               {
-               /* error, handle it, do next */
-               if (debug) printf("error loading thumb for %s\n", ci->fd->path);
-               collection_load_thumb_do(cd);
-               collection_load_thumb_step(cd);
-               }
-}
-
-void collection_load_thumb_idle(CollectionData *cd)
-{
-       if (!cd->thumb_loader) collection_load_thumb_step(cd);
-}
-
-gint collection_load_begin(CollectionData *cd, const gchar *path, CollectionLoadFlags flags)
-{
-       if (!collection_load(cd, path, flags)) return FALSE;
-
-       collection_load_thumb_idle(cd);
-
-       return TRUE;
-}
-
-void collection_load_stop(CollectionData *cd)
-{
-       if (!cd->thumb_loader) return;
-
-       thumb_loader_free(cd->thumb_loader);
-       cd->thumb_loader = NULL;
-}
-
-static gint collection_save_private(CollectionData *cd, const gchar *path)
-{
-       SecureSaveInfo *ssi;
-       GList *work;
-       gchar *pathl;
-
-       if (!path && !cd->path) return FALSE;
-
-       if (!path)
-               {
-               path = cd->path;
-               }
-
-
-       pathl = path_from_utf8(path);
-       ssi = secure_open(pathl);
-       g_free(pathl);
-       if (!ssi)
-               {
-               printf_term(_("failed to open collection (write) \"%s\"\n"), path);
-               return FALSE;
-               }
-
-       secure_fprintf(ssi, "%s collection\n", GQ_COLLECTION_MARKER);
-       secure_fprintf(ssi, "#created with %s version %s\n", GQ_APPNAME, VERSION);
-
-       collection_update_geometry(cd);
-       if (cd->window_read)
-               {
-               secure_fprintf(ssi, "#geometry: %d %d %d %d\n", cd->window_x, cd->window_y, cd->window_w, cd->window_h);
-               }
-
-       work = cd->list;
-       while (work && secsave_errno == SS_ERR_NONE)
-               {
-               CollectInfo *ci = work->data;
-               secure_fprintf(ssi, "\"%s\"\n", ci->fd->path);
-               work = work->next;
-               }
-
-       secure_fprintf(ssi, "#end\n");
-
-       if (secure_close(ssi))
-               {
-               printf_term(_("error saving collection file: %s\nerror: %s\n"), path,
-                           secsave_strerror(secsave_errno));
-               return FALSE;
-               }
-
-       if (!cd->path || strcmp(path, cd->path) != 0)
-               {
-               gchar *buf = cd->path;
-               cd->path = g_strdup(path);
-               path = cd->path;
-               g_free(buf);
-
-               g_free(cd->name);
-               cd->name = g_strdup(filename_from_path(cd->path));
-
-               collection_path_changed(cd);
-               }
-
-       cd->changed = FALSE;
-
-       return TRUE;
-}
-
-gint collection_save(CollectionData *cd, const gchar *path)
-{
-       if (collection_save_private(cd, path))
-               {
-               layout_recent_add_path(cd->path);
-               return TRUE;
-               }
-
-       return FALSE;
-}
-
-gint collection_load_only_geometry(CollectionData *cd, const gchar *path)
-{
-       return collection_load(cd, path, COLLECTION_LOAD_GEOMETRY);
-}
-
-
-/*
- *-------------------------------------------------------------------
- * collection manager
- *-------------------------------------------------------------------
- */
-
-#define COLLECT_MANAGER_ACTIONS_PER_IDLE 1000
-#define COLLECT_MANAGER_FLUSH_DELAY      10000
-
-struct _CollectManagerEntry
-{
-       gchar *path;
-       GList *add_list;
-       GHashTable *oldpath_hash;
-       GHashTable *newpath_hash;
-       gboolean empty;
-};
-
-typedef enum {
-       COLLECTION_MANAGER_UPDATE,
-       COLLECTION_MANAGER_ADD,
-       COLLECTION_MANAGER_REMOVE
-} CollectManagerType;
-
-typedef struct _CollectManagerAction CollectManagerAction;
-struct _CollectManagerAction
-{
-       gchar *oldpath;
-       gchar *newpath;
-
-       CollectManagerType type;
-
-       gint ref;
-};
-
-
-static GList *collection_manager_entry_list = NULL;
-static GList *collection_manager_action_list = NULL;
-static GList *collection_manager_action_tail = NULL;
-static gint collection_manager_timer_id = -1;
-
-
-static CollectManagerAction *collect_manager_action_new(const gchar *oldpath, const gchar *newpath,
-                                                       CollectManagerType type)
-{
-       CollectManagerAction *action;
-
-       action = g_new0(CollectManagerAction, 1);
-       action->ref = 1;
-
-       action->oldpath = g_strdup(oldpath);
-       action->newpath = g_strdup(newpath);
-
-       action->type = type;
-
-       return action;
-}
-
-static void collect_manager_action_ref(CollectManagerAction *action)
-{
-       action->ref++;
-}
-
-static void collect_manager_action_unref(CollectManagerAction *action)
-{
-       action->ref--;
-
-       if (action->ref > 0) return;
-
-       g_free(action->oldpath);
-       g_free(action->newpath);
-       g_free(action);
-}
-
-static void collect_manager_entry_free_data(CollectManagerEntry *entry)
-{
-       GList *work;
-
-       work = entry->add_list;
-       while (work)
-               {
-               CollectManagerAction *action;
-
-               action = work->data;
-               work = work->next;
-
-               collect_manager_action_unref(action);
-               }
-       g_list_free(entry->add_list);
-       g_hash_table_destroy(entry->oldpath_hash);
-       g_hash_table_destroy(entry->newpath_hash);
-}
-
-static void collect_manager_entry_init_data(CollectManagerEntry *entry)
-{
-       entry->add_list = NULL;
-       entry->oldpath_hash = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, (GDestroyNotify) collect_manager_action_unref);
-       entry->newpath_hash = g_hash_table_new(g_str_hash, g_str_equal);
-       entry->empty = TRUE;
-
-}
-
-static CollectManagerEntry *collect_manager_entry_new(const gchar *path)
-{
-       CollectManagerEntry *entry;
-
-       entry = g_new0(CollectManagerEntry, 1);
-       entry->path = g_strdup(path);
-       collect_manager_entry_init_data(entry);
-
-       collection_manager_entry_list = g_list_append(collection_manager_entry_list, entry);
-
-       return entry;
-}
-
-
-static void collect_manager_entry_free(CollectManagerEntry *entry)
-{
-       collection_manager_entry_list = g_list_remove(collection_manager_entry_list, entry);
-
-       collect_manager_entry_free_data(entry);
-
-       g_free(entry->path);
-       g_free(entry);
-}
-
-static void collect_manager_entry_reset(CollectManagerEntry *entry)
-{
-       collect_manager_entry_free_data(entry);
-       collect_manager_entry_init_data(entry);
-}
-
-static CollectManagerEntry *collect_manager_get_entry(const gchar *path)
-{
-       GList *work;
-
-       work = collection_manager_entry_list;
-       while (work)
-               {
-               CollectManagerEntry *entry;
-
-               entry = work->data;
-               work = work->next;
-               if (strcmp(entry->path, path) == 0)
-                       {
-                       return entry;
-                       }
-               }
-       return NULL;
-
-}
-
-static void collect_manager_entry_add_action(CollectManagerEntry *entry, CollectManagerAction *action)
-{
-
-       CollectManagerAction *orig_action;
-
-       entry->empty = FALSE;
-
-       if (action->oldpath == NULL)
-               {
-               /* add file */
-               if (action->newpath == NULL)
-                       {
-                       return;
-                       }
-
-               orig_action = g_hash_table_lookup(entry->newpath_hash, action->newpath);
-               if (orig_action)
-                       {
-                       /* target already exists */
-                       printf("collection manager failed to add another action for target %s in collection %s\n",
-                               action->newpath, entry->path);
-                       return;
-                       }
-               entry->add_list = g_list_append(entry->add_list, action);
-               g_hash_table_insert(entry->newpath_hash, action->newpath, action);
-               collect_manager_action_ref(action);
-               return;
-               }
-
-       orig_action = g_hash_table_lookup(entry->newpath_hash, action->oldpath);
-       if (orig_action)
-               {
-               /* new action with the same file */
-               CollectManagerAction *new_action = collect_manager_action_new(orig_action->oldpath, action->newpath, action->type);
-
-               if (new_action->oldpath)
-                       {
-                       g_hash_table_steal(entry->oldpath_hash, orig_action->oldpath);
-                       g_hash_table_insert(entry->oldpath_hash, new_action->oldpath, new_action);
-                       }
-               else
-                       {
-                       GList *work = g_list_find(entry->add_list, orig_action);
-                       work->data = new_action;
-                       }
-
-               g_hash_table_steal(entry->newpath_hash, orig_action->newpath);
-               if (new_action->newpath)
-                       {
-                       g_hash_table_insert(entry->newpath_hash, new_action->newpath, new_action);
-                       }
-               collect_manager_action_unref(orig_action);
-               return;
-               }
-
-
-       orig_action = g_hash_table_lookup(entry->oldpath_hash, action->oldpath);
-       if (orig_action)
-               {
-               /* another action for the same source, ignore */
-               printf("collection manager failed to add another action for source %s in collection %s\n",
-                       action->oldpath, entry->path);
-               return;
-               }
-
-       g_hash_table_insert(entry->oldpath_hash, action->oldpath, action);
-       if (action->newpath)
-               {
-               g_hash_table_insert(entry->newpath_hash, action->newpath, action);
-               }
-       collect_manager_action_ref(action);
-}
-
-static gint collect_manager_process_action(CollectManagerEntry *entry, gchar **path_ptr)
-{
-       gchar *path = *path_ptr;
-       CollectManagerAction *action;
-
-       if (path == NULL)
-               {
-               /* get new files */
-               if (entry->add_list)
-                       {
-                       action = entry->add_list->data;
-                       g_assert(action->oldpath == NULL);
-                       entry->add_list = g_list_remove(entry->add_list, action);
-                       path = g_strdup(action->newpath);
-                       g_hash_table_remove(entry->newpath_hash, path);
-                       collect_manager_action_unref(action);
-                       }
-               *path_ptr = path;
-               return (path != NULL);
-               }
-
-       action = g_hash_table_lookup(entry->oldpath_hash, path);
-
-       if (action)
-               {
-               g_free(path);
-               path = g_strdup(action->newpath);
-               *path_ptr = path;
-               return TRUE;
-               }
-
-       return FALSE; /* no change */
-}
-
-static void collect_manager_refresh(void)
-{
-       GList *list = NULL;
-       GList *work;
-       gchar *base;
-
-       base = g_strconcat(homedir(), "/", GQ_RC_DIR_COLLECTIONS, NULL);
-       path_list(base, &list, NULL);
-       g_free(base);
-
-       work = collection_manager_entry_list;
-       while (work && list)
-               {
-               CollectManagerEntry *entry;
-               GList *list_step;
-
-               entry = work->data;
-               work = work->next;
-
-               list_step = list;
-               while (list_step && entry)
-                       {
-                       gchar *path;
-
-                       path = list_step->data;
-                       list_step = list_step->next;
-
-                       if (strcmp(path, entry->path) == 0)
-                               {
-                               list = g_list_remove(list, path);
-                               g_free(path);
-
-                               entry = NULL;
-                               }
-                       else
-                               {
-                               collect_manager_entry_free(entry);
-                               }
-                       }
-               }
-
-       work = list;
-       while (work)
-               {
-               gchar *path;
-
-               path = work->data;
-               work = work->next;
-
-               collect_manager_entry_new(path);
-               g_free(path);
-               }
-
-       g_list_free(list);
-}
-
-static void collect_manager_process_actions(gint max)
-{
-       if (debug && collection_manager_action_list)
-               {
-               printf("collection manager processing actions\n");
-               }
-
-       while (collection_manager_action_list != NULL && max > 0)
-               {
-               CollectManagerAction *action;
-               GList *work;
-
-               action = collection_manager_action_list->data;
-               work = collection_manager_entry_list;
-               while (work)
-                       {
-                       CollectManagerEntry *entry;
-
-                       entry = work->data;
-                       work = work->next;
-
-                       if (action->type == COLLECTION_MANAGER_UPDATE)
-                               {
-                               collect_manager_entry_add_action(entry, action);
-                               }
-                       else if (action->oldpath && action->newpath &&
-                                strcmp(action->newpath, entry->path) == 0)
-                               {
-                               /* convert action to standard add format */
-                               g_free(action->newpath);
-                               if (action->type == COLLECTION_MANAGER_ADD)
-                                       {
-                                       action->newpath = action->oldpath;
-                                       action->oldpath = NULL;
-                                       }
-                               else if (action->type == COLLECTION_MANAGER_REMOVE)
-                                       {
-                                       action->newpath = NULL;
-                                       }
-                               collect_manager_entry_add_action(entry, action);
-                               }
-
-                       max--;
-                       }
-
-               if (action->type != COLLECTION_MANAGER_UPDATE &&
-                   action->oldpath && action->newpath)
-                       {
-                       printf("collection manager failed to %s %s for collection %s\n",
-                               (action->type == COLLECTION_MANAGER_ADD) ? "add" : "remove",
-                               action->oldpath, action->newpath);
-                       }
-
-               if (collection_manager_action_tail == collection_manager_action_list)
-                       {
-                       collection_manager_action_tail = NULL;
-                       }
-               collection_manager_action_list = g_list_remove(collection_manager_action_list, action);
-               collect_manager_action_unref(action);
-               }
-}
-
-static gint collect_manager_process_entry(CollectManagerEntry *entry)
-{
-       CollectionData *cd;
-       gint success;
-
-       if (entry->empty) return FALSE;
-
-       cd = collection_new(entry->path);
-       success = collection_load_private(cd, entry->path, COLLECTION_LOAD_NONE);
-
-       collection_unref(cd);
-
-       return TRUE;
-}
-
-static gint collect_manager_process_entry_list(void)
-{
-       GList *work;
-
-       work = collection_manager_entry_list;
-       while (work)
-               {
-               CollectManagerEntry *entry;
-
-               entry = work->data;
-               work = work->next;
-               if (collect_manager_process_entry(entry)) return TRUE;
-               }
-
-       return FALSE;
-}
-
-
-
-static gint collect_manager_process_cb(gpointer data)
-{
-       if (collection_manager_action_list) collect_manager_refresh();
-       collect_manager_process_actions(COLLECT_MANAGER_ACTIONS_PER_IDLE);
-       if (collection_manager_action_list) return TRUE;
-
-       if (collect_manager_process_entry_list()) return TRUE;
-
-       if (debug) printf("collection manager is up to date\n");
-       return FALSE;
-}
-
-static gint collect_manager_timer_cb(gpointer data)
-{
-       if (debug) printf("collection manager timer expired\n");
-
-       g_idle_add_full(G_PRIORITY_LOW, collect_manager_process_cb, NULL, NULL);
-
-       collection_manager_timer_id = -1;
-       return FALSE;
-}
-
-static void collect_manager_timer_push(gint stop)
-{
-       if (collection_manager_timer_id != -1)
-               {
-               if (!stop) return;
-
-               g_source_remove(collection_manager_timer_id);
-               collection_manager_timer_id = -1;
-               }
-
-       if (!stop)
-               {
-               collection_manager_timer_id = g_timeout_add(COLLECT_MANAGER_FLUSH_DELAY,
-                                                           collect_manager_timer_cb, NULL);
-               if (debug) printf("collection manager timer started\n");
-               }
-}
-
-static void collect_manager_add_action(CollectManagerAction *action)
-{
-       if (!action) return;
-
-       /* we keep track of the list's tail to keep this a n(1) operation */
-
-       if (collection_manager_action_tail)
-               {
-               collection_manager_action_tail = g_list_append(collection_manager_action_tail, action);
-               collection_manager_action_tail = collection_manager_action_tail->next;
-               }
-       else
-               {
-               collection_manager_action_list = g_list_append(collection_manager_action_list, action);
-               collection_manager_action_tail = collection_manager_action_list;
-               }
-
-       collect_manager_timer_push(FALSE);
-}
-
-void collect_manager_moved(FileData *fd)
-{
-       CollectManagerAction *action;
-       const gchar *oldpath = fd->change->source;
-       const gchar *newpath = fd->change->dest;
-
-       action = collect_manager_action_new(oldpath, newpath, COLLECTION_MANAGER_UPDATE);
-       collect_manager_add_action(action);
-}
-
-void collect_manager_add(FileData *fd, const gchar *collection)
-{
-       CollectManagerAction *action;
-       CollectWindow *cw;
-
-       if (!fd || !collection) return;
-
-       cw = collection_window_find_by_path(collection);
-       if (cw)
-               {
-               if (collection_list_find(cw->cd->list, fd->path) == NULL)
-                       {
-                       collection_add(cw->cd, fd, FALSE);
-                       }
-               return;
-               }
-
-       action = collect_manager_action_new(fd->path, collection, COLLECTION_MANAGER_ADD);
-       collect_manager_add_action(action);
-}
-
-void collect_manager_remove(FileData *fd, const gchar *collection)
-{
-       CollectManagerAction *action;
-       CollectWindow *cw;
-
-       if (!fd || !collection) return;
-
-       cw = collection_window_find_by_path(collection);
-       if (cw)
-               {
-               while (collection_remove(cw->cd, fd));
-               return;
-               }
-
-       action = collect_manager_action_new(fd->path, collection, COLLECTION_MANAGER_REMOVE);
-       collect_manager_add_action(action);
-}
-
-void collect_manager_flush(void)
-{
-       collect_manager_timer_push(TRUE);
-
-       if (debug) printf("collection manager flushing\n");
-       while (collect_manager_process_cb(NULL));
-}