act_on : optimize nb of images

glasl · Dec 20, 2021 · fba5815 · fba5815
1 parent 5dee60a
commit fba5815
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 28 deletions.
diff --git a/src/common/act_on.c b/src/common/act_on.c
@@ -1,6 +1,6 @@
 /*
     This file is part of darktable,
-    Copyright (C) 2009-2021 darktable developers.
+    Copyright (C) 2021 darktable developers.
 
     darktable is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -75,6 +75,37 @@ static void _insert_in_list(GList **list, const int imgid, gboolean only_visible
   }
 }
 
+// test if the cache is still valid
+static gboolean _test_cache(dt_act_on_cache_t *cache)
+{
+  const int mouseover = dt_control_get_mouse_over_id();
+
+  if(cache->ok && cache->image_over == mouseover
+     && cache->inside_table == dt_ui_thumbtable(darktable.gui->ui)->mouse_inside
+     && g_slist_length(cache->active_imgs) == g_slist_length(darktable.view_manager->active_images))
+  {
+    // we test active images if mouse outside table
+    gboolean ok = TRUE;
+    if(!dt_ui_thumbtable(darktable.gui->ui)->mouse_inside && cache->active_imgs)
+    {
+      GSList *l1 = cache->active_imgs;
+      GSList *l2 = darktable.view_manager->active_images;
+      while(l1 && l2)
+      {
+        if(GPOINTER_TO_INT(l1->data) != GPOINTER_TO_INT(l2->data))
+        {
+          ok = FALSE;
+          break;
+        }
+        l2 = g_slist_next(l2);
+        l1 = g_slist_next(l1);
+      }
+    }
+    if(ok) return TRUE;
+  }
+  return FALSE;
+}
+
 // cache the list of images to act on during global changes (libs, accels)
 // return TRUE if the cache is updated, FALSE if it's still up to date
 gboolean _cache_update(const gboolean only_visible, const gboolean force, const gboolean ordered)
@@ -104,28 +135,9 @@ gboolean _cache_update(const gboolean only_visible, const gboolean force, const
     cache = &darktable.view_manager->act_on_cache_all;
 
   // if possible, we return the cached list
-  if(!force && cache->ok && cache->image_over == mouseover && cache->ordered == ordered
-     && cache->inside_table == dt_ui_thumbtable(darktable.gui->ui)->mouse_inside
-     && g_slist_length(cache->active_imgs) == g_slist_length(darktable.view_manager->active_images))
+  if(!force && cache->ordered == ordered && _test_cache(cache))
   {
-    // we test active images if mouse outside table
-    gboolean ok = TRUE;
-    if(!dt_ui_thumbtable(darktable.gui->ui)->mouse_inside && cache->active_imgs)
-    {
-      GSList *l1 = cache->active_imgs;
-      GSList *l2 = darktable.view_manager->active_images;
-      while(l1 && l2)
-      {
-        if(GPOINTER_TO_INT(l1->data) != GPOINTER_TO_INT(l2->data))
-        {
-          ok = FALSE;
-          break;
-        }
-        l2 = g_slist_next(l2);
-        l1 = g_slist_next(l1);
-      }
-    }
-    if(ok) return FALSE;
+    return FALSE;
   }
 
   GList *l = NULL;
@@ -389,10 +401,23 @@ int dt_act_on_get_main_image()
 // get only the number of images to act on
 int dt_act_on_get_images_nb(const gboolean only_visible, const gboolean force)
 {
-  // we first update the cache if needed
+  // if the cache is valid (whatever the ordering) we return its value
+  if(!force)
+  {
+    dt_act_on_cache_t *cache;
+    if(only_visible)
+      cache = &darktable.view_manager->act_on_cache_visible;
+    else
+      cache = &darktable.view_manager->act_on_cache_all;
+
+    if(_test_cache(cache)) return cache->images_nb;
+  }
+
+
+  // otherwise we update the cache
   _cache_update(only_visible, force, FALSE);
 
-  // and we return a copy of the cached list
+  // and we return the number of images in cache
   if(only_visible && darktable.view_manager->act_on_cache_visible.ok)
     return darktable.view_manager->act_on_cache_visible.images_nb;
   else if(!only_visible && darktable.view_manager->act_on_cache_all.ok)

diff --git a/src/common/act_on.h b/src/common/act_on.h
@@ -1,6 +1,6 @@
 /*
     This file is part of darktable,
-    Copyright (C) 2009-2021 darktable developers.
+    Copyright (C) 2021 darktable developers.
 
     darktable is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/libs/image.c b/src/libs/image.c
@@ -192,9 +192,9 @@ static void _update(dt_lib_module_t *self)
   dt_lib_image_t *d = (dt_lib_image_t *)self->data;
   const int nbimgs = dt_act_on_get_images_nb(FALSE, FALSE);
 
-  const int act_on_any = (nbimgs > 0);
-  const int act_on_one = (nbimgs == 1);
-  const int act_on_mult = (nbimgs > 1);
+  const gboolean act_on_any = (nbimgs > 0);
+  const gboolean act_on_one = (nbimgs == 1);
+  const gboolean act_on_mult = (nbimgs > 1);
   const uint32_t selected_cnt = dt_collection_get_selected_count(darktable.collection);
   const gboolean can_paste
       = d->imageid > 0 && (act_on_mult || (act_on_one && (d->imageid != dt_act_on_get_main_image())));