/*
* Geeqie
* (C) 2006 John Ellis
- * Copyright (C) 2008 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
*
* Author: John Ellis
*
#include "main.h"
#include "thumb_standard.h"
-#include "cache.h" /* for cache_ensure_dir_exists */
#include "image-load.h"
#include "md5-util.h"
#include "pixbuf_util.h"
#include "ui_fileops.h"
#include "filedata.h"
#include "exif.h"
+#include "metadata.h"
/*
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)
tl = g_new0(ThumbLoaderStd, 1);
tl->standard_loader = TRUE;
-
tl->requested_width = width;
tl->requested_height = height;
-
- tl->il = NULL;
- tl->fd = NULL;
-
tl->cache_enable = options->thumbnails.enable_caching;
- tl->cache_local = FALSE;
- tl->cache_retry = FALSE;
return tl;
}
tl->progress = 0.0;
}
-static gchar *thumb_std_cache_path(const gchar *path, const gchar *uri, gint local,
+static gchar *thumb_std_cache_path(const gchar *path, const gchar *uri, gboolean local,
const gchar *cache_subfolder)
{
gchar *result = NULL;
return result;
}
-static gchar *thumb_loader_std_cache_path(ThumbLoaderStd *tl, gint local, GdkPixbuf *pixbuf, gint fail)
+static gchar *thumb_loader_std_cache_path(ThumbLoaderStd *tl, gboolean local, GdkPixbuf *pixbuf, gboolean fail)
{
const gchar *folder;
gint w, h;
local, folder);
}
-static gint thumb_loader_std_fail_check(ThumbLoaderStd *tl)
+static gboolean thumb_loader_std_fail_check(ThumbLoaderStd *tl)
{
gchar *fail_path;
- gint result = FALSE;
+ gboolean result = FALSE;
fail_path = thumb_loader_std_cache_path(tl, FALSE, NULL, TRUE);
if (isfile(fail_path))
return result;
}
-static gint thumb_loader_std_validate(ThumbLoaderStd *tl, GdkPixbuf *pixbuf)
+static gboolean thumb_loader_std_validate(ThumbLoaderStd *tl, GdkPixbuf *pixbuf)
{
const gchar *valid_uri;
const gchar *uri;
{
gchar *base_path;
gchar *tmp_path;
- gint fail;
+ gboolean fail;
if (!tl->cache_enable || tl->cache_hit) return;
if (tl->thumb_path) return;
source_base = remove_level_from_path(tl->fd->path);
if (stat_utf8(source_base, &st))
{
- cache_ensure_dir_exists(base_path, st.st_mode);
+ recursive_mkdir_if_not_exists(base_path, st.st_mode);
}
g_free(source_base);
}
}
else
{
- cache_ensure_dir_exists(base_path, THUMB_PERMS_FOLDER);
+ recursive_mkdir_if_not_exists(base_path, THUMB_PERMS_FOLDER);
}
g_free(base_path);
gchar *mark_app;
gchar *mark_mtime;
gchar *pathl;
- gint success;
+ gboolean success;
mark_uri = (tl->cache_local) ? tl->local_uri :tl->thumb_uri;
tl->fd->thumb_pixbuf = pixbuf_fallback(tl->fd, tl->requested_width, tl->requested_height);
}
-static GdkPixbuf *thumb_loader_std_finish(ThumbLoaderStd *tl, GdkPixbuf *pixbuf, gint shrunk)
+static GdkPixbuf *thumb_loader_std_finish(ThumbLoaderStd *tl, GdkPixbuf *pixbuf, gboolean shrunk)
{
GdkPixbuf *pixbuf_thumb = NULL;
GdkPixbuf *result;
{
if (!tl->fd->exif_orientation)
{
- ExifData *exif = exif_read_fd(tl->fd);
- gint orientation;
-
- if (exif && exif_get_integer(exif, "Exif.Image.Orientation", &orientation))
- tl->fd->exif_orientation = orientation;
- else
- tl->fd->exif_orientation = EXIF_ORIENTATION_TOP_LEFT;
- exif_free_fd(tl->fd, exif);
+ tl->fd->exif_orientation = metadata_read_int(tl->fd, ORIENTATION_KEY, EXIF_ORIENTATION_TOP_LEFT);
}
if (tl->fd->exif_orientation != EXIF_ORIENTATION_TOP_LEFT)
if (sw > cache_w || sh > cache_h || shrunk)
{
gint thumb_w, thumb_h;
+ struct stat st;
if (pixbuf_scale_aspect(cache_w, cache_h, sw, sh,
&thumb_w, &thumb_h))
g_object_ref(G_OBJECT(pixbuf_thumb));
}
- thumb_loader_std_save(tl, pixbuf_thumb);
+ /* do not save the thumbnail if the source file has changed meanwhile -
+ the thumbnail is most probably broken */
+ if (stat_utf8(tl->fd->path, &st) &&
+ tl->source_mtime == st.st_mtime &&
+ tl->source_size == st.st_size)
+ {
+ thumb_loader_std_save(tl, pixbuf_thumb);
+ }
}
}
else if (tl->cache_hit &&
return result;
}
-static gint thumb_loader_std_next_source(ThumbLoaderStd *tl, gint remove_broken)
+static gboolean thumb_loader_std_next_source(ThumbLoaderStd *tl, gboolean remove_broken)
{
image_loader_free(tl->il);
tl->il = NULL;
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);
if (tl->func_progress) tl->func_progress(tl, tl->data);
}
-static gint thumb_loader_std_setup(ThumbLoaderStd *tl, FileData *fd)
+static gboolean thumb_loader_std_setup(ThumbLoaderStd *tl, FileData *fd)
{
tl->il = image_loader_new(fd);
image_loader_set_priority(tl->il, G_PRIORITY_LOW);
- if (options->thumbnails.fast)
+ /* this will speed up jpegs by up to 3x in some cases */
+ if (tl->requested_width <= THUMB_SIZE_NORMAL &&
+ tl->requested_height <= THUMB_SIZE_NORMAL)
{
- /* this will speed up jpegs by up to 3x in some cases */
- if (tl->requested_width <= THUMB_SIZE_NORMAL &&
- tl->requested_height <= THUMB_SIZE_NORMAL)
- {
- image_loader_set_requested_size(tl->il, THUMB_SIZE_NORMAL, THUMB_SIZE_NORMAL);
- }
- else
- {
- image_loader_set_requested_size(tl->il, THUMB_SIZE_LARGE, THUMB_SIZE_LARGE);
- }
+ image_loader_set_requested_size(tl->il, THUMB_SIZE_NORMAL, THUMB_SIZE_NORMAL);
+ }
+ else
+ {
+ image_loader_set_requested_size(tl->il, THUMB_SIZE_LARGE, THUMB_SIZE_LARGE);
}
- g_signal_connect (G_OBJECT(tl->il), "error", (GCallback)thumb_loader_std_error_cb, tl);
+ g_signal_connect(G_OBJECT(tl->il), "error", (GCallback)thumb_loader_std_error_cb, tl);
if (tl->func_progress)
{
- g_signal_connect (G_OBJECT(tl->il), "percent", (GCallback)thumb_loader_std_progress_cb, tl);
+ g_signal_connect(G_OBJECT(tl->il), "percent", (GCallback)thumb_loader_std_progress_cb, tl);
}
- g_signal_connect (G_OBJECT(tl->il), "done", (GCallback)thumb_loader_std_done_cb, tl);
+ g_signal_connect(G_OBJECT(tl->il), "done", (GCallback)thumb_loader_std_done_cb, tl);
if (image_loader_start(tl->il))
{
return FALSE;
}
-static gint thumb_loader_std_setup_path(ThumbLoaderStd *tl, const gchar *path)
-{
- FileData *fd = file_data_new_simple(path);
- gint 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.
*/
-void thumb_loader_std_set_cache(ThumbLoaderStd *tl, gint enable_cache, gint local, gint retry_failed)
+void thumb_loader_std_set_cache(ThumbLoaderStd *tl, gboolean enable_cache, gboolean local, gboolean retry_failed)
{
if (!tl) return;
tl->cache_retry = retry_failed;
}
-gint thumb_loader_std_start(ThumbLoaderStd *tl, FileData *fd)
+gboolean thumb_loader_std_start(ThumbLoaderStd *tl, FileData *fd)
{
static gchar *thumb_cache = NULL;
struct stat st;
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))
gchar *path;
gint days;
- void (*func_valid)(const gchar *path, gint valid, gpointer data);
+ void (*func_valid)(const gchar *path, gboolean valid, gpointer data);
gpointer data;
- gint idle_id;
+ guint idle_id; /* event source id */
};
static void thumb_loader_std_thumb_file_validate_free(ThumbValidate *tv)
tv = tl->data;
- if (tv->idle_id != -1) g_source_remove(tv->idle_id);
- tv->idle_id = -1;
+ if (tv->idle_id)
+ {
+ g_source_remove(tv->idle_id);
+ tv->idle_id = 0;
+ }
thumb_loader_std_thumb_file_validate_free(tv);
}
-static void thumb_loader_std_thumb_file_validate_finish(ThumbValidate *tv, gint valid)
+static void thumb_loader_std_thumb_file_validate_finish(ThumbValidate *tv, gboolean valid)
{
if (tv->func_valid) tv->func_valid(tv->path, valid, tv->data);
{
ThumbValidate *tv = data;
GdkPixbuf *pixbuf;
- gint valid = FALSE;
+ gboolean valid = FALSE;
- /* this function is called on success, so the pixbuf should not be a fallback*/
- pixbuf = thumb_loader_std_get_pixbuf(tv->tl);
+ /* get the original thumbnail pixbuf (unrotated, with original options)
+ this is called from image_loader done callback, so tv->tl->il must exist*/
+ pixbuf = image_loader_get_pixbuf(tv->tl->il);
if (pixbuf)
{
const gchar *uri;
}
}
}
-
- g_object_unref(pixbuf);
+ else
+ {
+ DEBUG_1("invalid image found in std cache: %s", tv->path);
+ }
}
thumb_loader_std_thumb_file_validate_finish(tv, valid);
thumb_loader_std_thumb_file_validate_finish(tv, FALSE);
}
-static gint thumb_loader_std_thumb_file_validate_idle_cb(gpointer data)
+static gboolean thumb_loader_std_thumb_file_validate_idle_cb(gpointer data)
{
ThumbValidate *tv = data;
- tv->idle_id = -1;
+ tv->idle_id = 0;
thumb_loader_std_thumb_file_validate_finish(tv, FALSE);
return FALSE;
}
ThumbLoaderStd *thumb_loader_std_thumb_file_validate(const gchar *thumb_path, gint allowed_days,
- void (*func_valid)(const gchar *path, gint valid, gpointer data),
+ void (*func_valid)(const gchar *path, gboolean valid, gpointer data),
gpointer data)
{
ThumbValidate *tv;
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);
}
else
{
- tv->idle_id = -1;
+ tv->idle_id = 0;
}
+ file_data_unref(fd);
return tv->tl;
}
-static void thumb_std_maint_remove_one(const gchar *source, const gchar *uri, gint local,
+static void thumb_std_maint_remove_one(const gchar *source, const gchar *uri, gboolean local,
const gchar *subfolder)
{
gchar *thumb_path;
static void thumb_std_maint_move_step(TMaintMove *tm);
-static gint thumb_std_maint_move_idle(gpointer data);
+static gboolean thumb_std_maint_move_idle(gpointer data);
-static void thumb_std_maint_move_validate_cb(const gchar *path, gint valid, gpointer data)
+static void thumb_std_maint_move_validate_cb(const gchar *path, gboolean valid, gpointer data)
{
TMaintMove *tm = data;
GdkPixbuf *pixbuf;
- /* this function is called on success, so the pixbuf should not be a fallback*/
- pixbuf = thumb_loader_std_get_pixbuf(tm->tl);
+ /* get the original thumbnail pixbuf (unrotated, with original options)
+ this is called from image_loader done callback, so tm->tl->il must exist*/
+ pixbuf = image_loader_get_pixbuf(tm->tl->il);
if (pixbuf)
{
const gchar *uri;
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->fd = file_data_new_group(tm->dest);
tm->tl->source_mtime = strtol(mtime_str, NULL, 10);
pathl = path_from_utf8(tm->tl->fd->path);
DEBUG_1("thumb move unlink: %s", tm->thumb_path);
unlink_file(tm->thumb_path);
- g_object_unref(pixbuf);
}
thumb_std_maint_move_step(tm);
thumb_std_maint_move_validate_cb, tm);
}
-static gint thumb_std_maint_move_idle(gpointer data)
+static gboolean thumb_std_maint_move_idle(gpointer data)
{
TMaintMove *tm;
gchar *pathl;
projects / geeqie.git / blobdiff