diff options
| author | Daniel Friesel <derf@finalrewind.org> | 2020-03-30 20:26:49 +0200 |
|---|---|---|
| committer | Daniel Friesel <derf@finalrewind.org> | 2020-03-30 20:26:49 +0200 |
| commit | 6b800919b117eb3e9df405ef146feb2810b87d8f (patch) | |
| tree | 4485c890f10d250429451a872cd0ce80969ad86a /src | |
| parent | 654f66211a81c0eb9d57e670c319fa60203ee1ee (diff) | |
bypass HTTP cache when reloading an image
Diffstat (limited to 'src')
| -rw-r--r-- | src/imlib.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/imlib.c b/src/imlib.c index e050126..2eeb37d 100644 --- a/src/imlib.c +++ b/src/imlib.c @@ -60,6 +60,11 @@ int xinerama_screen; int num_xinerama_screens; #endif /* HAVE_LIBXINERAMA */ +#ifdef HAVE_LIBCURL +// TODO use cache for dcraw and magick conversion results as well +gib_hash* http_cache = NULL; +#endif + int childpid = 0; static int feh_file_is_raw(char *filename); @@ -260,7 +265,9 @@ int feh_load_image(Imlib_Image * im, feh_file * file) } if ((image_source != SRC_HTTP) || (!opt.keep_http && !opt.use_http_cache)) unlink(tmpname); + // keep_http already performs an add_file_to_rm_filelist call else if (opt.use_http_cache && !opt.keep_http) + // add_file_to_rm_filelist duplicates tmpname add_file_to_rm_filelist(tmpname); if (image_source != SRC_HTTP && !opt.use_http_cache) @@ -358,6 +365,15 @@ void feh_reload_image(winwidget w, int resize, int force_new) if (force_new) winwidget_free_image(w); +#ifdef HAVE_LIBCURL + // if it's an external image, our own cache will also get in your way + char *sfn; + if (opt.use_http_cache && (sfn = gib_hash_get(http_cache, FEH_FILE(w->file->data)->filename)) != NULL) { + free(sfn); + gib_hash_set(http_cache, FEH_FILE(w->file->data)->filename, NULL); + } +#endif + if ((feh_load_image(&tmp, FEH_FILE(w->file->data))) == 0) { if (force_new) eprintf("failed to reload image\n"); @@ -621,9 +637,6 @@ static char *feh_magick_load_image(char *filename) #ifdef HAVE_LIBCURL -// TODO use cache for dcraw and magick conversion results as well -gib_hash* http_cache = NULL; - #if LIBCURL_VERSION_NUM >= 0x072000 /* 07.32.0 */ static int curl_quit_function(void *clientp, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow) #else |