X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=blobdiff_plain;f=src%2Fcollect-io.c;h=bb9967d424ba5602a3e7753147e8cb13660ce6ab;hp=c38ad06b1254a5a49c76fb5e25a92419b7947414;hb=c4114f7d7b6baa193ba4fbeb8693becfcd256943;hpb=d0738ee165622d8e1782bb9a6eb7834f7d067fb6

diff --git a/src/collect-io.c b/src/collect-io.c
index c38ad06b..bb9967d4 100644
--- a/src/collect-io.c
+++ b/src/collect-io.c
@@ -1,6 +1,7 @@
 /*
  * Geeqie
  * (C) 2004 John Ellis
+ * Copyright (C) 2008 - 2012 The Geeqie Team
  *
  * Author: John Ellis
  *
@@ -14,14 +15,13 @@
 #include "collect-io.h"
 
 #include "collect.h"
-#include "filelist.h"
+#include "filedata.h"
 #include "layout_util.h"
-#include "rcfile.h"
+#include "misc.h"
 #include "secure_save.h"
 #include "thumb.h"
 #include "ui_fileops.h"
 
-
 #define GQ_COLLECTION_MARKER "#" GQ_APPNAME
 
 #define GQ_COLLECTION_FAIL_MIN     300
@@ -38,11 +38,11 @@ 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)
+static gboolean 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;
+	if (sscanf(buffer, "%d %d %d %d", &nx, &ny, &nw, &nh) != 4) return FALSE;
 
 	*x = nx;
 	*y = ny;
@@ -52,20 +52,24 @@ static gint scan_geometry(gchar *buffer, gint *x, gint *y, gint *w, gint *h)
 	return TRUE;
 }
 
-static gint collection_load_private(CollectionData *cd, const gchar *path, CollectionLoadFlags flags)
+static gboolean 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;
+	gboolean limit_failures = TRUE;
+	gboolean success = TRUE;
+	gboolean has_official_header = FALSE;
+	gboolean has_geometry_header = FALSE;
+	gboolean has_gqview_header   = FALSE;
+	gboolean 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;
+	guint flush = !!(flags & COLLECTION_LOAD_FLUSH);
+	guint append = !!(flags & COLLECTION_LOAD_APPEND);
+	guint only_geometry = !!(flags & COLLECTION_LOAD_GEOMETRY);
 
 	if (!only_geometry)
 		{
@@ -86,8 +90,8 @@ static gint collection_load_private(CollectionData *cd, const gchar *path, Colle
 	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",
+
+	DEBUG_1("collection load: append=%d flush=%d only_geometry=%d path=%s",
 			  append, flush, only_geometry, path);
 
 	/* load it */
@@ -96,63 +100,78 @@ static gint collection_load_private(CollectionData *cd, const gchar *path, Colle
 	g_free(pathl);
 	if (!f)
 		{
-		printf("Failed to open collection file: \"%s\"\n", path);
+		log_printf("Failed to open collection file: \"%s\"\n", path);
 		return FALSE;
 		}
 
 	while (fgets(s_buf, sizeof(s_buf), f))
 		{
 		gchar *buf;
-		if (s_buf[0]=='#')
+		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 (strncasecmp(s_buf, GQ_COLLECTION_MARKER, strlen(GQ_COLLECTION_MARKER)) == 0)
+			if (!need_header) continue;
+			if (g_ascii_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(s_buf, "#geometry:", 10 ) == 0 &&
-			    scan_geometry(s_buf + 10, &cd->window_x, &cd->window_y, &cd->window_w, &cd->window_h) )
+			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)
-					{
-					fclose(f);
-					return TRUE;
-					}
+				if (only_geometry) break;
 				}
-			else if (strncasecmp(s_buf, "GQview collection", strlen("GQview collection")) == 0)
+			else if (g_ascii_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;
 			}
-		if (s_buf[0]=='\n') continue;
 
-		buf = quoted_value(s_buf, NULL);
-		if (buf)
+		if (only_geometry) continue;
+
+		/* Read filenames */
+		while (*p && *p != '"') p++;
+		if (*p) p++;
+		buf = p;
+		while (*p && *p != '"') p++;
+		*p = 0;
+		if (*buf)
 			{
-			gint valid;
-			
+			gboolean valid;
+
 			if (!flush)
 				changed |= collect_manager_process_action(entry, &buf);
-			
-			valid = (buf[0] == '/' && collection_add_check(cd, file_data_new_simple(buf), FALSE, TRUE));
-			g_free(buf);
+
+			valid = (buf[0] == G_DIR_SEPARATOR && collection_add_check(cd, file_data_new_group(buf), FALSE, TRUE));
+			if (!valid) DEBUG_1("collection invalid file: %s", buf);
 
 			total++;
-			if (!valid && limit_failures)
+			if (!valid)
 				{
 				fail++;
-				if (fail > GQ_COLLECTION_FAIL_MIN &&
+				if (limit_failures &&
+				    fail > GQ_COLLECTION_FAIL_MIN &&
 				    fail * 100 / total > GQ_COLLECTION_FAIL_PERCENT)
 					{
-					printf("Too many invalid filenames in unoffical collection file, closing: %s\n", path);
+					log_printf("%d invalid filenames in unofficial collection file, closing: %s\n", fail, path);
 					success = FALSE;
 					break;
 					}
@@ -160,34 +179,38 @@ static gint collection_load_private(CollectionData *cd, const gchar *path, Colle
 			}
 		}
 
+	DEBUG_1("collection files: total = %d fail = %d official=%d gqview=%d geometry=%d",
+			  total, fail, has_official_header, has_gqview_header, has_geometry_header);
+
 	fclose(f);
-	if (only_geometry) return FALSE;
+	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);
+			collection_add_check(cd, file_data_new_group(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)
+gboolean collection_load(CollectionData *cd, const gchar *path, CollectionLoadFlags flags)
 {
 	if (collection_load_private(cd, path, flags | COLLECTION_LOAD_FLUSH))
 		{
@@ -204,7 +227,7 @@ static void collection_load_thumb_do(CollectionData *cd)
 
 	if (!cd->thumb_loader || !g_list_find(cd->list, cd->thumb_info)) return;
 
-	pixbuf = thumb_loader_get_pixbuf(cd->thumb_loader, TRUE);
+	pixbuf = thumb_loader_get_pixbuf(cd->thumb_loader);
 	collection_info_set_thumb(cd->thumb_info, pixbuf);
 	g_object_unref(pixbuf);
 
@@ -270,10 +293,10 @@ static void collection_load_thumb_step(CollectionData *cd)
 				   cd);
 
 	/* start it */
-	if (!thumb_loader_start(cd->thumb_loader, ci->fd->path))
+	if (!thumb_loader_start(cd->thumb_loader, ci->fd))
 		{
 		/* error, handle it, do next */
-		if (debug) printf("error loading thumb for %s\n", ci->fd->path);
+		DEBUG_1("error loading thumb for %s", ci->fd->path);
 		collection_load_thumb_do(cd);
 		collection_load_thumb_step(cd);
 		}
@@ -284,7 +307,7 @@ 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)
+gboolean collection_load_begin(CollectionData *cd, const gchar *path, CollectionLoadFlags flags)
 {
 	if (!collection_load(cd, path, flags)) return FALSE;
 
@@ -301,7 +324,7 @@ void collection_load_stop(CollectionData *cd)
 	cd->thumb_loader = NULL;
 }
 
-static gint collection_save_private(CollectionData *cd, const gchar *path)
+static gboolean collection_save_private(CollectionData *cd, const gchar *path)
 {
 	SecureSaveInfo *ssi;
 	GList *work;
@@ -320,11 +343,7 @@ static gint collection_save_private(CollectionData *cd, const gchar *path)
 	g_free(pathl);
 	if (!ssi)
 		{
-		gchar *buf;
-
-		buf = g_strdup_printf(_("failed to open collection (write) \"%s\"\n"), path);
-		print_term(buf);
-		g_free(buf);
+		log_printf(_("failed to open collection (write) \"%s\"\n"), path);
 		return FALSE;
 		}
 
@@ -349,12 +368,8 @@ static gint collection_save_private(CollectionData *cd, const gchar *path)
 
 	if (secure_close(ssi))
 		{
-		gchar *buf;
-
-		buf = g_strdup_printf(_("error saving collection file: %s\nerror: %s\n"), path,
-				      secsave_strerror(secsave_errno));
-		print_term(buf);
-		g_free(buf);
+		log_printf(_("error saving collection file: %s\nerror: %s\n"), path,
+			    secsave_strerror(secsave_errno));
 		return FALSE;
 		}
 
@@ -376,7 +391,7 @@ static gint collection_save_private(CollectionData *cd, const gchar *path)
 	return TRUE;
 }
 
-gint collection_save(CollectionData *cd, const gchar *path)
+gboolean collection_save(CollectionData *cd, const gchar *path)
 {
 	if (collection_save_private(cd, path))
 		{
@@ -387,7 +402,7 @@ gint collection_save(CollectionData *cd, const gchar *path)
 	return FALSE;
 }
 
-gint collection_load_only_geometry(CollectionData *cd, const gchar *path)
+gboolean collection_load_only_geometry(CollectionData *cd, const gchar *path)
 {
 	return collection_load(cd, path, COLLECTION_LOAD_GEOMETRY);
 }
@@ -432,7 +447,7 @@ struct _CollectManagerAction
 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 guint collection_manager_timer_id = 0; /* event source id */
 
 
 static CollectManagerAction *collect_manager_action_new(const gchar *oldpath, const gchar *newpath,
@@ -482,8 +497,14 @@ static void collect_manager_entry_free_data(CollectManagerEntry *entry)
 		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);
+	if (g_hash_table_size(entry->oldpath_hash) > 0)
+		g_hash_table_destroy(entry->oldpath_hash);
+	else
+		g_hash_table_unref(entry->oldpath_hash);
+	if (g_hash_table_size(entry->newpath_hash) > 0)
+		g_hash_table_destroy(entry->newpath_hash);
+	else
+		g_hash_table_unref(entry->newpath_hash);
 }
 
 static void collect_manager_entry_init_data(CollectManagerEntry *entry)
@@ -536,7 +557,7 @@ static CollectManagerEntry *collect_manager_get_entry(const gchar *path)
 
 		entry = work->data;
 		work = work->next;
-		if (strcmp(entry->path, path) == 0) 
+		if (strcmp(entry->path, path) == 0)
 			{
 			return entry;
 			}
@@ -549,9 +570,9 @@ static void collect_manager_entry_add_action(CollectManagerEntry *entry, Collect
 {
 
 	CollectManagerAction *orig_action;
-	
-	entry->empty = FALSE; 
-	
+
+	entry->empty = FALSE;
+
 	if (action->oldpath == NULL)
 		{
 		/* add file */
@@ -559,12 +580,12 @@ static void collect_manager_entry_add_action(CollectManagerEntry *entry, Collect
 			{
 			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",
+			log_printf("collection manager failed to add another action for target %s in collection %s\n",
 				action->newpath, entry->path);
 			return;
 			}
@@ -579,7 +600,7 @@ static void collect_manager_entry_add_action(CollectManagerEntry *entry, Collect
 		{
 		/* 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);
@@ -590,11 +611,11 @@ static void collect_manager_entry_add_action(CollectManagerEntry *entry, Collect
 			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) 
+		if (new_action->newpath)
 			{
-			g_hash_table_insert(entry->newpath_hash, new_action->newpath, new_action); 
+			g_hash_table_insert(entry->newpath_hash, new_action->newpath, new_action);
 			}
 		collect_manager_action_unref(orig_action);
 		return;
@@ -605,24 +626,24 @@ static void collect_manager_entry_add_action(CollectManagerEntry *entry, Collect
 	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",
+		log_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); 
+		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)
+static gboolean collect_manager_process_action(CollectManagerEntry *entry, gchar **path_ptr)
 {
 	gchar *path = *path_ptr;
 	CollectManagerAction *action;
-	
+
 	if (path == NULL)
 		{
 		/* get new files */
@@ -638,9 +659,9 @@ static gint collect_manager_process_action(CollectManagerEntry *entry, gchar **p
 		*path_ptr = path;
 		return (path != NULL);
 		}
-		
+
 	action = g_hash_table_lookup(entry->oldpath_hash, path);
-	
+
 	if (action)
 		{
 		g_free(path);
@@ -654,13 +675,13 @@ static gint collect_manager_process_action(CollectManagerEntry *entry, gchar **p
 
 static void collect_manager_refresh(void)
 {
-	GList *list = NULL;
+	GList *list;
 	GList *work;
-	gchar *base;
+	FileData *dir_fd;
 
-	base = g_strconcat(homedir(), "/", GQ_RC_DIR_COLLECTIONS, NULL);
-	path_list(base, &list, NULL);
-	g_free(base);
+	dir_fd = file_data_new_dir(get_collections_dir());
+	filelist_read(dir_fd, &list, NULL);
+	file_data_unref(dir_fd);
 
 	work = collection_manager_entry_list;
 	while (work && list)
@@ -674,21 +695,23 @@ static void collect_manager_refresh(void)
 		list_step = list;
 		while (list_step && entry)
 			{
-			gchar *path;
+			FileData *fd;
 
-			path = list_step->data;
+			fd = list_step->data;
 			list_step = list_step->next;
 
-			if (strcmp(path, entry->path) == 0)
+			if (strcmp(fd->path, entry->path) == 0)
 				{
-				list = g_list_remove(list, path);
-				g_free(path);
+				list = g_list_remove(list, fd);
+				file_data_unref(fd);
 
 				entry = NULL;
 				}
 			else
 				{
 				collect_manager_entry_free(entry);
+
+				entry = NULL;
 				}
 			}
 		}
@@ -696,24 +719,20 @@ static void collect_manager_refresh(void)
 	work = list;
 	while (work)
 		{
-		gchar *path;
+		FileData *fd;
 
-		path = work->data;
+		fd = work->data;
 		work = work->next;
 
-		collect_manager_entry_new(path);
-		g_free(path);
+		collect_manager_entry_new(fd->path);
 		}
 
-	g_list_free(list);
+	filelist_free(list);
 }
 
 static void collect_manager_process_actions(gint max)
 {
-	if (debug && collection_manager_action_list)
-		{
-		printf("collection manager processing actions\n");
-		}
+	if (collection_manager_action_list) DEBUG_1("collection manager processing actions");
 
 	while (collection_manager_action_list != NULL && max > 0)
 		{
@@ -756,7 +775,7 @@ static void collect_manager_process_actions(gint max)
 		if (action->type != COLLECTION_MANAGER_UPDATE &&
 		    action->oldpath && action->newpath)
 			{
-			printf("collection manager failed to %s %s for collection %s\n",
+			log_printf("collection manager failed to %s %s for collection %s\n",
 				(action->type == COLLECTION_MANAGER_ADD) ? "add" : "remove",
 				action->oldpath, action->newpath);
 			}
@@ -770,22 +789,21 @@ static void collect_manager_process_actions(gint max)
 		}
 }
 
-static gint collect_manager_process_entry(CollectManagerEntry *entry)
+static gboolean 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);
+	(void) collection_load_private(cd, entry->path, COLLECTION_LOAD_NONE);
 
 	collection_unref(cd);
 
 	return TRUE;
 }
 
-static gint collect_manager_process_entry_list(void)
+static gboolean collect_manager_process_entry_list(void)
 {
 	GList *work;
 
@@ -804,7 +822,7 @@ static gint collect_manager_process_entry_list(void)
 
 
 
-static gint collect_manager_process_cb(gpointer data)
+static gboolean collect_manager_process_cb(gpointer data)
 {
 	if (collection_manager_action_list) collect_manager_refresh();
 	collect_manager_process_actions(COLLECT_MANAGER_ACTIONS_PER_IDLE);
@@ -812,35 +830,35 @@ static gint collect_manager_process_cb(gpointer data)
 
 	if (collect_manager_process_entry_list()) return TRUE;
 
-	if (debug) printf("collection manager is up to date\n");
+	DEBUG_1("collection manager is up to date");
 	return FALSE;
 }
 
-static gint collect_manager_timer_cb(gpointer data)
+static gboolean collect_manager_timer_cb(gpointer data)
 {
-	if (debug) printf("collection manager timer expired\n");
+	DEBUG_1("collection manager timer expired");
 
 	g_idle_add_full(G_PRIORITY_LOW, collect_manager_process_cb, NULL, NULL);
 
-	collection_manager_timer_id = -1;
+	collection_manager_timer_id = 0;
 	return FALSE;
 }
 
 static void collect_manager_timer_push(gint stop)
 {
-	if (collection_manager_timer_id != -1)
+	if (collection_manager_timer_id)
 		{
 		if (!stop) return;
 
 		g_source_remove(collection_manager_timer_id);
-		collection_manager_timer_id = -1;
+		collection_manager_timer_id = 0;
 		}
 
 	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");
+		DEBUG_1("collection manager timer started");
 		}
 }
 
@@ -884,7 +902,7 @@ void collect_manager_add(FileData *fd, const gchar *collection)
 	cw = collection_window_find_by_path(collection);
 	if (cw)
 		{
-		if (collection_list_find(cw->cd->list, fd->path) == NULL)
+		if (collection_list_find_fd(cw->cd->list, fd) == NULL)
 			{
 			collection_add(cw->cd, fd, FALSE);
 			}
@@ -917,7 +935,30 @@ void collect_manager_flush(void)
 {
 	collect_manager_timer_push(TRUE);
 
-	if (debug) printf("collection manager flushing\n");
+	DEBUG_1("collection manager flushing");
 	while (collect_manager_process_cb(NULL));
 }
 
+void collect_manager_notify_cb(FileData *fd, NotifyType type, gpointer data)
+{
+	if (!(type & NOTIFY_CHANGE) || !fd->change) return;
+
+	DEBUG_1("Notify collect_manager: %s %04x", fd->path, type);
+	switch (fd->change->type)
+		{
+		case FILEDATA_CHANGE_MOVE:
+			collect_manager_moved(fd);
+			break;
+		case FILEDATA_CHANGE_COPY:
+			break;
+		case FILEDATA_CHANGE_RENAME:
+			collect_manager_moved(fd);
+			break;
+		case FILEDATA_CHANGE_DELETE:
+		case FILEDATA_CHANGE_UNSPECIFIED:
+		case FILEDATA_CHANGE_WRITE_METADATA:
+			break;
+		}
+
+}
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */