p/fiv
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid producing thumbnails of thumbnails

Browse Source
This commit is contained in:
Přemysl Eric Janouch 2021-12-28 00:26:36 +01:00
parent af2eb411d9
commit ad1ff06aff
Signed by: p
GPG Key ID: A0420B94F92B9493
3 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fiv-browser.c
View File

@ -543,6 +543,17 @@ thumbnailer_start(FivBrowser *self)
{ {
thumbnailer_abort(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; GList *missing = NULL, *lq = NULL;
for (guint i = self->entries->len; i--; ) { for (guint i = self->entries->len; i--; ) {
Entry *entry = &g_array_index(self->entries, Entry, i); Entry *entry = &g_array_index(self->entries, Entry, i);

29
fiv-io.c
View File

@ -2773,6 +2773,15 @@ mark_thumbnail_lq(cairo_surface_t *surface)
surface, &fiv_io_key_thumbnail_lq, (void *) (intptr_t) 1, NULL); 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. // 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(). // Boilerplate copied from fiv_io_lookup_thumbnail().
gchar *uri = g_file_get_uri(target); gchar *uri = g_file_get_uri(target);
gchar *sum = g_compute_checksum_for_string(G_CHECKSUM_MD5, uri, -1); 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();
// TODO(p): Never produce thumbnails for thumbnail directories.
for (int use = size; use >= FIV_IO_THUMBNAIL_SIZE_MIN; use--) { for (int use = size; use >= FIV_IO_THUMBNAIL_SIZE_MIN; use--) {
cairo_surface_t *scaled = cairo_surface_t *scaled =
rescale_thumbnail(surface, fiv_io_thumbnail_sizes[use].size); rescale_thumbnail(surface, fiv_io_thumbnail_sizes[use].size);
gchar *path = g_strdup_printf("%s/thumbnails/wide-%s/%s.webp", gchar *path = g_strdup_printf("%s/wide-%s/%s.webp", thumbnails_dir,
cache_dir, fiv_io_thumbnail_sizes[use].thumbnail_spec_name, sum); fiv_io_thumbnail_sizes[use].thumbnail_spec_name, sum);
GError *e = NULL; GError *e = NULL;
while (!fiv_io_save(scaled, scaled, NULL, path, &e)) { 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(path);
} }
g_free(cache_dir); g_free(thumbnails_dir);
g_free(sum); g_free(sum);
g_free(uri); g_free(uri);
cairo_surface_destroy(surface); cairo_surface_destroy(surface);
@ -3064,7 +3071,7 @@ fiv_io_lookup_thumbnail(GFile *target, FivIoThumbnailSize size)
gchar *uri = g_file_get_uri(target); gchar *uri = g_file_get_uri(target);
gchar *sum = g_compute_checksum_for_string(G_CHECKSUM_MD5, uri, -1); 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. // The lookup sequence is: nominal..max, then mirroring back to ..min.
cairo_surface_t *result = NULL; cairo_surface_t *result = NULL;
@ -3075,8 +3082,8 @@ fiv_io_lookup_thumbnail(GFile *target, FivIoThumbnailSize size)
use = FIV_IO_THUMBNAIL_SIZE_MAX - i; use = FIV_IO_THUMBNAIL_SIZE_MAX - i;
const char *name = fiv_io_thumbnail_sizes[use].thumbnail_spec_name; const char *name = fiv_io_thumbnail_sizes[use].thumbnail_spec_name;
gchar *wide = g_strdup_printf( gchar *wide =
"%s/thumbnails/wide-%s/%s.webp", cache_dir, name, sum); g_strdup_printf("%s/wide-%s/%s.webp", thumbnails_dir, name, sum);
result = read_wide_thumbnail(wide, uri, st.st_mtim.tv_sec, &error); result = read_wide_thumbnail(wide, uri, st.st_mtim.tv_sec, &error);
if (error) { if (error) {
g_debug("%s: %s", wide, error->message); g_debug("%s: %s", wide, error->message);
@ -3092,7 +3099,7 @@ fiv_io_lookup_thumbnail(GFile *target, FivIoThumbnailSize size)
} }
gchar *path = 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); result = read_spng_thumbnail(path, uri, st.st_mtim.tv_sec, &error);
if (error) { if (error) {
g_debug("%s: %s", path, error->message); 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 // 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. // 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(sum);
g_free(uri); g_free(uri);
return result; return result;

3
fiv-io.h
View File

@ -134,6 +134,9 @@ typedef struct _FivIoThumbnailSizeInfo {
extern FivIoThumbnailSizeInfo extern FivIoThumbnailSizeInfo
fiv_io_thumbnail_sizes[FIV_IO_THUMBNAIL_SIZE_COUNT]; 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. /// Generates wide thumbnails of up to the specified size, saves them in cache.
gboolean fiv_io_produce_thumbnail( gboolean fiv_io_produce_thumbnail(
GFile *target, FivIoThumbnailSize size, GError **error); GFile *target, FivIoThumbnailSize size, GError **error);