Commit b4c95797 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Only create caption directory when writing out a caption (closes #42)

parent 569c27a1

src/feh.h

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ void slideshow_save_image(winwidget win); 
void feh_edit_inplace_orient(winwidget w, int orientation);

void feh_edit_inplace_lossless_rotate(winwidget w, int orientation);

gib_list *feh_wrap_string(char *text, int wrap_width, Imlib_Font fn, gib_style * style);

char *build_caption_filename(feh_file * file);

char *build_caption_filename(feh_file * file, short create_dir);

gib_list *feh_list_jump(gib_list * root, gib_list * l, int direction, int num);



/* Imlib stuff */

src/imlib.c

+9 −4
Original line number Diff line number Diff line
@@ -505,7 +505,7 @@ void feh_draw_info(winwidget w) 
	return;

}



char *build_caption_filename(feh_file * file)

char *build_caption_filename(feh_file * file, short create_dir)

{

	char *caption_filename;

	char *s, *dir, *caption_dir;
@@ -524,6 +524,8 @@ char *build_caption_filename(feh_file * file) 
	D(("dir %s, cp %s, cdir %s\n", dir, opt.caption_path, caption_dir))



	if (stat(caption_dir, &cdir_stat) == -1) {

		if (!create_dir)

			return NULL;

		if (mkdir(caption_dir, 0755) == -1)

			eprintf("Failed to create caption directory %s:", caption_dir);

	} else if (!S_ISDIR(cdir_stat.st_mode))
@@ -559,9 +561,12 @@ void feh_draw_caption(winwidget w) 


	if (!file->caption) {

		char *caption_filename;

		caption_filename = build_caption_filename(file);

		caption_filename = build_caption_filename(file, 0);

		if (caption_filename)

			/* read caption from file */

			file->caption = ereadfile(caption_filename);

		else

			file->caption = estrdup("");

		free(caption_filename);

	}

src/keyevents.c

+3 −2
Original line number Diff line number Diff line
@@ -377,14 +377,15 @@ void feh_event_handle_keypress(XEvent * ev) 
				/* finish caption entry, write to captions file */

				FILE *fp;

				char *caption_filename;

				caption_filename = build_caption_filename(FEH_FILE(winwid->file->data));

				caption_filename =

					build_caption_filename(FEH_FILE(winwid->file->data), 1);

				winwid->caption_entry = 0;

				winwidget_render_image_cached(winwid);

				XFreePixmap(disp, winwid->bg_pmap_cache);

				winwid->bg_pmap_cache = 0;

				fp = fopen(caption_filename, "w");

				if (!fp) {

					weprintf("couldn't write to captions file %s:", caption_filename);

					eprintf("couldn't write to captions file %s:", caption_filename);

					return;

				}

				fprintf(fp, "%s", FEH_FILE(winwid->file->data)->caption);