always check for sidecars by readdir

diff --git a/src/bar_sort.c b/src/bar_sort.c
index 9818acc..5ca17ca 100644 (file)
--- a/src/bar_sort.c
+++ b/src/bar_sort.c
@@ -99,7 +99,7 @@ static void bar_sort_collection_list_build(GtkWidget *bookmarks)
        history_list_free_key(SORT_KEY_COLLECTIONS);
        bookmark_list_set_key(bookmarks, SORT_KEY_COLLECTIONS);
 
-       dir_fd = file_data_new_simple(get_collections_dir());
+       dir_fd = file_data_new_dir(get_collections_dir());
        filelist_read(dir_fd, &list, NULL);
        file_data_unref(dir_fd);
 

diff --git a/src/cache_maint.c b/src/cache_maint.c
index b84ad6b..743fcd9 100644 (file)
--- a/src/cache_maint.c
+++ b/src/cache_maint.c
@@ -291,7 +291,7 @@ void cache_maintain_home(gboolean metadata, gboolean clear, GtkWidget *parent)
                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);
@@ -370,7 +370,7 @@ gint cache_maintain_home_dir(const gchar *dir, gint recursive, gint clear)
 
        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);
+       dir_fd = file_data_new_dir(base);
        g_free(base);
 
        if (filelist_read(dir_fd, &flist, &dlist))
@@ -442,7 +442,7 @@ gint cache_maintain_dir(FileData *dir_fd, gint recursive, gint clear)
        GList *work;
 
        cachedir = g_build_filename(dir, GQ_CACHE_LOCAL_THUMB, NULL);
-       cachedir_fd = file_data_new_simple(cachedir);
+       cachedir_fd = file_data_new_dir(cachedir);
        g_free(cachedir);
 
        filelist_read(cachedir_fd, &list, NULL);
@@ -856,7 +856,7 @@ static void cache_manager_render_start_cb(GenericDialog *fd, gpointer data)
 
                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));
@@ -1062,21 +1062,21 @@ static void cache_manager_standard_clean_start_cb(GenericDialog *gd, gpointer da
        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);

diff --git a/src/collect-io.c b/src/collect-io.c
index 9f75f64..3f0b09c 100644 (file)
--- a/src/collect-io.c
+++ b/src/collect-io.c
@@ -673,7 +673,7 @@ static void collect_manager_refresh(void)
        GList *work;
        FileData *dir_fd;
 
-       dir_fd = file_data_new_simple(get_collections_dir());
+       dir_fd = file_data_new_dir(get_collections_dir());
        filelist_read(dir_fd, &list, NULL);
        file_data_unref(dir_fd);
 

diff --git a/src/filedata.c b/src/filedata.c
index 70ef7df..f6e3896 100644 (file)
--- a/src/filedata.c
+++ b/src/filedata.c
@@ -383,11 +383,13 @@ gboolean file_data_check_changed_files(FileData *fd)
        return ret;
 }
 
-static FileData *file_data_new(const gchar *path_utf8, struct stat *st, gboolean check_sidecars, GHashTable *basename_hash)
+static FileData *file_data_new(const gchar *path_utf8, struct stat *st, gboolean disable_sidecars, GHashTable *basename_hash)
 {
        FileData *fd;
 
-       DEBUG_2("file_data_new: '%s' %d %d", path_utf8, check_sidecars, !!basename_hash);
+       DEBUG_2("file_data_new: '%s' %d %d", path_utf8, disable_sidecars, !!basename_hash);
+
+       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);
@@ -412,10 +414,13 @@ static FileData *file_data_new(const gchar *path_utf8, struct stat *st, gboolean
        if (fd)
                {
                gboolean changed;
+               
+               if (disable_sidecars) file_data_disable_grouping(fd, TRUE);
+               
                if (basename_hash) 
                        {
                        file_data_basename_hash_insert(basename_hash, fd);
-                       if (check_sidecars)
+                       if (!disable_sidecars)
                                file_data_check_sidecars(fd, basename_hash);
                        }
                
@@ -423,7 +428,7 @@ static FileData *file_data_new(const gchar *path_utf8, struct stat *st, gboolean
                        changed = file_data_check_changed_files(fd);
                else
                        changed = file_data_check_changed_files_recursive(fd, st);
-               if (changed && check_sidecars && sidecar_file_priority(fd->extension))
+               if (changed && !disable_sidecars && sidecar_file_priority(fd->extension))
                        file_data_check_sidecars(fd, basename_hash);
                DEBUG_2("file_data_pool hit: '%s' %s", fd->path, changed ? "(changed)" : "");
                
@@ -437,65 +442,21 @@ static FileData *file_data_new(const gchar *path_utf8, struct stat *st, gboolean
        fd->mode = st->st_mode;
        fd->ref = 1;
        fd->magick = 0x12345678;
+       
+       if (disable_sidecars) fd->disable_grouping = TRUE;
 
        file_data_set_path(fd, path_utf8); /* set path, name, collate_key_*, original_path */
        if (basename_hash) file_data_basename_hash_insert(basename_hash, fd);
 
-       if (check_sidecars)
+       if (!disable_sidecars)
+               {
+               g_assert(basename_hash);
                file_data_check_sidecars(fd, basename_hash);
+               }
 
        return fd;
 }
 
-/* extension must contain only ASCII characters */
-static GList *check_case_insensitive_ext(gchar *path)
-{
-       gchar *sl;
-       gchar *extl;
-       gint ext_len;
-       GList *list = NULL;
-
-       sl = path_from_utf8(path);
-
-       extl = strrchr(sl, '.');
-       if (extl)
-               {
-               gint i, j;
-               extl++; /* the first char after . */
-               ext_len = strlen(extl);
-       
-               for (i = 0; i < (1 << ext_len); i++)
-                       {
-                       struct stat st;
-                       gboolean skip = FALSE;
-                       for (j = 0; j < ext_len; j++)
-                               {
-                               if (i & (1 << (ext_len - 1 - j))) 
-                                       {
-                                       extl[j] = g_ascii_tolower(extl[j]);
-                                       /* make sure the result does not contain duplicates */
-                                       if (extl[j] == g_ascii_toupper(extl[j]))
-                                               {
-                                               /* no change, probably a number, we have already tested this combination */
-                                               skip = TRUE;
-                                               break;
-                                               }
-                                       }
-                               else
-                                       extl[j] = g_ascii_toupper(extl[j]);
-                               }
-                       if (skip) continue;
-
-                       if (stat(sl, &st) == 0)
-                               {
-                               list = g_list_prepend(list, file_data_new_local(sl, &st, FALSE, FALSE));
-                               }
-                       }
-               }
-       g_free(sl);
-
-       return list;
-}
 
 static void file_data_check_sidecars(FileData *fd, GHashTable *basename_hash)
 {
@@ -511,10 +472,7 @@ static void file_data_check_sidecars(FileData *fd, GHashTable *basename_hash)
        base_len = fd->extension - fd->path;
        fname = g_string_new_len(fd->path, base_len);
 
-       if (basename_hash)
-               {
-               basename_list = g_hash_table_lookup(basename_hash, fname->str);
-               }
+       basename_list = g_hash_table_lookup(basename_hash, fname->str);
 
 
        /* check for possible sidecar files;
@@ -533,28 +491,17 @@ static void file_data_check_sidecars(FileData *fd, GHashTable *basename_hash)
                gchar *ext = work->data;
                work = work->next;
 
-               if (!basename_hash)
-                       {
-                       GList *new_list;
-                       g_string_truncate(fname, base_len);
-                       g_string_append(fname, ext);
-                       new_list = check_case_insensitive_ext(fname->str);
-                       group_list = g_list_concat(group_list, new_list);
-                       }
-               else
+               const GList *work2 = basename_list;
+                       
+               while (work2)
                        {
-                       const GList *work2 = basename_list;
+                       FileData *sfd = work2->data;
                        
-                       while (work2)
+                       if (g_ascii_strcasecmp(ext, sfd->extension) == 0) 
                                {
-                               FileData *sfd = work2->data;
-                               
-                               if (g_ascii_strcasecmp(ext, sfd->extension) == 0) 
-                                       {
-                                       group_list = g_list_append(group_list, file_data_ref(sfd));
-                                       }
-                               work2 = work2->next;
+                               group_list = g_list_append(group_list, file_data_ref(sfd));
                                }
+                       work2 = work2->next;
                        }
                }
        g_string_free(fname, TRUE);
@@ -583,28 +530,15 @@ static void file_data_check_sidecars(FileData *fd, GHashTable *basename_hash)
 }
 
 
-static FileData *file_data_new_local(const gchar *path, struct stat *st, gboolean check_sidecars, GHashTable *basename_hash)
+static FileData *file_data_new_local(const gchar *path, struct stat *st, gboolean disable_sidecars, GHashTable *basename_hash)
 {
        gchar *path_utf8 = path_to_utf8(path);
-       FileData *ret = file_data_new(path_utf8, st, check_sidecars, basename_hash);
+       FileData *ret = file_data_new(path_utf8, st, disable_sidecars, basename_hash);
 
        g_free(path_utf8);
        return ret;
 }
 
-FileData *file_data_new_simple(const gchar *path_utf8)
-{
-       struct stat st;
-
-       if (!stat_utf8(path_utf8, &st))
-               {
-               st.st_size = 0;
-               st.st_mtime = 0;
-               }
-
-       return file_data_new(path_utf8, &st, TRUE, NULL);
-}
-
 FileData *file_data_add_sidecar_file(FileData *target, FileData *sfd)
 {
        sfd->parent = target;
@@ -1018,7 +952,7 @@ static gboolean is_hidden_file(const gchar *name)
        return TRUE;
 }
 
-static gboolean filelist_read_real(FileData *dir_fd, GList **files, GList **dirs, gboolean follow_symlinks)
+static gboolean filelist_read_real(const gchar *dir_path, GList **files, GList **dirs, gboolean follow_symlinks)
 {
        DIR *dp;
        struct dirent *dir;
@@ -1033,7 +967,7 @@ static gboolean filelist_read_real(FileData *dir_fd, GList **files, GList **dirs
        if (files) *files = NULL;
        if (dirs) *dirs = NULL;
 
-       pathl = path_from_utf8(dir_fd->path);
+       pathl = path_from_utf8(dir_path);
        if (!pathl) return FALSE;
 
        dp = opendir(pathl);
@@ -1071,14 +1005,14 @@ static gboolean filelist_read_real(FileData *dir_fd, GList **files, GList **dirs
                                    strcmp(name, GQ_CACHE_LOCAL_METADATA) != 0 &&
                                    strcmp(name, THUMB_FOLDER_LOCAL) != 0)
                                        {
-                                       dlist = g_list_prepend(dlist, file_data_new_local(filepath, &ent_sbuf, FALSE, NULL));
+                                       dlist = g_list_prepend(dlist, file_data_new_local(filepath, &ent_sbuf, TRUE, NULL));
                                        }
                                }
                        else
                                {
                                if (files && filter_name_exists(name))
                                        {
-                                       flist = g_list_prepend(flist, file_data_new_local(filepath, &ent_sbuf, TRUE, basename_hash));
+                                       flist = g_list_prepend(flist, file_data_new_local(filepath, &ent_sbuf, FALSE, basename_hash));
                                        }
                                }
                        }
@@ -1105,12 +1039,68 @@ static gboolean filelist_read_real(FileData *dir_fd, GList **files, GList **dirs
 
 gboolean filelist_read(FileData *dir_fd, GList **files, GList **dirs)
 {
-       return filelist_read_real(dir_fd, files, dirs, TRUE);
+       return filelist_read_real(dir_fd->path, files, dirs, TRUE);
 }
 
 gboolean filelist_read_lstat(FileData *dir_fd, GList **files, GList **dirs)
 {
-       return filelist_read_real(dir_fd, files, dirs, FALSE);
+       return filelist_read_real(dir_fd->path, files, dirs, FALSE);
+}
+
+FileData *file_data_new_simple(const gchar *path_utf8)
+{
+       gchar *dir;
+       struct stat st;
+       FileData *fd;
+       GList *files;
+
+       if (!stat_utf8(path_utf8, &st))
+               {
+               st.st_size = 0;
+               st.st_mtime = 0;
+               }
+
+       if (S_ISDIR(st.st_mode))
+               return file_data_new(path_utf8, &st, TRUE, NULL);
+       
+       dir = remove_level_from_path(path_utf8);
+       
+       filelist_read_real(dir, &files, NULL, TRUE);
+       
+       fd = g_hash_table_lookup(file_data_pool, path_utf8);
+       g_assert(fd);
+       file_data_ref(fd);
+       
+       filelist_free(files);
+       g_free(dir);
+       return fd;
+}
+
+FileData *file_data_new_no_grouping(const gchar *path_utf8)
+{
+       struct stat st;
+
+       if (!stat_utf8(path_utf8, &st))
+               {
+               st.st_size = 0;
+               st.st_mtime = 0;
+               }
+
+       return file_data_new(path_utf8, &st, TRUE, NULL);
+}
+
+FileData *file_data_new_dir(const gchar *path_utf8)
+{
+       struct stat st;
+
+       if (!stat_utf8(path_utf8, &st))
+               {
+               st.st_size = 0;
+               st.st_mtime = 0;
+               }
+
+       g_assert(S_ISDIR(st.st_mode));
+       return file_data_new(path_utf8, &st, TRUE, NULL);
 }
 
 void filelist_free(GList *list)

diff --git a/src/filedata.h b/src/filedata.h
index d3c5c63..26129a7 100644 (file)
--- a/src/filedata.h
+++ b/src/filedata.h
@@ -22,9 +22,15 @@ gchar *text_from_size(gint64 size);
 gchar *text_from_size_abrev(gint64 size);
 const gchar *text_from_time(time_t t);
 
-/* this expects a utf-8 path */
+/* scan for sidecar files - expensive */
 FileData *file_data_new_simple(const gchar *path_utf8);
 
+/* should be used on helper files which can't have sidecars */
+FileData *file_data_new_no_grouping(const gchar *path_utf8);
+
+/* should be used on dirs */
+FileData *file_data_new_dir(const gchar *path_utf8);
+
 #ifdef DEBUG_FILEDATA
 FileData *file_data_ref_debug(const gchar *file, gint line, FileData *fd);
 void file_data_unref_debug(const gchar *file, gint line, FileData *fd);

diff --git a/src/layout.c b/src/layout.c
index b0958f6..45cc1e1 100644 (file)
--- a/src/layout.c
+++ b/src/layout.c
@@ -898,7 +898,7 @@ gboolean layout_set_fd(LayoutWindow *lw, FileData *fd)
                                file_data_unregister_real_time_monitor(lw->dir_fd);
                                file_data_unref(lw->dir_fd);
                                }
-                       lw->dir_fd = file_data_new_simple(base);
+                       lw->dir_fd = file_data_new_dir(base);
                        file_data_register_real_time_monitor(lw->dir_fd);
                        g_free(base);
                        }

diff --git a/src/layout_image.c b/src/layout_image.c
index e765a1a..cfe0661 100644 (file)
--- a/src/layout_image.c
+++ b/src/layout_image.c
@@ -634,7 +634,7 @@ static void layout_image_dnd_receive(GtkWidget *widget, GdkDragContext *context,
                                FileData *dir_fd;
 
                                base = remove_level_from_path(fd->path);
-                               dir_fd = file_data_new_simple(base);
+                               dir_fd = file_data_new_dir(base);
                                if (dir_fd != lw->dir_fd)
                                        {
                                        layout_set_fd(lw, dir_fd);

diff --git a/src/layout_util.c b/src/layout_util.c
index 3946924..26b3547 100644 (file)
--- a/src/layout_util.c
+++ b/src/layout_util.c
@@ -1064,7 +1064,7 @@ static void layout_menu_back_cb(GtkAction *action, gpointer data)
        if (!path) return;
        
        /* Open previous path */
-       dir_fd = file_data_new_simple(path);
+       dir_fd = file_data_new_dir(path);
        layout_set_fd(lw, dir_fd);
        file_data_unref(dir_fd);
 }
@@ -1081,7 +1081,7 @@ static void layout_menu_home_cb(GtkAction *action, gpointer data)
 
        if (path)
                {
-               FileData *dir_fd = file_data_new_simple(path);
+               FileData *dir_fd = file_data_new_dir(path);
                layout_set_fd(lw, dir_fd);
                file_data_unref(dir_fd);
                }

diff --git a/src/main.c b/src/main.c
index b74235d..cde2f4a 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -141,7 +141,7 @@ static void parse_command_line_add_dir(const gchar *dir, gchar **path, gchar **f
 
        path_parsed = g_strdup(dir);
        parse_out_relatives(path_parsed);
-       dir_fd = file_data_new_simple(path_parsed);
+       dir_fd = file_data_new_dir(path_parsed);
        
 
        if (filelist_read(dir_fd, &files, NULL))

diff --git a/src/pan-calendar.c b/src/pan-calendar.c
index 182d9e8..511b220 100644 (file)
--- a/src/pan-calendar.c
+++ b/src/pan-calendar.c
@@ -333,7 +333,7 @@ void pan_calendar_compute(PanWindow *pw, FileData *dir_fd, gint *width, gint *he
                         */
 
                        g_snprintf(fake_path, sizeof(fake_path), "//%04d-%02d-%02d", year, month, day);
-                       fd = file_data_new_simple(fake_path);
+                       fd = file_data_new_no_grouping(fake_path);
                        fd->date = dt;
                        pi_day = pan_item_box_new(pw, fd, x, y, PAN_CAL_DAY_WIDTH, PAN_CAL_DAY_HEIGHT,
                                                  PAN_CAL_DAY_BORDER,

diff --git a/src/pan-timeline.c b/src/pan-timeline.c
index 73d75e8..ea942aa 100644 (file)
--- a/src/pan-timeline.c
+++ b/src/pan-timeline.c
@@ -133,7 +133,7 @@ void pan_timeline_compute(PanWindow *pw, FileData *dir_fd, gint *width, gint *he
 
                        y += pi->height;
 
-                       pi_day = pan_item_box_new(pw, file_data_new_simple(fd->path), x, y, 0, 0,
+                       pi_day = pan_item_box_new(pw, file_data_ref(fd), x, y, 0, 0,
                                                  PAN_BOX_OUTLINE_THICKNESS,
                                                  PAN_BOX_COLOR, PAN_BOX_ALPHA,
                                                  PAN_BOX_OUTLINE_COLOR, PAN_BOX_OUTLINE_ALPHA);

diff --git a/src/pan-view.c b/src/pan-view.c
index 2ae8c53..f3d16c8 100644 (file)
--- a/src/pan-view.c
+++ b/src/pan-view.c
@@ -2297,7 +2297,7 @@ static void pan_window_entry_activate_cb(const gchar *new_text, gpointer data)
                }
        else
                {
-               FileData *dir_fd = file_data_new_simple(path);
+               FileData *dir_fd = file_data_new_dir(path);
                tab_completion_append_to_history(pw->path_entry, path);
 
                pan_layout_set_fd(pw, dir_fd);

diff --git a/src/remote.c b/src/remote.c
index c94803b..50a6d35 100644 (file)
--- a/src/remote.c
+++ b/src/remote.c
@@ -411,7 +411,7 @@ static void gr_fullscreen_stop(const gchar *text, GIOChannel *channel, gpointer
 static void gr_slideshow_start_rec(const gchar *text, GIOChannel *channel, gpointer data)
 {
        GList *list;
-       FileData *dir_fd = file_data_new_simple(text);
+       FileData *dir_fd = file_data_new_dir(text);
        list = filelist_recursive(dir_fd);
        file_data_unref(dir_fd);
        if (!list) return;

diff --git a/src/search.c b/src/search.c
index abc2268..c7fbaf4 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -2006,7 +2006,7 @@ static gboolean search_step_cb(gpointer data)
                        path = fd->path + strlen(sd->search_dir_fd->path);
                        if (path != fd->path)
                                {
-                               FileData *dir_fd = file_data_new_simple(path);
+                               FileData *dir_fd = file_data_new_dir(path);
                                success = filelist_read(dir_fd, &list, NULL);
                                file_data_unref(dir_fd);
                                }
@@ -2208,7 +2208,7 @@ static void search_start_cb(GtkWidget *widget, gpointer data)
                if (isdir(path))
                        {
                        file_data_unref(sd->search_dir_fd);
-                       sd->search_dir_fd = file_data_new_simple(path);
+                       sd->search_dir_fd = file_data_new_dir(path);
 
                        tab_completion_append_to_history(sd->path_entry, sd->search_dir_fd->path);
 
@@ -2227,7 +2227,7 @@ static void search_start_cb(GtkWidget *widget, gpointer data)
                {
                /* search metadata */
                file_data_unref(sd->search_dir_fd);
-               sd->search_dir_fd = file_data_new_simple(get_metadata_cache_dir());
+               sd->search_dir_fd = file_data_new_dir(get_metadata_cache_dir());
                search_start(sd);
                }
        else if (sd->search_type == SEARCH_MATCH_CONTAINS)

diff --git a/src/thumb.c b/src/thumb.c
index 6e6b065..ab332bb 100644 (file)
--- a/src/thumb.c
+++ b/src/thumb.c
@@ -27,7 +27,7 @@
 
 
 static void thumb_loader_error_cb(ImageLoader *il, gpointer data);
-static void thumb_loader_setup(ThumbLoader *tl, const gchar *path);
+static void thumb_loader_setup(ThumbLoader *tl, FileData *fd);
 
 static GdkPixbuf *get_xv_thumbnail(gchar *thumb_filename, gint max_w, gint max_h);
 
@@ -161,7 +161,7 @@ static void thumb_loader_done_cb(ImageLoader *il, gpointer data)
                DEBUG_1("thumbnail size mismatch, regenerating: %s", tl->fd->path);
                tl->cache_hit = FALSE;
 
-               thumb_loader_setup(tl, tl->fd->path);
+               thumb_loader_setup(tl, tl->fd);
        
                g_signal_connect(G_OBJECT(tl->il), "done", (GCallback)thumb_loader_done_cb, tl);
 
@@ -262,12 +262,10 @@ static void thumb_loader_delay_done(ThumbLoader *tl)
        if (!tl->idle_done_id) tl->idle_done_id = g_idle_add(thumb_loader_done_delay_cb, tl);
 }
 
-static void thumb_loader_setup(ThumbLoader *tl, const gchar *path)
+static void thumb_loader_setup(ThumbLoader *tl, FileData *fd)
 {
-       FileData *fd = file_data_new_simple(path);
        image_loader_free(tl->il);
        tl->il = image_loader_new(fd);
-       file_data_unref(fd);
        image_loader_set_priority(tl->il, G_PRIORITY_LOW);
 
        /* this will speed up jpegs by up to 3x in some cases */
@@ -377,13 +375,15 @@ gboolean thumb_loader_start(ThumbLoader *tl, FileData *fd)
 
        if (cache_path)
                {
-               thumb_loader_setup(tl, cache_path);
+               FileData *fd = file_data_new_no_grouping(cache_path);
+               thumb_loader_setup(tl, fd);
+               file_data_unref(fd);
                g_free(cache_path);
                tl->cache_hit = TRUE;
                }
        else
                {
-               thumb_loader_setup(tl, tl->fd->path);
+               thumb_loader_setup(tl, tl->fd);
                }
 
        g_signal_connect(G_OBJECT(tl->il), "done", (GCallback)thumb_loader_done_cb, tl);
@@ -395,7 +395,7 @@ gboolean thumb_loader_start(ThumbLoader *tl, FileData *fd)
                        tl->cache_hit = FALSE;
                        log_printf("%s", _("Thumbnail image in cache failed to load, trying to recreate.\n"));
 
-                       thumb_loader_setup(tl, tl->fd->path);
+                       thumb_loader_setup(tl, tl->fd);
                        g_signal_connect(G_OBJECT(tl->il), "done", (GCallback)thumb_loader_done_cb, tl);
                        if (image_loader_start(tl->il)) return TRUE;
                        }

diff --git a/src/thumb_standard.c b/src/thumb_standard.c
index 46cdca5..f816809 100644 (file)
--- a/src/thumb_standard.c
+++ b/src/thumb_standard.c
@@ -66,7 +66,6 @@
 
 static void thumb_loader_std_error_cb(ImageLoader *il, gpointer data);
 static gint thumb_loader_std_setup(ThumbLoaderStd *tl, FileData *fd);
-static gint thumb_loader_std_setup_path(ThumbLoaderStd *tl, const gchar *path);
 
 
 ThumbLoaderStd *thumb_loader_std_new(gint width, gint height)
@@ -514,10 +513,16 @@ static gboolean thumb_loader_std_next_source(ThumbLoaderStd *tl, gboolean remove
                if (!tl->thumb_path_local)
                        {
                        tl->thumb_path = thumb_loader_std_cache_path(tl, TRUE, NULL, FALSE);
-                       if (isfile(tl->thumb_path) && thumb_loader_std_setup_path(tl, tl->thumb_path))
+                       if (isfile(tl->thumb_path))
                                {
-                               tl->thumb_path_local = TRUE;
-                               return TRUE;
+                               FileData *fd = file_data_new_no_grouping(tl->thumb_path);
+                               if (thumb_loader_std_setup(tl, fd))
+                                       {
+                                       file_data_unref(fd);
+                                       tl->thumb_path_local = TRUE;
+                                       return TRUE;
+                                       }
+                               file_data_unref(fd);
                                }
 
                        g_free(tl->thumb_path);
@@ -629,14 +634,6 @@ static gboolean thumb_loader_std_setup(ThumbLoaderStd *tl, FileData *fd)
        return FALSE;
 }
 
-static gboolean thumb_loader_std_setup_path(ThumbLoaderStd *tl, const gchar *path)
-{
-       FileData *fd = file_data_new_simple(path);
-       gboolean ret = thumb_loader_std_setup(tl, fd);
-       file_data_unref(fd);
-       return ret;
-}
-
 /*
  * Note: Currently local_cache only specifies where to save a _new_ thumb, if
  *       a valid existing thumb is found anywhere the local thumb will not be created.
@@ -689,7 +686,16 @@ gboolean thumb_loader_std_start(ThumbLoaderStd *tl, FileData *fd)
                tl->thumb_path_local = FALSE;
 
                found = isfile(tl->thumb_path);
-               if (found && thumb_loader_std_setup_path(tl, tl->thumb_path)) return TRUE;
+               if (found)
+                       {
+                       FileData *fd = file_data_new_no_grouping(tl->thumb_path);
+                       if (thumb_loader_std_setup(tl, fd))
+                               {
+                               file_data_unref(fd);
+                               return TRUE;
+                               }
+                       file_data_unref(fd);
+                       }
 
                if (thumb_loader_std_fail_check(tl) ||
                    !thumb_loader_std_next_source(tl, found))
@@ -876,7 +882,8 @@ ThumbLoaderStd *thumb_loader_std_thumb_file_validate(const gchar *thumb_path, gi
        tv->func_valid = func_valid;
        tv->data = data;
 
-       if (!thumb_loader_std_setup_path(tv->tl, thumb_path))
+       FileData *fd = file_data_new_no_grouping(thumb_path);
+       if (!thumb_loader_std_setup(tv->tl, fd))
                {
                tv->idle_id = g_idle_add(thumb_loader_std_thumb_file_validate_idle_cb, tv);
                }
@@ -885,6 +892,7 @@ ThumbLoaderStd *thumb_loader_std_thumb_file_validate(const gchar *thumb_path, gi
                tv->idle_id = 0;
                }
 
+       file_data_unref(fd);
        return tv->tl;
 }
 
@@ -974,7 +982,6 @@ static void thumb_std_maint_move_validate_cb(const gchar *path, gboolean valid,
                        tm->tl->cache_enable = TRUE;
                        tm->tl->cache_hit = FALSE;
                        tm->tl->cache_local = FALSE;
-
                        file_data_unref(tm->tl->fd);
                        tm->tl->fd = file_data_new_simple(tm->dest);
                        tm->tl->source_mtime = strtol(mtime_str, NULL, 10);

diff --git a/src/trash.c b/src/trash.c
index f76425d..e36106d 100644 (file)
--- a/src/trash.c
+++ b/src/trash.c
@@ -37,7 +37,7 @@ static gint file_util_safe_number(gint64 free_space)
        gboolean warned = FALSE;
        FileData *dir_fd;
 
-       dir_fd = file_data_new_simple(options->file_ops.safe_delete_path);
+       dir_fd = file_data_new_dir(options->file_ops.safe_delete_path);
        if (!filelist_read(dir_fd, &list, NULL))
                {
                file_data_unref(dir_fd);

diff --git a/src/view_dir.c b/src/view_dir.c
index 72363ca..a9f473f 100644 (file)
--- a/src/view_dir.c
+++ b/src/view_dir.c
@@ -241,7 +241,7 @@ static void vd_rename_finished_cb(gboolean success, const gchar *new_path, gpoin
        ViewDir *vd = data;
        if (success)
                {
-               FileData *fd = file_data_new_simple(new_path);
+               FileData *fd = file_data_new_dir(new_path);
                GtkTreeIter iter;
 
                if (vd_find_row(vd, fd, &iter))
@@ -435,7 +435,7 @@ static void vd_pop_menu_up_cb(GtkWidget *widget, gpointer data)
 
        if (vd->select_func)
                {
-               FileData *fd = file_data_new_simple(path);
+               FileData *fd = file_data_new_dir(path);
                vd->select_func(vd, fd, vd->select_data);
                file_data_unref(fd);
                }
@@ -561,7 +561,7 @@ static void vd_pop_menu_new_rename_cb(gboolean success, const gchar *new_path, g
                        break;
                case DIRVIEW_TREE:
                        {
-                       FileData *new_fd = file_data_new_simple(new_path);
+                       FileData *new_fd = file_data_new_dir(new_path);
                        fd = vdtree_populate_path(vd, new_fd, TRUE, TRUE);
                        file_data_unref(new_fd);
                        }
@@ -1117,7 +1117,7 @@ static void vd_notify_cb(FileData *fd, NotifyType type, gpointer data)
        if (vd->type == DIRVIEW_TREE)
                {
                GtkTreeIter iter;
-               FileData *base_fd = file_data_new_simple(base);
+               FileData *base_fd = file_data_new_dir(base);
 
                if (vd_find_row(vd, base_fd, &iter))
                        {

diff --git a/src/view_dir_list.c b/src/view_dir_list.c
index 8b4d933..244c81f 100644 (file)
--- a/src/view_dir_list.c
+++ b/src/view_dir_list.c
@@ -159,7 +159,7 @@ static gboolean vdlist_populate(ViewDir *vd, gboolean clear)
        if (strcmp(vd->dir_fd->path, G_DIR_SEPARATOR_S) != 0)
                {
                filepath = g_build_filename(vd->dir_fd->path, "..", NULL);
-               fd = file_data_new_simple(filepath);
+               fd = file_data_new_dir(filepath);
                VDLIST(vd)->list = g_list_prepend(VDLIST(vd)->list, fd);
                g_free(filepath);
                }
@@ -167,7 +167,7 @@ static gboolean vdlist_populate(ViewDir *vd, gboolean clear)
        if (options->file_filter.show_dot_directory)
                {
                filepath = g_build_filename(vd->dir_fd->path, ".", NULL);
-               fd = file_data_new_simple(filepath);
+               fd = file_data_new_dir(filepath);
                VDLIST(vd)->list = g_list_prepend(VDLIST(vd)->list, fd);
                g_free(filepath);
        }

diff --git a/src/view_dir_tree.c b/src/view_dir_tree.c
index 4d3f7f0..ab8f469 100644 (file)
--- a/src/view_dir_tree.c
+++ b/src/view_dir_tree.c
@@ -495,16 +495,15 @@ gboolean vdtree_populate_path_by_iter(ViewDir *vd, GtkTreeIter *iter, gboolean f
                if (target_fd->path[n] == G_DIR_SEPARATOR && target_fd->path[n+1] == '.')
                        {
                        gchar *name8;
-                       struct stat sbuf;
 
                        n++;
 
                        while (target_fd->path[n] != '\0' && target_fd->path[n] != G_DIR_SEPARATOR) n++;
                        name8 = g_strndup(target_fd->path, n);
 
-                       if (stat_utf8(name8, &sbuf))
+                       if (isdir(name8))
                                {
-                               list = g_list_prepend(list, file_data_new_simple(name8));
+                               list = g_list_prepend(list, file_data_new_dir(name8));
                                }
 
                        g_free(name8);
@@ -926,7 +925,7 @@ static void vdtree_setup_root(ViewDir *vd)
        FileData *fd;
 
 
-       fd = file_data_new_simple(path);
+       fd = file_data_new_dir(path);
        vdtree_add_by_data(vd, fd, NULL);
 
        vdtree_expand_by_data(vd, fd, TRUE);