Skip to content

Update folder images count on whole hierarchy. #21331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TurboGit wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update folder images count on whole hierarchy. #21331

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e6dc13
Minor code clean-up.
TurboGit Jun 16, 2026
982f0be
Update folder count images on whole hierarchy.
TurboGit Jun 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 46 additions & 25 deletions src/libs/collect.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@ static gboolean view_onButtonPressed(GtkWidget *treeview,
if(get_path && dt_modifier_is(event->state, GDK_SHIFT_MASK)
&& gtk_tree_selection_count_selected_rows(selection) > 0
&& (d->view_rule == DT_COLLECTION_PROP_DAY
|| d->view_rule == DT_COLLECTION_PROP_MONTH
|| d->view_rule == DT_COLLECTION_PROP_MONTH
|| _is_time_property(d->view_rule)
|| d->view_rule == DT_COLLECTION_PROP_APERTURE
|| d->view_rule == DT_COLLECTION_PROP_FOCAL_LENGTH
Expand Down Expand Up @@ -1381,6 +1381,25 @@ static void _expand_select_tree_path(GtkTreePath *path1,

static const char *UNCATEGORIZED_TAG = N_("uncategorized");

static void _update_parent_count(GtkTreeModel *model,
GtkTreeIter *iter,
const int count)
{
GtkTreeIter parent = *iter;
GtkTreeIter child;
guint parentcount;

do
{
gtk_tree_model_get(model, &parent,
DT_LIB_COLLECT_COL_COUNT, &parentcount, -1);

gtk_tree_store_set(GTK_TREE_STORE(model), &parent,
DT_LIB_COLLECT_COL_COUNT, parentcount + count, -1);
child = parent;
} while (gtk_tree_model_iter_parent(model, &parent, &child));
}

static void _tree_view(dt_lib_collect_rule_t *dr)
{
// update related list
Expand Down Expand Up @@ -1673,6 +1692,7 @@ static void _tree_view(dt_lib_collect_rule_t *dr)
char *name = tuple->name;
const int count = tuple->count;
const int status = tuple->status;

if(name == NULL) continue; // safeguard against degenerated db entries

// this is just for tags
Expand Down Expand Up @@ -1727,7 +1747,8 @@ static void _tree_view(dt_lib_collect_rule_t *dr)

if(tokens != NULL)
{
// find the number of common parts at the beginning of tokens and last_tokens
// find the number of common parts at the beginning of tokens and
// last_tokens
GtkTreeIter parent = last_parent;
const int tokens_length = string_array_length(tokens);
int common_length = 0;
Expand All @@ -1739,7 +1760,6 @@ static void _tree_view(dt_lib_collect_rule_t *dr)
{
common_length++;
}

// point parent iter to where the entries should be added
for(int i = common_length; i < last_tokens_length; i++)
{
Expand All @@ -1757,6 +1777,14 @@ static void _tree_view(dt_lib_collect_rule_t *dr)
for(int i = 0; i < common_length; i++)
dt_util_str_cat(&pth, format_separator, tokens[i]);

// if we are at the end of the path, and this is a folder, we need to
// add the count to all parents.
if(!tokens[common_length]
&& property == DT_COLLECTION_PROP_FOLDERS)
{
_update_parent_count(model, &parent, count);
}

for(char **token = &tokens[common_length]; *token; token++)
{
GtkTreeIter iter;
Expand All @@ -1776,19 +1804,12 @@ static void _tree_view(dt_lib_collect_rule_t *dr)
index++;
// also add the item count to parents
if((property == DT_COLLECTION_PROP_DAY
|| property == DT_COLLECTION_PROP_FOLDERS

@zisoft zisoft Jun 17, 2026 •
edited
Loading

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add

|| property == DT_COLLECTION_PROP_TAG

here and is works for tags, too.

@TurboGit TurboGit Jun 17, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zisoft : Yes, that's what I have done locally and it works BUT we have an issue with the counting.

  • Select one image
  • Add tag "one"
  • Add tag "one|two"
  • Add tag "one|two|three"

Look for one in tag collection and select it.

  • On lighttable a single image displayed : GOOD
  • The count on top bar says 1 : GOOD
  • On the tag collection you have 2/2/1 : WRONG
- one (2)
   - two (2)
      - three (1)

@TurboGit TurboGit Jun 17, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zisoft
And this is hard to solve. For a folder we have a single image per folder, but here we have multiple tag on the same image. A solution would be to temporary have a map with already added image for each tag... Something I'd like to avoid as this extra complexity is not welcomed here. Any other idea?

@zisoft zisoft Jun 17, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@TurboGit
you are right, that might get complicated.
I would suggest to merge the folder part, so we can continue on that base without hurry.

|| _is_time_property(property)) && !*(token + 1))
{
guint parentcount;
GtkTreeIter parent2, child = iter;

while(gtk_tree_model_iter_parent(model, &parent2, &child))
{
gtk_tree_model_get(model, &parent2,
DT_LIB_COLLECT_COL_COUNT, &parentcount, -1);
gtk_tree_store_set(GTK_TREE_STORE(model), &parent2,
DT_LIB_COLLECT_COL_COUNT, count + parentcount, -1);
child = parent2;
}
GtkTreeIter p;
gtk_tree_model_iter_parent(model, &p, &iter);

@zisoft zisoft Jun 17, 2026 •
edited
Loading

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you need to check for success here, otherwise gtk crashes if the node has no parent.

if(gtk_tree_model_iter_parent(model, &p, &iter))
  _update_parent_count(model, &p, count);

_update_parent_count(model, &p, count);
}

common_length++;
Expand Down Expand Up @@ -2328,7 +2349,7 @@ static void _list_view(dt_lib_collect_rule_t *dr)
if(strlen(query) > 0)
{
DT_DEBUG_SQLITE3_PREPARE_V2(dt_database_get(darktable.db), query, -1, &stmt, NULL);

GList *rows = NULL;

while(sqlite3_step(stmt) == SQLITE_ROW)
Expand Down Expand Up @@ -2438,11 +2459,11 @@ static void _list_view(dt_lib_collect_rule_t *dr)
{
const gboolean sort_by_import_time =
dt_conf_is_equal("plugins/collect/filmroll_sort", "import time");
const gboolean sort_by_folder_name =
const gboolean sort_by_folder_name =
dt_conf_is_equal("plugins/collect/filmroll_sort", "folder name");

if(sort_by_import_time)
{
{
rows = g_list_sort(rows, _sort_filmroll_by_id);
}
else if(sort_by_folder_name)
Expand All @@ -2453,21 +2474,21 @@ static void _list_view(dt_lib_collect_rule_t *dr)
{
rows = g_list_sort(rows, _sort_filmroll_by_display_name);
}

if(sort_descending)
rows = g_list_reverse(rows);

for(GList *l = rows; l; l = l->next)
{
filmroll_row_t *r = l->data;

gchar *text = g_strdup(r->value);
gchar *ptr = text;
while(!g_utf8_validate(ptr, -1, (const gchar **)&ptr))
ptr[0] = '?';

gchar *escaped_text = g_markup_escape_text(text, -1);

gtk_list_store_insert_with_values(GTK_LIST_STORE(model), NULL, -1,
DT_LIB_COLLECT_COL_TEXT, r->folder,
DT_LIB_COLLECT_COL_ID, r->id,
Expand All @@ -2477,14 +2498,14 @@ static void _list_view(dt_lib_collect_rule_t *dr)
DT_LIB_COLLECT_COL_COUNT, r->count,
DT_LIB_COLLECT_COL_UNREACHABLE, r->status,
-1);

g_free(text);
g_free(escaped_text);
g_free(r->folder);
g_free(r->value);
g_free(r);
}

g_list_free(rows);
rows = NULL;
}
Expand Down
Loading