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

Clean up

This commit is contained in:
Přemysl Eric Janouch 2022-02-21 21:17:52 +01:00
parent 919a55c90b
commit d9435c988c
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fiv-thumbnail.c
View File

@ -230,8 +230,7 @@ save_thumbnail(cairo_surface_t *thumbnail, const char *path, GString *thum)
} }
static cairo_surface_t * static cairo_surface_t *
fiv_thumbnail_prepare( render(GFile *target, GBytes *data, gboolean *color_managed, GError **error)
GFile *target, GBytes *data, gboolean *color_managed, GError **error)
{ {
FivIoOpenContext ctx = { FivIoOpenContext ctx = {
.uri = g_file_get_uri(target), .uri = g_file_get_uri(target),
@ -253,7 +252,7 @@ fiv_thumbnail_prepare(
} }
static gboolean static gboolean
fiv_thumbnail_fallback(GFile *target, FivThumbnailSize size, produce_fallback(GFile *target, FivThumbnailSize size,
cairo_surface_t **surface, GError **error) cairo_surface_t **surface, GError **error)
{ {
goffset filesize = 0; goffset filesize = 0;
@ -277,8 +276,7 @@ fiv_thumbnail_fallback(GFile *target, FivThumbnailSize size,
return FALSE; return FALSE;
gboolean color_managed = FALSE; gboolean color_managed = FALSE;
cairo_surface_t *result = cairo_surface_t *result = render(target, data, &color_managed, error);
fiv_thumbnail_prepare(target, data, &color_managed, error);
if (!result) if (!result)
return FALSE; return FALSE;
@ -296,10 +294,8 @@ fiv_thumbnail_produce(GFile *target, FivThumbnailSize max_size,
max_size <= FIV_THUMBNAIL_SIZE_MAX, FALSE); max_size <= FIV_THUMBNAIL_SIZE_MAX, FALSE);
const gchar *path = g_file_peek_path(target); const gchar *path = g_file_peek_path(target);
if (!path || !g_file_is_native(target) /* Don't save sftp://. */) { if (!path || !g_file_is_native(target) /* Don't save sftp://. */)
return fiv_thumbnail_fallback( return produce_fallback(target, max_size, max_size_surface, error);
target, max_size, max_size_surface, error);
}
// Make the TOCTTOU issue favour unnecessary reloading. // Make the TOCTTOU issue favour unnecessary reloading.
GStatBuf st = {}; GStatBuf st = {};
@ -313,14 +309,13 @@ fiv_thumbnail_produce(GFile *target, FivThumbnailSize max_size,
if (!mf) { if (!mf) {
g_debug("%s: %s", path, e->message); g_debug("%s: %s", path, e->message);
g_error_free(e); g_error_free(e);
return fiv_thumbnail_fallback( return produce_fallback(target, max_size, max_size_surface, error);
target, max_size, max_size_surface, error);
} }
gsize filesize = g_mapped_file_get_length(mf); gsize filesize = g_mapped_file_get_length(mf);
gboolean color_managed = FALSE; gboolean color_managed = FALSE;
cairo_surface_t *surface = fiv_thumbnail_prepare( cairo_surface_t *surface =
target, g_mapped_file_get_bytes(mf), &color_managed, error); render(target, g_mapped_file_get_bytes(mf), &color_managed, error);
g_mapped_file_unref(mf); g_mapped_file_unref(mf);
if (!surface) if (!surface)
return FALSE; return FALSE;