callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libgimpthumb: GimpThumbnail made into a final class.

Browse Source
This commit is contained in:
Jehan
2024-10-17 22:37:54 +02:00
parent f965b659eb
commit 65460fc240
2 changed files with 185 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

313
libgimpthumb/gimpthumbnail.c
View File

@ -66,7 +66,7 @@
#if defined (GIMP_THUMB_DEBUG) && defined (__GNUC__) #if defined (GIMP_THUMB_DEBUG) && defined (__GNUC__)
#define GIMP_THUMB_DEBUG_CALL(t) \ #define GIMP_THUMB_DEBUG_CALL(t) \
g_printerr ("%s: %s\n", \ g_printerr ("%s: %s\n", \
__FUNCTION__, GET_PRIVATE (t)->image_uri ? GET_PRIVATE (t)->image_uri : "(null)") __FUNCTION__, t->image_uri ? t->image_uri : "(null)")
#else #else
#define GIMP_THUMB_DEBUG_CALL(t) ((void)(0)) #define GIMP_THUMB_DEBUG_CALL(t) ((void)(0))
#endif #endif
@ -101,7 +101,7 @@ enum
}; };
typedef struct _GimpThumbnailPrivate struct _GimpThumbnail
{ {
GObject parent_instance; GObject parent_instance;
@ -123,9 +123,8 @@ typedef struct _GimpThumbnailPrivate
gint64 thumb_mtime; gint64 thumb_mtime;
gchar *image_mimetype; gchar *image_mimetype;
} GimpThumbnailPrivate; };
#define GET_PRIVATE(obj) ((GimpThumbnailPrivate *) gimp_thumbnail_get_instance_private ((GimpThumbnail *) (obj)))
static void gimp_thumbnail_finalize (GObject *object); static void gimp_thumbnail_finalize (GObject *object);
static void gimp_thumbnail_set_property (GObject *object, static void gimp_thumbnail_set_property (GObject *object,
@ -154,7 +153,7 @@ static void gimp_thumbnail_debug_notify (GObject *object,
#endif #endif
G_DEFINE_TYPE_WITH_PRIVATE (GimpThumbnail, gimp_thumbnail, G_TYPE_OBJECT) G_DEFINE_TYPE (GimpThumbnail, gimp_thumbnail, G_TYPE_OBJECT)
#define parent_class gimp_thumbnail_parent_class #define parent_class gimp_thumbnail_parent_class
@ -250,25 +249,23 @@ gimp_thumbnail_class_init (GimpThumbnailClass *klass)
static void static void
gimp_thumbnail_init (GimpThumbnail *thumbnail) gimp_thumbnail_init (GimpThumbnail *thumbnail)
{ {
GimpThumbnailPrivate *priv = GET_PRIVATE (thumbnail); thumbnail->image_state = GIMP_THUMB_STATE_UNKNOWN;
thumbnail->image_uri = NULL;
thumbnail->image_filename = NULL;
thumbnail->image_mtime = 0;
thumbnail->image_filesize = 0;
thumbnail->image_mimetype = NULL;
thumbnail->image_width = 0;
thumbnail->image_height = 0;
thumbnail->image_type = NULL;
thumbnail->image_num_layers = 0;
thumbnail->image_not_found_errno = 0;
priv->image_state = GIMP_THUMB_STATE_UNKNOWN; thumbnail->thumb_state = GIMP_THUMB_STATE_UNKNOWN;
priv->image_uri = NULL; thumbnail->thumb_size = -1;
priv->image_filename = NULL; thumbnail->thumb_filename = NULL;
priv->image_mtime = 0; thumbnail->thumb_mtime = 0;
priv->image_filesize = 0; thumbnail->thumb_filesize = 0;
priv->image_mimetype = NULL;
priv->image_width = 0;
priv->image_height = 0;
priv->image_type = NULL;
priv->image_num_layers = 0;
priv->image_not_found_errno = 0;
priv->thumb_state = GIMP_THUMB_STATE_UNKNOWN;
priv->thumb_size = -1;
priv->thumb_filename = NULL;
priv->thumb_mtime = 0;
priv->thumb_filesize = 0;
#ifdef GIMP_THUMB_DEBUG #ifdef GIMP_THUMB_DEBUG
g_signal_connect (thumbnail, "notify", g_signal_connect (thumbnail, "notify",
@ -280,13 +277,13 @@ gimp_thumbnail_init (GimpThumbnail *thumbnail)
static void static void
gimp_thumbnail_finalize (GObject *object) gimp_thumbnail_finalize (GObject *object)
{ {
GimpThumbnailPrivate *priv = GET_PRIVATE (object); GimpThumbnail *thumbnail = GIMP_THUMBNAIL (object);
g_clear_pointer (&priv->image_uri, g_free); g_clear_pointer (&thumbnail->image_uri, g_free);
g_clear_pointer (&priv->image_filename, g_free); g_clear_pointer (&thumbnail->image_filename, g_free);
g_clear_pointer (&priv->image_mimetype, g_free); g_clear_pointer (&thumbnail->image_mimetype, g_free);
g_clear_pointer (&priv->image_type, g_free); g_clear_pointer (&thumbnail->image_type, g_free);
g_clear_pointer (&priv->thumb_filename, g_free); g_clear_pointer (&thumbnail->thumb_filename, g_free);
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);
} }
@ -297,45 +294,45 @@ gimp_thumbnail_set_property (GObject *object,
const GValue *value, const GValue *value,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GimpThumbnailPrivate *priv = GET_PRIVATE (object); GimpThumbnail *thumbnail = GIMP_THUMBNAIL (object);
switch (property_id) switch (property_id)
{ {
case PROP_IMAGE_STATE: case PROP_IMAGE_STATE:
priv->image_state = g_value_get_enum (value); thumbnail->image_state = g_value_get_enum (value);
break; break;
case PROP_IMAGE_URI: case PROP_IMAGE_URI:
gimp_thumbnail_set_uri (GIMP_THUMBNAIL (object), gimp_thumbnail_set_uri (GIMP_THUMBNAIL (object),
g_value_get_string (value)); g_value_get_string (value));
break; break;
case PROP_IMAGE_MTIME: case PROP_IMAGE_MTIME:
priv->image_mtime = g_value_get_int64 (value); thumbnail->image_mtime = g_value_get_int64 (value);
break; break;
case PROP_IMAGE_FILESIZE: case PROP_IMAGE_FILESIZE:
priv->image_filesize = g_value_get_int64 (value); thumbnail->image_filesize = g_value_get_int64 (value);
break; break;
case PROP_IMAGE_MIMETYPE: case PROP_IMAGE_MIMETYPE:
g_free (priv->image_mimetype); g_free (thumbnail->image_mimetype);
priv->image_mimetype = g_value_dup_string (value); thumbnail->image_mimetype = g_value_dup_string (value);
break; break;
case PROP_IMAGE_WIDTH: case PROP_IMAGE_WIDTH:
priv->image_width = g_value_get_int (value); thumbnail->image_width = g_value_get_int (value);
break; break;
case PROP_IMAGE_HEIGHT: case PROP_IMAGE_HEIGHT:
priv->image_height = g_value_get_int (value); thumbnail->image_height = g_value_get_int (value);
break; break;
case PROP_IMAGE_TYPE: case PROP_IMAGE_TYPE:
g_free (priv->image_type); g_free (thumbnail->image_type);
priv->image_type = g_value_dup_string (value); thumbnail->image_type = g_value_dup_string (value);
break; break;
case PROP_IMAGE_NUM_LAYERS: case PROP_IMAGE_NUM_LAYERS:
priv->image_num_layers = g_value_get_int (value); thumbnail->image_num_layers = g_value_get_int (value);
break; break;
case PROP_IMAGE_NOT_FOUND_ERRNO: case PROP_IMAGE_NOT_FOUND_ERRNO:
priv->image_not_found_errno = g_value_get_int (value); thumbnail->image_not_found_errno = g_value_get_int (value);
break; break;
case PROP_THUMB_STATE: case PROP_THUMB_STATE:
priv->thumb_state = g_value_get_enum (value); thumbnail->thumb_state = g_value_get_enum (value);
break; break;
default: default:
@ -350,43 +347,43 @@ gimp_thumbnail_get_property (GObject *object,
GValue *value, GValue *value,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GimpThumbnailPrivate *priv = GET_PRIVATE (object); GimpThumbnail *thumbnail = GIMP_THUMBNAIL (object);
switch (property_id) switch (property_id)
{ {
case PROP_IMAGE_STATE: case PROP_IMAGE_STATE:
g_value_set_enum (value, priv->image_state); g_value_set_enum (value, thumbnail->image_state);
break; break;
case PROP_IMAGE_URI: case PROP_IMAGE_URI:
g_value_set_string (value, priv->image_uri); g_value_set_string (value, thumbnail->image_uri);
break; break;
case PROP_IMAGE_MTIME: case PROP_IMAGE_MTIME:
g_value_set_int64 (value, priv->image_mtime); g_value_set_int64 (value, thumbnail->image_mtime);
break; break;
case PROP_IMAGE_FILESIZE: case PROP_IMAGE_FILESIZE:
g_value_set_int64 (value, priv->image_filesize); g_value_set_int64 (value, thumbnail->image_filesize);
break; break;
case PROP_IMAGE_MIMETYPE: case PROP_IMAGE_MIMETYPE:
g_value_set_string (value, priv->image_mimetype); g_value_set_string (value, thumbnail->image_mimetype);
break; break;
case PROP_IMAGE_WIDTH: case PROP_IMAGE_WIDTH:
g_value_set_int (value, priv->image_width); g_value_set_int (value, thumbnail->image_width);
break; break;
case PROP_IMAGE_HEIGHT: case PROP_IMAGE_HEIGHT:
g_value_set_int (value, priv->image_height); g_value_set_int (value, thumbnail->image_height);
break; break;
case PROP_IMAGE_TYPE: case PROP_IMAGE_TYPE:
g_value_set_string (value, priv->image_type); g_value_set_string (value, thumbnail->image_type);
break; break;
case PROP_IMAGE_NUM_LAYERS: case PROP_IMAGE_NUM_LAYERS:
g_value_set_int (value, priv->image_num_layers); g_value_set_int (value, thumbnail->image_num_layers);
break; break;
case PROP_IMAGE_NOT_FOUND_ERRNO: case PROP_IMAGE_NOT_FOUND_ERRNO:
g_value_set_int (value, priv->image_not_found_errno); g_value_set_int (value, thumbnail->image_not_found_errno);
break; break;
case PROP_THUMB_STATE: case PROP_THUMB_STATE:
g_value_set_enum (value, priv->thumb_state); g_value_set_enum (value, thumbnail->thumb_state);
break; break;
default: default:
@ -423,25 +420,21 @@ void
gimp_thumbnail_set_uri (GimpThumbnail *thumbnail, gimp_thumbnail_set_uri (GimpThumbnail *thumbnail,
const gchar *uri) const gchar *uri)
{ {
GimpThumbnailPrivate *priv;
g_return_if_fail (GIMP_IS_THUMBNAIL (thumbnail)); g_return_if_fail (GIMP_IS_THUMBNAIL (thumbnail));
GIMP_THUMB_DEBUG_CALL (thumbnail); GIMP_THUMB_DEBUG_CALL (thumbnail);
priv = GET_PRIVATE (thumbnail); if (thumbnail->image_uri)
g_free (thumbnail->image_uri);
if (priv->image_uri) thumbnail->image_uri = g_strdup (uri);
g_free (priv->image_uri);
priv->image_uri = g_strdup (uri); g_clear_pointer (&thumbnail->image_filename, g_free);
g_clear_pointer (&thumbnail->thumb_filename, g_free);
g_clear_pointer (&priv->image_filename, g_free); thumbnail->thumb_size = -1;
g_clear_pointer (&priv->thumb_filename, g_free); thumbnail->thumb_filesize = 0;
thumbnail->thumb_mtime = 0;
priv->thumb_size = -1;
priv->thumb_filesize = 0;
priv->thumb_mtime = 0;
g_object_set (thumbnail, g_object_set (thumbnail,
"image-state", GIMP_THUMB_STATE_UNKNOWN, "image-state", GIMP_THUMB_STATE_UNKNOWN,
@ -561,7 +554,7 @@ gimp_thumbnail_peek_image (GimpThumbnail *thumbnail)
g_object_thaw_notify (G_OBJECT (thumbnail)); g_object_thaw_notify (G_OBJECT (thumbnail));
return GET_PRIVATE (thumbnail)->image_state; return thumbnail->image_state;
} }
/** /**
@ -596,7 +589,7 @@ gimp_thumbnail_peek_thumb (GimpThumbnail *thumbnail,
g_object_thaw_notify (G_OBJECT (thumbnail)); g_object_thaw_notify (G_OBJECT (thumbnail));
return GET_PRIVATE (thumbnail)->thumb_state; return thumbnail->thumb_state;
} }
/** /**
@ -630,31 +623,30 @@ gimp_thumbnail_check_thumb (GimpThumbnail *thumbnail,
if (pixbuf) if (pixbuf)
g_object_unref (pixbuf); g_object_unref (pixbuf);
return GET_PRIVATE (thumbnail)->thumb_state; return thumbnail->thumb_state;
} }
static void static void
gimp_thumbnail_update_image (GimpThumbnail *thumbnail) gimp_thumbnail_update_image (GimpThumbnail *thumbnail)
{ {
GimpThumbnailPrivate *priv = GET_PRIVATE (thumbnail);
GimpThumbState state; GimpThumbState state;
gint64 mtime = 0; gint64 mtime = 0;
gint64 filesize = 0; gint64 filesize = 0;
if (! priv->image_uri) if (! thumbnail->image_uri)
return; return;
state = priv->image_state; state = thumbnail->image_state;
switch (state) switch (state)
{ {
case GIMP_THUMB_STATE_UNKNOWN: case GIMP_THUMB_STATE_UNKNOWN:
g_return_if_fail (priv->image_filename == NULL); g_return_if_fail (thumbnail->image_filename == NULL);
priv->image_filename = thumbnail->image_filename =
_gimp_thumb_filename_from_uri (priv->image_uri); _gimp_thumb_filename_from_uri (thumbnail->image_uri);
if (! priv->image_filename) if (! thumbnail->image_filename)
state = GIMP_THUMB_STATE_REMOTE; state = GIMP_THUMB_STATE_REMOTE;
break; break;
@ -663,7 +655,7 @@ gimp_thumbnail_update_image (GimpThumbnail *thumbnail)
break; break;
default: default:
g_return_if_fail (priv->image_filename != NULL); g_return_if_fail (thumbnail->image_filename != NULL);
break; break;
} }
@ -673,9 +665,9 @@ gimp_thumbnail_update_image (GimpThumbnail *thumbnail)
break; break;
default: default:
switch (gimp_thumb_file_test (priv->image_filename, switch (gimp_thumb_file_test (thumbnail->image_filename,
&mtime, &filesize, &mtime, &filesize,
&priv->image_not_found_errno)) &thumbnail->image_not_found_errno))
{ {
case GIMP_THUMB_FILE_TYPE_REGULAR: case GIMP_THUMB_FILE_TYPE_REGULAR:
state = GIMP_THUMB_STATE_EXISTS; state = GIMP_THUMB_STATE_EXISTS;
@ -696,21 +688,21 @@ gimp_thumbnail_update_image (GimpThumbnail *thumbnail)
break; break;
} }
if (state != priv->image_state) if (state != thumbnail->image_state)
{ {
g_object_set (thumbnail, g_object_set (thumbnail,
"image-state", state, "image-state", state,
NULL); NULL);
} }
if (mtime != priv->image_mtime || filesize != priv->image_filesize) if (mtime != thumbnail->image_mtime || filesize != thumbnail->image_filesize)
{ {
g_object_set (thumbnail, g_object_set (thumbnail,
"image-mtime", mtime, "image-mtime", mtime,
"image-filesize", filesize, "image-filesize", filesize,
NULL); NULL);
if (priv->thumb_state == GIMP_THUMB_STATE_OK) if (thumbnail->thumb_state == GIMP_THUMB_STATE_OK)
g_object_set (thumbnail, g_object_set (thumbnail,
"thumb-state", GIMP_THUMB_STATE_OLD, "thumb-state", GIMP_THUMB_STATE_OLD,
NULL); NULL);
@ -721,18 +713,17 @@ static void
gimp_thumbnail_update_thumb (GimpThumbnail *thumbnail, gimp_thumbnail_update_thumb (GimpThumbnail *thumbnail,
GimpThumbSize size) GimpThumbSize size)
{ {
GimpThumbnailPrivate *priv = GET_PRIVATE (thumbnail);
gchar *filename; gchar *filename;
GimpThumbState state; GimpThumbState state;
gint64 filesize = 0; gint64 filesize = 0;
gint64 mtime = 0; gint64 mtime = 0;
if (! priv->image_uri) if (! thumbnail->image_uri)
return; return;
state = priv->thumb_state; state = thumbnail->thumb_state;
filename = gimp_thumb_find_thumb (priv->image_uri, &size); filename = gimp_thumb_find_thumb (thumbnail->image_uri, &size);
/* We don't want to clear the GIMP_THUMB_STATE_FAILED state, because /* We don't want to clear the GIMP_THUMB_STATE_FAILED state, because
* it is normal to have no filename if thumbnail creation failed. */ * it is normal to have no filename if thumbnail creation failed. */
@ -744,11 +735,11 @@ gimp_thumbnail_update_thumb (GimpThumbnail *thumbnail,
case GIMP_THUMB_STATE_EXISTS: case GIMP_THUMB_STATE_EXISTS:
case GIMP_THUMB_STATE_OLD: case GIMP_THUMB_STATE_OLD:
case GIMP_THUMB_STATE_OK: case GIMP_THUMB_STATE_OK:
g_return_if_fail (priv->thumb_filename != NULL); g_return_if_fail (thumbnail->thumb_filename != NULL);
if (priv->thumb_size == size && if (thumbnail->thumb_size == size &&
priv->thumb_filesize == filesize && thumbnail->thumb_filesize == filesize &&
priv->thumb_mtime == mtime) thumbnail->thumb_mtime == mtime)
{ {
g_free (filename); g_free (filename);
return; return;
@ -758,20 +749,20 @@ gimp_thumbnail_update_thumb (GimpThumbnail *thumbnail,
break; break;
} }
if (priv->thumb_filename) if (thumbnail->thumb_filename)
g_free (priv->thumb_filename); g_free (thumbnail->thumb_filename);
priv->thumb_filename = filename; thumbnail->thumb_filename = filename;
if (filename) if (filename)
state = (size > GIMP_THUMB_SIZE_FAIL ? state = (size > GIMP_THUMB_SIZE_FAIL ?
GIMP_THUMB_STATE_EXISTS : GIMP_THUMB_STATE_FAILED); GIMP_THUMB_STATE_EXISTS : GIMP_THUMB_STATE_FAILED);
priv->thumb_size = size; thumbnail->thumb_size = size;
priv->thumb_filesize = filesize; thumbnail->thumb_filesize = filesize;
priv->thumb_mtime = mtime; thumbnail->thumb_mtime = mtime;
if (state != priv->thumb_state) if (state != thumbnail->thumb_state)
{ {
g_object_freeze_notify (G_OBJECT (thumbnail)); g_object_freeze_notify (G_OBJECT (thumbnail));
@ -797,7 +788,6 @@ static void
gimp_thumbnail_set_info_from_pixbuf (GimpThumbnail *thumbnail, gimp_thumbnail_set_info_from_pixbuf (GimpThumbnail *thumbnail,
GdkPixbuf *pixbuf) GdkPixbuf *pixbuf)
{ {
GimpThumbnailPrivate *priv = GET_PRIVATE (thumbnail);
const gchar *option; const gchar *option;
gint num; gint num;
@ -805,24 +795,24 @@ gimp_thumbnail_set_info_from_pixbuf (GimpThumbnail *thumbnail,
gimp_thumbnail_reset_info (thumbnail); gimp_thumbnail_reset_info (thumbnail);
g_free (priv->image_mimetype); g_free (thumbnail->image_mimetype);
priv->image_mimetype = thumbnail->image_mimetype =
g_strdup (gdk_pixbuf_get_option (pixbuf, TAG_THUMB_MIMETYPE)); g_strdup (gdk_pixbuf_get_option (pixbuf, TAG_THUMB_MIMETYPE));
option = gdk_pixbuf_get_option (pixbuf, TAG_THUMB_IMAGE_WIDTH); option = gdk_pixbuf_get_option (pixbuf, TAG_THUMB_IMAGE_WIDTH);
if (option && sscanf (option, "%d", &num) == 1) if (option && sscanf (option, "%d", &num) == 1)
priv->image_width = num; thumbnail->image_width = num;
option = gdk_pixbuf_get_option (pixbuf, TAG_THUMB_IMAGE_HEIGHT); option = gdk_pixbuf_get_option (pixbuf, TAG_THUMB_IMAGE_HEIGHT);
if (option && sscanf (option, "%d", &num) == 1) if (option && sscanf (option, "%d", &num) == 1)
priv->image_height = num; thumbnail->image_height = num;
priv->image_type = thumbnail->image_type =
g_strdup (gdk_pixbuf_get_option (pixbuf, TAG_THUMB_GIMP_TYPE)); g_strdup (gdk_pixbuf_get_option (pixbuf, TAG_THUMB_GIMP_TYPE));
option = gdk_pixbuf_get_option (pixbuf, TAG_THUMB_GIMP_LAYERS); option = gdk_pixbuf_get_option (pixbuf, TAG_THUMB_GIMP_LAYERS);
if (option && sscanf (option, "%d", &num) == 1) if (option && sscanf (option, "%d", &num) == 1)
priv->image_num_layers = num; thumbnail->image_num_layers = num;
g_object_thaw_notify (G_OBJECT (thumbnail)); g_object_thaw_notify (G_OBJECT (thumbnail));
} }
@ -835,7 +825,6 @@ gimp_thumbnail_save (GimpThumbnail *thumbnail,
const gchar *software, const gchar *software,
GError **error) GError **error)
{ {
GimpThumbnailPrivate *priv = GET_PRIVATE (thumbnail);
const gchar *keys[12]; const gchar *keys[12];
gchar *values[12]; gchar *values[12];
gchar *basename; gchar *basename;
@ -845,7 +834,7 @@ gimp_thumbnail_save (GimpThumbnail *thumbnail,
gint i = 0; gint i = 0;
keys[i] = TAG_DESCRIPTION; keys[i] = TAG_DESCRIPTION;
values[i] = g_strdup_printf ("Thumbnail of %s", priv->image_uri); values[i] = g_strdup_printf ("Thumbnail of %s", thumbnail->image_uri);
i++; i++;
keys[i] = TAG_SOFTWARE; keys[i] = TAG_SOFTWARE;
@ -853,49 +842,49 @@ gimp_thumbnail_save (GimpThumbnail *thumbnail,
i++; i++;
keys[i] = TAG_THUMB_URI; keys[i] = TAG_THUMB_URI;
values[i] = g_strdup (priv->image_uri); values[i] = g_strdup (thumbnail->image_uri);
i++; i++;
keys[i] = TAG_THUMB_MTIME; keys[i] = TAG_THUMB_MTIME;
values[i] = g_strdup_printf ("%" G_GINT64_FORMAT, priv->image_mtime); values[i] = g_strdup_printf ("%" G_GINT64_FORMAT, thumbnail->image_mtime);
i++; i++;
keys[i] = TAG_THUMB_FILESIZE; keys[i] = TAG_THUMB_FILESIZE;
values[i] = g_strdup_printf ("%" G_GINT64_FORMAT, priv->image_filesize); values[i] = g_strdup_printf ("%" G_GINT64_FORMAT, thumbnail->image_filesize);
i++; i++;
if (priv->image_mimetype) if (thumbnail->image_mimetype)
{ {
keys[i] = TAG_THUMB_MIMETYPE; keys[i] = TAG_THUMB_MIMETYPE;
values[i] = g_strdup (priv->image_mimetype); values[i] = g_strdup (thumbnail->image_mimetype);
i++; i++;
} }
if (priv->image_width > 0) if (thumbnail->image_width > 0)
{ {
keys[i] = TAG_THUMB_IMAGE_WIDTH; keys[i] = TAG_THUMB_IMAGE_WIDTH;
values[i] = g_strdup_printf ("%d", priv->image_width); values[i] = g_strdup_printf ("%d", thumbnail->image_width);
i++; i++;
} }
if (priv->image_height > 0) if (thumbnail->image_height > 0)
{ {
keys[i] = TAG_THUMB_IMAGE_HEIGHT; keys[i] = TAG_THUMB_IMAGE_HEIGHT;
values[i] = g_strdup_printf ("%d", priv->image_height); values[i] = g_strdup_printf ("%d", thumbnail->image_height);
i++; i++;
} }
if (priv->image_type) if (thumbnail->image_type)
{ {
keys[i] = TAG_THUMB_GIMP_TYPE; keys[i] = TAG_THUMB_GIMP_TYPE;
values[i] = g_strdup (priv->image_type); values[i] = g_strdup (thumbnail->image_type);
i++; i++;
} }
if (priv->image_num_layers > 0) if (thumbnail->image_num_layers > 0)
{ {
keys[i] = TAG_THUMB_GIMP_LAYERS; keys[i] = TAG_THUMB_GIMP_LAYERS;
values[i] = g_strdup_printf ("%d", priv->image_num_layers); values[i] = g_strdup_printf ("%d", thumbnail->image_num_layers);
i++; i++;
} }
@ -929,7 +918,7 @@ gimp_thumbnail_save (GimpThumbnail *thumbnail,
if (! success) if (! success)
g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno), g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
_("Could not create thumbnail for %s: %s"), _("Could not create thumbnail for %s: %s"),
priv->image_uri, g_strerror (errno)); thumbnail->image_uri, g_strerror (errno));
} }
if (success) if (success)
@ -943,17 +932,17 @@ gimp_thumbnail_save (GimpThumbnail *thumbnail,
if (! success) if (! success)
g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno), g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
"Could not set permissions of thumbnail for %s: %s", "Could not set permissions of thumbnail for %s: %s",
priv->image_uri, g_strerror (errno)); thumbnail->image_uri, g_strerror (errno));
g_object_freeze_notify (G_OBJECT (thumbnail)); g_object_freeze_notify (G_OBJECT (thumbnail));
gimp_thumbnail_update_thumb (thumbnail, size); gimp_thumbnail_update_thumb (thumbnail, size);
if (success && if (success &&
priv->thumb_state == GIMP_THUMB_STATE_EXISTS && thumbnail->thumb_state == GIMP_THUMB_STATE_EXISTS &&
strcmp (filename, priv->thumb_filename) == 0) strcmp (filename, thumbnail->thumb_filename) == 0)
{ {
priv->thumb_state = GIMP_THUMB_STATE_OK; thumbnail->thumb_state = GIMP_THUMB_STATE_OK;
} }
g_object_thaw_notify (G_OBJECT (thumbnail)); g_object_thaw_notify (G_OBJECT (thumbnail));
@ -1032,7 +1021,6 @@ gimp_thumbnail_load_thumb (GimpThumbnail *thumbnail,
GimpThumbSize size, GimpThumbSize size,
GError **error) GError **error)
{ {
GimpThumbnailPrivate *priv;
GimpThumbState state; GimpThumbState state;
GdkPixbuf *pixbuf; GdkPixbuf *pixbuf;
const gchar *option; const gchar *option;
@ -1043,9 +1031,7 @@ gimp_thumbnail_load_thumb (GimpThumbnail *thumbnail,
GIMP_THUMB_DEBUG_CALL (thumbnail); GIMP_THUMB_DEBUG_CALL (thumbnail);
priv = GET_PRIVATE (thumbnail); if (! thumbnail->image_uri)
if (! priv->image_uri)
return NULL; return NULL;
state = gimp_thumbnail_peek_thumb (thumbnail, size); state = gimp_thumbnail_peek_thumb (thumbnail, size);
@ -1053,12 +1039,12 @@ gimp_thumbnail_load_thumb (GimpThumbnail *thumbnail,
if (state < GIMP_THUMB_STATE_EXISTS || state == GIMP_THUMB_STATE_FAILED) if (state < GIMP_THUMB_STATE_EXISTS || state == GIMP_THUMB_STATE_FAILED)
return NULL; return NULL;
pixbuf = gdk_pixbuf_new_from_file (priv->thumb_filename, NULL); pixbuf = gdk_pixbuf_new_from_file (thumbnail->thumb_filename, NULL);
if (! pixbuf) if (! pixbuf)
return NULL; return NULL;
#ifdef GIMP_THUMB_DEBUG #ifdef GIMP_THUMB_DEBUG
g_printerr ("thumbnail loaded from %s\n", priv->thumb_filename); g_printerr ("thumbnail loaded from %s\n", thumbnail->thumb_filename);
#endif #endif
g_object_freeze_notify (G_OBJECT (thumbnail)); g_object_freeze_notify (G_OBJECT (thumbnail));
@ -1068,10 +1054,10 @@ gimp_thumbnail_load_thumb (GimpThumbnail *thumbnail,
if (!option) if (!option)
goto finish; goto finish;
if (strcmp (option, priv->image_uri)) if (strcmp (option, thumbnail->image_uri))
{ {
/* might be a local thumbnail, try if the local part matches */ /* might be a local thumbnail, try if the local part matches */
const gchar *baseuri = strrchr (priv->image_uri, '/'); const gchar *baseuri = strrchr (thumbnail->image_uri, '/');
if (!baseuri || strcmp (option, baseuri)) if (!baseuri || strcmp (option, baseuri))
goto finish; goto finish;
@ -1088,10 +1074,10 @@ gimp_thumbnail_load_thumb (GimpThumbnail *thumbnail,
goto finish; goto finish;
/* TAG_THUMB_FILESIZE is optional but must match if present */ /* TAG_THUMB_FILESIZE is optional but must match if present */
if (image_mtime == priv->image_mtime && if (image_mtime == thumbnail->image_mtime &&
(option == NULL || image_size == priv->image_filesize)) (option == NULL || image_size == thumbnail->image_filesize))
{ {
if (priv->thumb_size == GIMP_THUMB_SIZE_FAIL) if (thumbnail->thumb_size == GIMP_THUMB_SIZE_FAIL)
state = GIMP_THUMB_STATE_FAILED; state = GIMP_THUMB_STATE_FAILED;
else else
state = GIMP_THUMB_STATE_OK; state = GIMP_THUMB_STATE_OK;
@ -1103,7 +1089,7 @@ gimp_thumbnail_load_thumb (GimpThumbnail *thumbnail,
gimp_thumbnail_set_info_from_pixbuf (thumbnail, pixbuf); gimp_thumbnail_set_info_from_pixbuf (thumbnail, pixbuf);
finish: finish:
if (priv->thumb_size == GIMP_THUMB_SIZE_FAIL || if (thumbnail->thumb_size == GIMP_THUMB_SIZE_FAIL ||
(state != GIMP_THUMB_STATE_OLD && state != GIMP_THUMB_STATE_OK)) (state != GIMP_THUMB_STATE_OLD && state != GIMP_THUMB_STATE_OK))
{ {
g_object_unref (pixbuf); g_object_unref (pixbuf);
@ -1148,26 +1134,23 @@ gimp_thumbnail_save_thumb (GimpThumbnail *thumbnail,
const gchar *software, const gchar *software,
GError **error) GError **error)
{ {
GimpThumbnailPrivate *priv;
GimpThumbSize size; GimpThumbSize size;
gchar *name; gchar *name;
gboolean success; gboolean success;
g_return_val_if_fail (GIMP_IS_THUMBNAIL (thumbnail), FALSE); g_return_val_if_fail (GIMP_IS_THUMBNAIL (thumbnail), FALSE);
g_return_val_if_fail (GET_PRIVATE (thumbnail)->image_uri != NULL, FALSE); g_return_val_if_fail (thumbnail->image_uri != NULL, FALSE);
g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), FALSE); g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), FALSE);
g_return_val_if_fail (software != NULL, FALSE); g_return_val_if_fail (software != NULL, FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
GIMP_THUMB_DEBUG_CALL (thumbnail); GIMP_THUMB_DEBUG_CALL (thumbnail);
priv = GET_PRIVATE (thumbnail);
size = MAX (gdk_pixbuf_get_width (pixbuf), gdk_pixbuf_get_height (pixbuf)); size = MAX (gdk_pixbuf_get_width (pixbuf), gdk_pixbuf_get_height (pixbuf));
if (size < 1) if (size < 1)
return TRUE; return TRUE;
name = gimp_thumb_name_from_uri (priv->image_uri, size); name = gimp_thumb_name_from_uri (thumbnail->image_uri, size);
if (! name) if (! name)
return TRUE; return TRUE;
@ -1210,7 +1193,6 @@ gimp_thumbnail_save_thumb_local (GimpThumbnail *thumbnail,
const gchar *software, const gchar *software,
GError **error) GError **error)
{ {
GimpThumbnailPrivate *priv;
GimpThumbSize size; GimpThumbSize size;
gchar *name; gchar *name;
gchar *filename; gchar *filename;
@ -1218,27 +1200,25 @@ gimp_thumbnail_save_thumb_local (GimpThumbnail *thumbnail,
gboolean success; gboolean success;
g_return_val_if_fail (GIMP_IS_THUMBNAIL (thumbnail), FALSE); g_return_val_if_fail (GIMP_IS_THUMBNAIL (thumbnail), FALSE);
g_return_val_if_fail (GET_PRIVATE (thumbnail)->image_uri != NULL, FALSE); g_return_val_if_fail (thumbnail->image_uri != NULL, FALSE);
g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), FALSE); g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), FALSE);
g_return_val_if_fail (software != NULL, FALSE); g_return_val_if_fail (software != NULL, FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
GIMP_THUMB_DEBUG_CALL (thumbnail); GIMP_THUMB_DEBUG_CALL (thumbnail);
priv = GET_PRIVATE (thumbnail);
size = MAX (gdk_pixbuf_get_width (pixbuf), gdk_pixbuf_get_height (pixbuf)); size = MAX (gdk_pixbuf_get_width (pixbuf), gdk_pixbuf_get_height (pixbuf));
if (size < 1) if (size < 1)
return TRUE; return TRUE;
filename = _gimp_thumb_filename_from_uri (priv->image_uri); filename = _gimp_thumb_filename_from_uri (thumbnail->image_uri);
if (! filename) if (! filename)
return TRUE; return TRUE;
dirname = g_path_get_dirname (filename); dirname = g_path_get_dirname (filename);
g_free (filename); g_free (filename);
name = gimp_thumb_name_from_uri_local (priv->image_uri, size); name = gimp_thumb_name_from_uri_local (thumbnail->image_uri, size);
if (! name) if (! name)
{ {
g_free (dirname); g_free (dirname);
@ -1281,7 +1261,6 @@ gimp_thumbnail_save_failure (GimpThumbnail *thumbnail,
const gchar *software, const gchar *software,
GError **error) GError **error)
{ {
GimpThumbnailPrivate *priv;
GdkPixbuf *pixbuf; GdkPixbuf *pixbuf;
gchar *name; gchar *name;
gchar *desc; gchar *desc;
@ -1290,14 +1269,12 @@ gimp_thumbnail_save_failure (GimpThumbnail *thumbnail,
gboolean success; gboolean success;
g_return_val_if_fail (GIMP_IS_THUMBNAIL (thumbnail), FALSE); g_return_val_if_fail (GIMP_IS_THUMBNAIL (thumbnail), FALSE);
g_return_val_if_fail (GET_PRIVATE (thumbnail)->image_uri != NULL, FALSE); g_return_val_if_fail (thumbnail->image_uri != NULL, FALSE);
g_return_val_if_fail (software != NULL, FALSE); g_return_val_if_fail (software != NULL, FALSE);
GIMP_THUMB_DEBUG_CALL (thumbnail); GIMP_THUMB_DEBUG_CALL (thumbnail);
priv = GET_PRIVATE (thumbnail); name = gimp_thumb_name_from_uri (thumbnail->image_uri, GIMP_THUMB_SIZE_FAIL);
name = gimp_thumb_name_from_uri (priv->image_uri, GIMP_THUMB_SIZE_FAIL);
if (! name) if (! name)
return TRUE; return TRUE;
@ -1309,14 +1286,14 @@ gimp_thumbnail_save_failure (GimpThumbnail *thumbnail,
pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 1, 1); pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 1, 1);
desc = g_strdup_printf ("Thumbnail failure for %s", priv->image_uri); desc = g_strdup_printf ("Thumbnail failure for %s", thumbnail->image_uri);
time_str = g_strdup_printf ("%" G_GINT64_FORMAT, priv->image_mtime); time_str = g_strdup_printf ("%" G_GINT64_FORMAT, thumbnail->image_mtime);
size_str = g_strdup_printf ("%" G_GINT64_FORMAT, priv->image_filesize); size_str = g_strdup_printf ("%" G_GINT64_FORMAT, thumbnail->image_filesize);
success = gdk_pixbuf_save (pixbuf, name, "png", error, success = gdk_pixbuf_save (pixbuf, name, "png", error,
TAG_DESCRIPTION, desc, TAG_DESCRIPTION, desc,
TAG_SOFTWARE, software, TAG_SOFTWARE, software,
TAG_THUMB_URI, priv->image_uri, TAG_THUMB_URI, thumbnail->image_uri,
TAG_THUMB_MTIME, time_str, TAG_THUMB_MTIME, time_str,
TAG_THUMB_FILESIZE, size_str, TAG_THUMB_FILESIZE, size_str,
NULL); NULL);
@ -1354,17 +1331,14 @@ gimp_thumbnail_save_failure (GimpThumbnail *thumbnail,
void void
gimp_thumbnail_delete_failure (GimpThumbnail *thumbnail) gimp_thumbnail_delete_failure (GimpThumbnail *thumbnail)
{ {
GimpThumbnailPrivate *priv;
gchar *filename; gchar *filename;
g_return_if_fail (GIMP_IS_THUMBNAIL (thumbnail)); g_return_if_fail (GIMP_IS_THUMBNAIL (thumbnail));
g_return_if_fail (GET_PRIVATE (thumbnail)->image_uri != NULL); g_return_if_fail (thumbnail->image_uri != NULL);
GIMP_THUMB_DEBUG_CALL (thumbnail); GIMP_THUMB_DEBUG_CALL (thumbnail);
priv = GET_PRIVATE (thumbnail); filename = gimp_thumb_name_from_uri (thumbnail->image_uri,
filename = gimp_thumb_name_from_uri (priv->image_uri,
GIMP_THUMB_SIZE_FAIL); GIMP_THUMB_SIZE_FAIL);
if (filename) if (filename)
{ {
@ -1391,11 +1365,11 @@ gimp_thumbnail_delete_others (GimpThumbnail *thumbnail,
GimpThumbSize size) GimpThumbSize size)
{ {
g_return_if_fail (GIMP_IS_THUMBNAIL (thumbnail)); g_return_if_fail (GIMP_IS_THUMBNAIL (thumbnail));
g_return_if_fail (GET_PRIVATE (thumbnail)->image_uri != NULL); g_return_if_fail (thumbnail->image_uri != NULL);
GIMP_THUMB_DEBUG_CALL (thumbnail); GIMP_THUMB_DEBUG_CALL (thumbnail);
_gimp_thumbs_delete_others (GET_PRIVATE (thumbnail)->image_uri, size); _gimp_thumbs_delete_others (thumbnail->image_uri, size);
} }
/** /**
@ -1418,7 +1392,6 @@ gimp_thumbnail_delete_others (GimpThumbnail *thumbnail,
gboolean gboolean
gimp_thumbnail_has_failed (GimpThumbnail *thumbnail) gimp_thumbnail_has_failed (GimpThumbnail *thumbnail)
{ {
GimpThumbnailPrivate *priv;
GdkPixbuf *pixbuf; GdkPixbuf *pixbuf;
const gchar *option; const gchar *option;
gchar *filename; gchar *filename;
@ -1427,13 +1400,11 @@ gimp_thumbnail_has_failed (GimpThumbnail *thumbnail)
gboolean failed = FALSE; gboolean failed = FALSE;
g_return_val_if_fail (GIMP_IS_THUMBNAIL (thumbnail), FALSE); g_return_val_if_fail (GIMP_IS_THUMBNAIL (thumbnail), FALSE);
g_return_val_if_fail (GET_PRIVATE (thumbnail)->image_uri != NULL, FALSE); g_return_val_if_fail (thumbnail->image_uri != NULL, FALSE);
GIMP_THUMB_DEBUG_CALL (thumbnail); GIMP_THUMB_DEBUG_CALL (thumbnail);
priv = GET_PRIVATE (thumbnail); filename = gimp_thumb_name_from_uri (thumbnail->image_uri,
filename = gimp_thumb_name_from_uri (priv->image_uri,
GIMP_THUMB_SIZE_FAIL); GIMP_THUMB_SIZE_FAIL);
if (! filename) if (! filename)
return FALSE; return FALSE;
@ -1449,7 +1420,7 @@ gimp_thumbnail_has_failed (GimpThumbnail *thumbnail)
/* URI and mtime from the thumbnail need to match our file */ /* URI and mtime from the thumbnail need to match our file */
option = gdk_pixbuf_get_option (pixbuf, TAG_THUMB_URI); option = gdk_pixbuf_get_option (pixbuf, TAG_THUMB_URI);
if (! option || strcmp (option, priv->image_uri)) if (! option || strcmp (option, thumbnail->image_uri))
goto finish; goto finish;
option = gdk_pixbuf_get_option (pixbuf, TAG_THUMB_MTIME); option = gdk_pixbuf_get_option (pixbuf, TAG_THUMB_MTIME);
@ -1461,8 +1432,8 @@ gimp_thumbnail_has_failed (GimpThumbnail *thumbnail)
goto finish; goto finish;
/* TAG_THUMB_FILESIZE is optional but must match if present */ /* TAG_THUMB_FILESIZE is optional but must match if present */
if (image_mtime == priv->image_mtime && if (image_mtime == thumbnail->image_mtime &&
(option == NULL || image_size == priv->image_filesize)) (option == NULL || image_size == thumbnail->image_filesize))
{ {
failed = TRUE; failed = TRUE;
} }

17
libgimpthumb/gimpthumbnail.h
View File

@ -33,22 +33,7 @@ G_BEGIN_DECLS
#define GIMP_TYPE_THUMBNAIL (gimp_thumbnail_get_type ()) #define GIMP_TYPE_THUMBNAIL (gimp_thumbnail_get_type ())
G_DECLARE_DERIVABLE_TYPE (GimpThumbnail, gimp_thumbnail, GIMP, THUMBNAIL, GObject) G_DECLARE_FINAL_TYPE (GimpThumbnail, gimp_thumbnail, GIMP, THUMBNAIL, GObject)
struct _GimpThumbnailClass
{
GObjectClass parent_class;
/* Padding for future expansion */
void (* _gimp_reserved1) (void);
void (* _gimp_reserved2) (void);
void (* _gimp_reserved3) (void);
void (* _gimp_reserved4) (void);
void (* _gimp_reserved5) (void);
void (* _gimp_reserved6) (void);
void (* _gimp_reserved7) (void);
void (* _gimp_reserved8) (void);
};
GimpThumbnail * gimp_thumbnail_new (void); GimpThumbnail * gimp_thumbnail_new (void);