comparison src/collect-table.c @ 783:d6a7fb4b8e7c

replaced directory path with FileData* dir_fd

782:3f7a0420c293

 *-------------------------------------------------------------------
 * dnd
 *-------------------------------------------------------------------
 */

static void collection_table_add_dir_recursive(CollectTable *ct, gchar *path, gint recursive)
{
	GList *d;
	GList *f;
	GList *work;

	if (!filelist_read(path, &f, recursive ? &d : NULL))
		return;

	f = filelist_filter(f, FALSE);
	d = filelist_filter(d, TRUE);

	collection_table_insert_filelist(ct, f, ct->marker_info);

	work = g_list_last(d);
	while (work)
		{
		collection_table_add_dir_recursive(ct, ((FileData *)work->data)->path, TRUE);
		work = work->prev;
		}

	filelist_free(f);
	filelist_free(d);

	GList *work = list;
	while (work)
		{
		FileData *fd = work->data;
		work = work->next;
		if (isdir(fd->path)) collection_table_add_dir_recursive(ct, fd->path, recursive);
		}
	collection_table_insert_filelist(ct, list, ct->marker_info);
}

783:d6a7fb4b8e7c

 *-------------------------------------------------------------------
 * dnd
 *-------------------------------------------------------------------
 */

static void collection_table_add_dir_recursive(CollectTable *ct, FileData *dir_fd, gint recursive)
{
	GList *d;
	GList *f;
	GList *work;

	if (!filelist_read(dir_fd, &f, recursive ? &d : NULL))
		return;

	f = filelist_filter(f, FALSE);
	d = filelist_filter(d, TRUE);

	collection_table_insert_filelist(ct, f, ct->marker_info);

	work = g_list_last(d);
	while (work)
		{
		collection_table_add_dir_recursive(ct, (FileData *)work->data, TRUE);
		work = work->prev;
		}

	filelist_free(f);
	filelist_free(d);

	GList *work = list;
	while (work)
		{
		FileData *fd = work->data;
		work = work->next;
		if (isdir(fd->path)) collection_table_add_dir_recursive(ct, fd, recursive);
		}
	collection_table_insert_filelist(ct, list, ct->marker_info);
}