From fca97123e3641bf2c70585d8fbffe9d4fe58407e Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 17 Dec 2023 14:23:28 +0100 Subject: [PATCH] Debug: added rule counts for account/folder --- app/src/main/java/eu/faircode/email/DaoRule.java | 8 ++++++-- app/src/main/java/eu/faircode/email/DebugHelper.java | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/DaoRule.java b/app/src/main/java/eu/faircode/email/DaoRule.java index e68cb5f9bc..1085a75679 100644 --- a/app/src/main/java/eu/faircode/email/DaoRule.java +++ b/app/src/main/java/eu/faircode/email/DaoRule.java @@ -67,8 +67,12 @@ public interface DaoRule { " ORDER by `group` COLLATE NOCASE") List getGroups(); - @Query("SELECT COUNT(*) FROM rule") - int countTotal(); + @Query("SELECT COUNT(*) FROM rule" + + " JOIN folder ON folder.id = rule.folder" + + " WHERE (:account IS NULL OR folder.account = :account)" + + " AND (:folder IS NULL OR folder.id = :folder)" + + " AND rule.enabled") + int countTotal(Long account, Long folder); @Insert long insertRule(EntityRule rule); diff --git a/app/src/main/java/eu/faircode/email/DebugHelper.java b/app/src/main/java/eu/faircode/email/DebugHelper.java index c6826ff403..c28a18568f 100644 --- a/app/src/main/java/eu/faircode/email/DebugHelper.java +++ b/app/src/main/java/eu/faircode/email/DebugHelper.java @@ -728,7 +728,7 @@ public class DebugHelper { "accounts=" + accounts.size() + " folders=" + db.folder().countSync() + "/" + db.folder().countTotal() + " messages=" + db.message().countTotal() + - " rules=" + db.rule().countTotal() + + " rules=" + db.rule().countTotal(null, null) + " ops=" + db.operation().getOperationCount() + " outbox=" + db.message().countOutbox() + "\r\n" + "filter " + filters + " " + sorts + @@ -830,6 +830,7 @@ public class DebugHelper { " ondemand=" + account.ondemand + (account.ondemand ? " !!!" : "") + " msgs=" + content + "/" + messages + " max=" + account.max_messages + " blocked=" + blocked + (blocked == 0 ? "" : " !!!") + + " rules=" + db.rule().countTotal(account.id, null) + " ops=" + db.operation().getOperationCount(account.id) + " schedule=" + (!ignore_schedule) + (ignore_schedule ? " !!!" : "") + " unmetered=" + unmetered + (unmetered ? " !!!" : "") + @@ -856,6 +857,7 @@ public class DebugHelper { " factor=" + folder.poll_factor + " days=" + getDays(folder.sync_days) + "/" + getDays(folder.keep_days) + " msgs=" + folder.content + "/" + folder.messages + "/" + folder.total + + " rules=" + db.rule().countTotal(account.id, folder.id) + " ops=" + db.operation().getOperationCount(folder.id, null) + " unseen=" + unseen + " hidden=" + hidden + " notifying=" + notifying + " " + folder.state +