From ad1ff06aff068bb260c0b957c5257acb1d117caf Mon Sep 17 00:00:00 2001 From: Přemysl Eric Janouch Date: Tue, 28 Dec 2021 00:26:36 +0100 Subject: Avoid producing thumbnails of thumbnails --- fiv-browser.c | 11 +++++++++++ fiv-io.c | 29 ++++++++++++++++++----------- fiv-io.h | 3 +++ 3 files changed, 32 insertions(+), 11 deletions(-) diff --git a/fiv-browser.c b/fiv-browser.c index b85caeb..ab085f7 100644 --- a/fiv-browser.c +++ b/fiv-browser.c @@ -543,6 +543,17 @@ thumbnailer_start(FivBrowser *self) { thumbnailer_abort(self); + // TODO(p): Leave out all paths containing .cache/thumbnails altogether. + gchar *thumbnails_dir = fiv_io_get_thumbnail_root(); + GFile *thumbnails = g_file_new_for_path(thumbnails_dir); + g_free(thumbnails_dir); + GFile *current = g_file_new_for_path(self->path); + gboolean is_a_thumbnail = g_file_has_prefix(current, thumbnails); + g_object_unref(current); + g_object_unref(thumbnails); + if (is_a_thumbnail) + return; + GList *missing = NULL, *lq = NULL; for (guint i = self->entries->len; i--; ) { Entry *entry = &g_array_index(self->entries, Entry, i); diff --git a/fiv-io.c b/fiv-io.c index eb2ea81..dea5de9 100644 --- a/fiv-io.c +++ b/fiv-io.c @@ -2773,6 +2773,15 @@ mark_thumbnail_lq(cairo_surface_t *surface) surface, &fiv_io_key_thumbnail_lq, (void *) (intptr_t) 1, NULL); } +gchar * +fiv_io_get_thumbnail_root(void) +{ + gchar *cache_dir = get_xdg_home_dir("XDG_CACHE_HOME", ".cache"); + gchar *thumbnails_dir = g_build_filename(cache_dir, "thumbnails", NULL); + g_free(cache_dir); + return thumbnails_dir; +} + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // In principle similar to rescale_thumbnail() from fiv-browser.c. @@ -2857,15 +2866,13 @@ fiv_io_produce_thumbnail(GFile *target, FivIoThumbnailSize size, GError **error) // Boilerplate copied from fiv_io_lookup_thumbnail(). gchar *uri = g_file_get_uri(target); gchar *sum = g_compute_checksum_for_string(G_CHECKSUM_MD5, uri, -1); - gchar *cache_dir = get_xdg_home_dir("XDG_CACHE_HOME", ".cache"); - - // TODO(p): Never produce thumbnails for thumbnail directories. + gchar *thumbnails_dir = fiv_io_get_thumbnail_root(); for (int use = size; use >= FIV_IO_THUMBNAIL_SIZE_MIN; use--) { cairo_surface_t *scaled = rescale_thumbnail(surface, fiv_io_thumbnail_sizes[use].size); - gchar *path = g_strdup_printf("%s/thumbnails/wide-%s/%s.webp", - cache_dir, fiv_io_thumbnail_sizes[use].thumbnail_spec_name, sum); + gchar *path = g_strdup_printf("%s/wide-%s/%s.webp", thumbnails_dir, + fiv_io_thumbnail_sizes[use].thumbnail_spec_name, sum); GError *e = NULL; while (!fiv_io_save(scaled, scaled, NULL, path, &e)) { @@ -2892,7 +2899,7 @@ fiv_io_produce_thumbnail(GFile *target, FivIoThumbnailSize size, GError **error) g_free(path); } - g_free(cache_dir); + g_free(thumbnails_dir); g_free(sum); g_free(uri); cairo_surface_destroy(surface); @@ -3064,7 +3071,7 @@ fiv_io_lookup_thumbnail(GFile *target, FivIoThumbnailSize size) gchar *uri = g_file_get_uri(target); gchar *sum = g_compute_checksum_for_string(G_CHECKSUM_MD5, uri, -1); - gchar *cache_dir = get_xdg_home_dir("XDG_CACHE_HOME", ".cache"); + gchar *thumbnails_dir = fiv_io_get_thumbnail_root(); // The lookup sequence is: nominal..max, then mirroring back to ..min. cairo_surface_t *result = NULL; @@ -3075,8 +3082,8 @@ fiv_io_lookup_thumbnail(GFile *target, FivIoThumbnailSize size) use = FIV_IO_THUMBNAIL_SIZE_MAX - i; const char *name = fiv_io_thumbnail_sizes[use].thumbnail_spec_name; - gchar *wide = g_strdup_printf( - "%s/thumbnails/wide-%s/%s.webp", cache_dir, name, sum); + gchar *wide = + g_strdup_printf("%s/wide-%s/%s.webp", thumbnails_dir, name, sum); result = read_wide_thumbnail(wide, uri, st.st_mtim.tv_sec, &error); if (error) { g_debug("%s: %s", wide, error->message); @@ -3092,7 +3099,7 @@ fiv_io_lookup_thumbnail(GFile *target, FivIoThumbnailSize size) } gchar *path = - g_strdup_printf("%s/thumbnails/%s/%s.png", cache_dir, name, sum); + g_strdup_printf("%s/%s/%s.png", thumbnails_dir, name, sum); result = read_spng_thumbnail(path, uri, st.st_mtim.tv_sec, &error); if (error) { g_debug("%s: %s", path, error->message); @@ -3109,7 +3116,7 @@ fiv_io_lookup_thumbnail(GFile *target, FivIoThumbnailSize size) // TODO(p): We can definitely extract embedded thumbnails, but it should be // done as a separate stage--the file may be stored on a slow device. - g_free(cache_dir); + g_free(thumbnails_dir); g_free(sum); g_free(uri); return result; diff --git a/fiv-io.h b/fiv-io.h index 29d9807..5ce0c1c 100644 --- a/fiv-io.h +++ b/fiv-io.h @@ -134,6 +134,9 @@ typedef struct _FivIoThumbnailSizeInfo { extern FivIoThumbnailSizeInfo fiv_io_thumbnail_sizes[FIV_IO_THUMBNAIL_SIZE_COUNT]; +/// Returns this user's root thumbnail directory. +gchar *fiv_io_get_thumbnail_root(void); + /// Generates wide thumbnails of up to the specified size, saves them in cache. gboolean fiv_io_produce_thumbnail( GFile *target, FivIoThumbnailSize size, GError **error); -- cgit v1.2.3-70-g09d2