Fix #314: Remote commands for thumbnail maintenance

[geeqie.git] / src / filecache.c

diff --git a/src/filecache.c b/src/filecache.c
index df522e4..9e9db8b 100644 (file)
--- a/src/filecache.c
+++ b/src/filecache.c
@@ -1,15 +1,23 @@
 /*
- * Geeqie
- * Copyright (C) 2008 The Geeqie Team
+ * Copyright (C) 2008 - 2016 The Geeqie Team
  *
  * Author: Vladimir Nadvornik
  *
- * This software is released under the GNU General Public License (GNU GPL).
- * Please read the included file COPYING for more information.
- * This software comes with no warranty of any kind, use at your own risk!
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-
 #include "main.h"
 #include "filecache.h"
 
@@ -23,19 +31,21 @@ struct _FileCacheData {
        GList *list;
        gulong max_size;
        gulong size;
-       };
+};
 
 typedef struct _FileCacheEntry FileCacheEntry;
 struct _FileCacheEntry {
        FileData *fd;
        gulong size;
-       };
+};
 
 static void file_cache_notify_cb(FileData *fd, NotifyType type, gpointer data);
+static void file_cache_remove_fd(FileCacheData *fc, FileData *fd);
 
 FileCacheData *file_cache_new(FileCacheReleaseFunc release, gulong max_size)
 {
        FileCacheData *fc = g_new(FileCacheData, 1);
+
        fc->release = release;
        fc->list = NULL;
        fc->max_size = max_size;
@@ -49,7 +59,7 @@ FileCacheData *file_cache_new(FileCacheReleaseFunc release, gulong max_size)
 gboolean file_cache_get(FileCacheData *fc, FileData *fd)
 {
        GList *work;
-       
+
        g_assert(fc && fd);
 
        work = fc->list;
@@ -59,22 +69,24 @@ gboolean file_cache_get(FileCacheData *fc, FileData *fd)
                if (fce->fd == fd)
                        {
                        /* entry exists */
-                       DEBUG_1("cache hit: fc=%p %s", fc, fd->path);
+                       DEBUG_2("cache hit: fc=%p %s", fc, fd->path);
                        if (work == fc->list) return TRUE; /* already at the beginning */
                        /* move it to the beginning */
-                       DEBUG_1("cache move to front: fc=%p %s", fc, fd->path);
+                       DEBUG_2("cache move to front: fc=%p %s", fc, fd->path);
                        fc->list = g_list_remove_link(fc->list, work);
                        fc->list = g_list_concat(work, fc->list);
-                       
-                       if (file_data_check_changed_files(fd)) /* this will eventually remove changed files from cache via file_cache_notify_cb */
+
+                       if (file_data_check_changed_files(fd)) {
+                               /* file has been changed, cance entry is no longer valid */
+                               file_cache_remove_fd(fc, fd);
                                return FALSE;
-                               
+                       }
                        if (debug_file_cache) file_cache_dump(fc);
                        return TRUE;
                        }
                work = work->next;
                }
-       DEBUG_1("cache miss: fc=%p %s", fc, fd->path);
+       DEBUG_2("cache miss: fc=%p %s", fc, fd->path);
        return FALSE;
 }
 
@@ -93,8 +105,8 @@ void file_cache_set_size(FileCacheData *fc, gulong size)
                prev = work->prev;
                fc->list = g_list_delete_link(fc->list, work);
                work = prev;
-               
-               DEBUG_1("file changed - cache remove: fc=%p %s", fc, last_fe->fd->path);
+
+               DEBUG_2("file changed - cache remove: fc=%p %s", fc, last_fe->fd->path);
                fc->size -= last_fe->size;
                fc->release(last_fe->fd);
                file_data_unref(last_fe->fd);
@@ -107,14 +119,14 @@ void file_cache_put(FileCacheData *fc, FileData *fd, gulong size)
        FileCacheEntry *fe;
 
        if (file_cache_get(fc, fd)) return;
-       
-       DEBUG_1("cache add: fc=%p %s", fc, fd->path);
+
+       DEBUG_2("cache add: fc=%p %s", fc, fd->path);
        fe = g_new(FileCacheEntry, 1);
        fe->fd = file_data_ref(fd);
        fe->size = size;
        fc->list = g_list_prepend(fc->list, fe);
        fc->size += size;
-       
+
        file_cache_set_size(fc, fc->max_size);
 }
 
@@ -151,7 +163,7 @@ static void file_cache_remove_fd(FileCacheData *fc, FileData *fd)
                if (fe->fd == fd)
                        {
                        fc->list = g_list_delete_link(fc->list, current);
-               
+
                        DEBUG_1("cache remove: fc=%p %s", fc, fe->fd->path);
                        fc->size -= fe->size;
                        fc->release(fe->fd);
@@ -163,11 +175,11 @@ static void file_cache_remove_fd(FileCacheData *fc, FileData *fd)
 
 void file_cache_dump(FileCacheData *fc)
 {
-       GList *work;
-       work = fc->list;
+       GList *work = fc->list;
        gulong n = 0;
+
        DEBUG_1("cache dump: fc=%p max size:%ld size:%ld", fc, fc->max_size, fc->size);
-               
+
        while (work)
                {
                FileCacheEntry *fe = work->data;
@@ -180,8 +192,9 @@ static void file_cache_notify_cb(FileData *fd, NotifyType type, gpointer data)
 {
        FileCacheData *fc = data;
 
-       if (type != NOTIFY_TYPE_INTERNAL) /* invalidate the entry on each file change */
+       if (type & (NOTIFY_REREAD | NOTIFY_CHANGE)) /* invalidate the entry on each file change */
                {
+               DEBUG_1("Notify cache: %s %04x", fd->path, type);
                file_cache_remove_fd(fc, fd);
                }
 }