Merge branch 'Ferada-xdg-thumbnails' (b79cb3cf) · Commits · derf / feh

src/feh_png.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -94,7 +94,7 @@ gib_hash feh_png_read_comments(char file)
		}

		/* grab image data from image and write info file with comments ... */
		int feh_png_write_png(Imlib_Image image, char *file, ...)
		int feh_png_write_png_fd(Imlib_Image image, int fd, ...)
		{
		FILE *fp;
		int i, w, h;
		@@ -111,7 +111,7 @@ int feh_png_write_png(Imlib_Image image, char *file, ...)
		char pair_key, pair_text;
		#endif /* PNG_TEXT_SUPPORTED */

		if (!(fp = fopen(file, "wb")))
		if (!(fp = fdopen(fd, "wb")))
		return 0;

		png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
		@@ -155,7 +155,7 @@ int feh_png_write_png(Imlib_Image image, char *file, ...)
		png_set_sBIT(png_ptr, info_ptr, &sig_bit);

		#ifdef PNG_TEXT_SUPPORTED
		va_start(args, file);
		va_start(args, fd);
		for (i = 0; i < FEH_PNG_NUM_COMMENTS; i++) {
		if ((pair_key = va_arg(args, char *))
		&& (pair_text = va_arg(args, char *))) {

src/feh_png.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
		#include <stdarg.h>

		gib_hash feh_png_read_comments(char file);
		int feh_png_write_png(Imlib_Image image, char *file, ...);
		int feh_png_write_png_fd(Imlib_Image image, int fd, ...);

		int feh_png_file_is_png(FILE * fp);

src/thumbnail.c

+72 −27

Original line number	Diff line number	Diff line
		@@ -566,6 +566,12 @@ int feh_thumbnail_get_thumbnail(Imlib_Image * image, feh_file * file,
		if (td.cache_thumbnails) {
		uri = feh_thumbnail_get_name_uri(file->filename);
		thumb_file = feh_thumbnail_get_name(uri);

		if (thumb_file == NULL) {
		free(uri);
		return feh_load_image(image, file);
		}

		status = feh_thumbnail_get_generated(image, file, thumb_file,
		orig_w, orig_h);

		@@ -582,20 +588,38 @@ int feh_thumbnail_get_thumbnail(Imlib_Image * image, feh_file * file,
		return status;
		}

		char feh_thumbnail_get_name(char uri)
		static char *feh_thumbnail_get_prefix()
		{
		char home = NULL, thumb_file = NULL, *md5_name = NULL;
		char dir = NULL, home, *xdg_cache_home;

		/* FIXME: make sure original file isn't under ~/.thumbnails */

		md5_name = feh_thumbnail_get_name_md5(uri);
		// TODO: perhaps make sure that either of those paths aren't /-terminated

		xdg_cache_home = getenv("XDG_CACHE_HOME");
		if (xdg_cache_home && xdg_cache_home[0] == '/') {
		dir = estrjoin("/", xdg_cache_home, "thumbnails", td.cache_dir, NULL);
		} else {
		home = getenv("HOME");
		if (home) {
		thumb_file = estrjoin("/", home, ".thumbnails", td.cache_dir, md5_name, NULL);
		if (home && home[0] == '/') {
		dir = estrjoin("/", home, ".cache/thumbnails", td.cache_dir, NULL);
		}
		}

		return dir;
		}

		char feh_thumbnail_get_name(char uri)
		{
		char prefix, thumb_file = NULL, *md5_name;

		/* FIXME: make sure original file isn't under ~/.thumbnails */

		prefix = feh_thumbnail_get_prefix();
		if (prefix) {
		md5_name = feh_thumbnail_get_name_md5(uri);
		thumb_file = estrjoin("/", prefix, md5_name, NULL);
		free(md5_name);
		free(prefix);
		}

		return thumb_file;
		}
		@@ -639,7 +663,7 @@ char feh_thumbnail_get_name_md5(char uri)
		md5_finish(&pms, digest);

		/* print the md5 as hex to a string */
		md5_name = emalloc(32 + 4 + 1 * sizeof(char)); /* md5 + .png + '\0' */
		md5_name = emalloc(32 + 4 + 1); /* md5 + .png + '\0' */
		for (i = 0, pos = md5_name; i < 16; i++, pos += 2) {
		sprintf(pos, "%02x", digest[i]);
		}
		@@ -655,6 +679,8 @@ int feh_thumbnail_generate(Imlib_Image * image, feh_file * file,
		Imlib_Image im_temp;
		struct stat sb;
		char c_width[8], c_height[8];
		char tmp_thumb_file, prefix;
		int tmp_fd;

		if (feh_load_image(&im_temp, file) != 0) {
		*orig_w = w = gib_imlib_image_get_width(im_temp);
		@@ -678,18 +704,32 @@ int feh_thumbnail_generate(Imlib_Image * image, feh_file * file,
		sprintf(c_mtime, "%d", (int)sb.st_mtime);
		snprintf(c_width, 8, "%d", w);
		snprintf(c_height, 8, "%d", h);
		feh_png_write_png(*image, thumb_file, "Thumb::URI", uri,
		prefix = feh_thumbnail_get_prefix();
		if (prefix == NULL) {
		gib_imlib_free_image_and_decache(im_temp);
		return 0;
		}
		tmp_thumb_file = estrjoin("/", prefix, ".feh_thumbnail_XXXXXX", NULL);
		free(prefix);
		tmp_fd = mkstemp(tmp_thumb_file);
		if (!feh_png_write_png_fd(*image, tmp_fd, "Thumb::URI", uri,
		"Thumb::MTime", c_mtime,
		"Thumb::Image::Width", c_width,
		"Thumb::Image::Height", c_height);
		"Thumb::Image::Height", c_height)) {
		rename(tmp_thumb_file, thumb_file);
		} else {
		unlink(tmp_thumb_file);
		}
		close(tmp_fd);
		free(tmp_thumb_file);
		}

		gib_imlib_free_image_and_decache(im_temp);

		return (1);
		return 1;
		}

		return (0);
		return 0;
		}

		int feh_thumbnail_get_generated(Imlib_Image * image, feh_file * file,
		@@ -847,31 +887,36 @@ int feh_thumbnail_setup_thumbnail_dir(void)
		{
		int status = 0;
		struct stat sb;
		char dir, dir_thumbnails, *home;
		char dir, p;

		home = getenv("HOME");
		if (home != NULL) {
		dir = estrjoin("/", home, ".thumbnails", td.cache_dir, NULL);
		dir = feh_thumbnail_get_prefix();

		if (dir) {
		if (!stat(dir, &sb)) {
		if (S_ISDIR(sb.st_mode))
		status = 1;
		else
		weprintf("%s should be a directory", dir);
		} else {
		dir_thumbnails = estrjoin("/", home, ".thumbnails", NULL);

		if (stat(dir_thumbnails, &sb) != 0) {
		if (mkdir(dir_thumbnails, 0700) == -1)
		weprintf("unable to create directory %s", dir_thumbnails);
		for (p = dir + 1; *p; p++) {
		if (*p != '/') {
		continue;
		}

		free(dir_thumbnails);
		*p = 0;
		if (stat(dir, &sb) != 0) {
		if (mkdir(dir, 0700) == -1) {
		weprintf("unable to create directory %s", dir);
		}
		}
		*p = '/';
		}

		if (mkdir(dir, 0700) == -1)
		if (stat(dir, &sb) != 0) {
		if (mkdir(dir, 0700) == -1) {
		weprintf("unable to create directory %s", dir);
		else
		status = 1;
		}
		}
		}
		free(dir);
		}

Admin message