/*
*-----------------------------------------------------------------------------
- * changed files detection and notification
+ * changed files detection and notification
*-----------------------------------------------------------------------------
*/
{
fd->version++;
fd->valid_marks = 0;
- if (fd->parent)
+ if (fd->parent)
{
fd->parent->version++;
fd->parent->valid_marks = 0;
/*
*-----------------------------------------------------------------------------
- * file name, extension, sorting, ...
+ * file name, extension, sorting, ...
*-----------------------------------------------------------------------------
*/
g_free(fd->collate_key_name);
g_free(fd->collate_key_name_nocase);
-#if 0 && GLIB_CHECK_VERSION(2, 8, 0)
- fd->collate_key_name = g_utf8_collate_key_for_filename(valid_name, -1);
- fd->collate_key_name_nocase = g_utf8_collate_key_for_filename(caseless_name, -1);
-#else
fd->collate_key_name = g_utf8_collate_key(valid_name, -1);
fd->collate_key_name_nocase = g_utf8_collate_key(caseless_name, -1);
-#endif
+
g_free(valid_name);
g_free(caseless_name);
}
DEBUG_2("file_data_new: '%s' %d", path_utf8, disable_sidecars);
- if (S_ISDIR(st->st_mode)) disable_sidecars = TRUE;
+ if (S_ISDIR(st->st_mode)) disable_sidecars = TRUE;
if (!file_data_pool)
file_data_pool = g_hash_table_new(g_str_hash, g_str_equal);
fd->date = st->st_mtime;
fd->mode = st->st_mode;
fd->ref = 1;
- fd->magick = 0x12345678;
+ fd->magick = FD_MAGICK;
if (disable_sidecars) fd->disable_grouping = TRUE;
#endif
{
if (fd == NULL) return NULL;
- if (fd->magick != 0x12345678)
+ if (fd->magick != FD_MAGICK)
#ifdef DEBUG_FILEDATA
DEBUG_0("fd magick mismatch @ %s:%d fd=%p", file, line, fd);
#else
DEBUG_0("fd magick mismatch fd=%p", fd);
#endif
- g_assert(fd->magick == 0x12345678);
+ g_assert(fd->magick == FD_MAGICK);
fd->ref++;
#ifdef DEBUG_FILEDATA
static void file_data_free(FileData *fd)
{
- g_assert(fd->magick == 0x12345678);
+ g_assert(fd->magick == FD_MAGICK);
g_assert(fd->ref == 0);
metadata_cache_free(fd);
#endif
{
if (fd == NULL) return;
- if (fd->magick != 0x12345678)
+ if (fd->magick != FD_MAGICK)
#ifdef DEBUG_FILEDATA
DEBUG_0("fd magick mismatch @ %s:%d fd=%p", file, line, fd);
#else
DEBUG_0("fd magick mismatch fd=%p", fd);
#endif
- g_assert(fd->magick == 0x12345678);
+ g_assert(fd->magick == FD_MAGICK);
fd->ref--;
#ifdef DEBUG_FILEDATA
static void file_data_check_sidecars(const GList *basename_list)
{
/* basename_list contains the new group - first is the parent, then sorted sidecars */
- /* all files in the list have ref count > 0 */
+ /* all files in the list have ref count > 0 */
const GList *work;
GList *s_work, *new_sidecars;
{
FileData *fd = work->data;
work = work->next;
- g_assert(fd->magick == 0x12345678);
+ g_assert(fd->magick == FD_MAGICK);
DEBUG_2("basename: %p %s", fd, fd->name);
- if (fd->parent)
+ if (fd->parent)
{
- g_assert(fd->parent->magick == 0x12345678);
+ g_assert(fd->parent->magick == FD_MAGICK);
DEBUG_2(" parent: %p", fd->parent);
}
s_work = fd->sidecar_files;
{
FileData *sfd = s_work->data;
s_work = s_work->next;
- g_assert(sfd->magick == 0x12345678);
+ g_assert(sfd->magick == FD_MAGICK);
DEBUG_2(" sidecar: %p %s", sfd, sfd->name);
}
s_work = s_work->next;
}
- if (!work && !s_work)
+ if (!work && !s_work)
{
DEBUG_2("basename no change");
return; /* no change in grouping */
while (work)
{
FileData *sfd = work->data;
- g_assert(sfd->magick == 0x12345678);
+ g_assert(sfd->magick == FD_MAGICK);
g_assert(sfd->parent == NULL && sfd->sidecar_files == NULL);
sfd->parent = parent_fd;
new_sidecars = g_list_prepend(new_sidecars, sfd);
static void file_data_disconnect_sidecar_file(FileData *target, FileData *sfd)
{
- g_assert(target->magick == 0x12345678);
- g_assert(sfd->magick == 0x12345678);
+ g_assert(target->magick == FD_MAGICK);
+ g_assert(sfd->magick == FD_MAGICK);
g_assert(g_list_find(target->sidecar_files, sfd));
file_data_ref(target);
if (ret != 0) return ret;
- /* do not return 0 unless the files are really the same
- file_data_pool ensures that original_path is unique
+ /* do not return 0 unless the files are really the same
+ file_data_pool ensures that original_path is unique
*/
return strcmp(fa->original_path, fb->original_path);
}
list = g_list_insert_sorted(list, file_data_ref(fd), file_data_sort_by_ext);
g_hash_table_insert(basename_hash, basename, list);
}
- else
+ else
{
g_free(basename);
}
return list;
}
-#if 0
-static void file_data_basename_hash_remove(GHashTable *basename_hash, FileData *fd)
-{
- GList *list;
- gchar *basename = g_strndup(fd->path, fd->extension - fd->path);
-
- list = g_hash_table_lookup(basename_hash, basename);
-
- if (!g_list_find(list, fd)) return;
-
- list = g_list_remove(list, fd);
- file_data_unref(fd);
-
- if (list)
- {
- g_hash_table_insert(basename_hash, basename, list);
- }
- else
- {
- g_hash_table_remove(basename_hash, basename);
- g_free(basename);
- }
-}
-#endif
-
static void file_data_basename_hash_remove_list(gpointer key, gpointer value, gpointer data)
{
filelist_free((GList *)value);
static void file_data_basename_hash_free(GHashTable *basename_hash)
{
- g_hash_table_foreach(basename_hash, file_data_basename_hash_remove_list, NULL);
+ g_hash_table_foreach(basename_hash, file_data_basename_hash_remove_list, NULL);
g_hash_table_destroy(basename_hash);
}
{
FileData *fd = file_data_new_local(filepath, &ent_sbuf, FALSE);
flist = g_list_prepend(flist, fd);
- if (fd->sidecar_priority && !fd->disable_grouping)
+ if (fd->sidecar_priority && !fd->disable_grouping)
{
file_data_basename_hash_insert(basename_hash, fd);
}
if (dirs) *dirs = dlist;
- if (files)
+ if (files)
{
- g_hash_table_foreach(basename_hash, file_data_basename_hash_to_sidecars, NULL);
+ g_hash_table_foreach(basename_hash, file_data_basename_hash_to_sidecars, NULL);
*files = filelist_filter_out_sidecars(flist);
}
{
gboolean valid = (fd->valid_marks & (1 << n));
- if (file_data_get_mark_func[n] && !valid)
+ if (file_data_get_mark_func[n] && !valid)
{
guint old = fd->marks;
gboolean value = (file_data_get_mark_func[n])(fd, n, file_data_mark_func_data[n]);
- if (!value != !(fd->marks & (1 << n)))
+ if (!value != !(fd->marks & (1 << n)))
{
fd->marks = fd->marks ^ (1 << n);
}
guint old;
if (!value == !file_data_get_mark(fd, n)) return;
- if (file_data_set_mark_func[n])
+ if (file_data_set_mark_func[n])
{
(file_data_set_mark_func[n])(fd, n, value, file_data_mark_func_data[n]);
}
if (options->metadata.save_in_image_file)
{
- if (file_data_can_write_directly(fd))
+ if (file_data_can_write_directly(fd))
{
/* we can write the file directly */
if (access_file(fd->path, W_OK))
}
}
}
- else if (file_data_can_write_sidecar(fd))
+ else if (file_data_can_write_sidecar(fd))
{
/* we can write sidecar */
gchar *sidecar = file_data_get_sidecar_path(fd, FALSE);
return TRUE;
}
-#if 0
-static gboolean file_data_list_dump(GList *list)
-{
- GList *work, *work2;
-
- work = list;
- while (work)
- {
- FileData *fd = work->data;
- printf("%s\n", fd->name);
- work2 = fd->sidecar_files;
- while (work2)
- {
- FileData *fd = work2->data;
- printf(" %s\n", fd->name);
- work2 = work2->next;
- }
- work = work->next;
- }
- return TRUE;
-}
-#endif
-
GList *file_data_process_groups_in_selection(GList *list, gboolean ungroup, GList **ungrouped_list)
{
GList *out = NULL;
FileData *fd = work->data;
work = work->next;
- if (!file_data_list_contains_whole_group(list, fd))
+ if (!file_data_list_contains_whole_group(list, fd))
{
file_data_disable_grouping(fd, TRUE);
- if (ungrouped_list)
+ if (ungrouped_list)
{
*ungrouped_list = g_list_prepend(*ungrouped_list, file_data_ref(fd));
}
}
}
- /* remove sidecars from the list,
+ /* remove sidecars from the list,
they can be still acessed via main_fd->sidecar_files */
work = list;
while (work)
projects / geeqie.git / blobdiff