public inbox for pmg-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Csapak <d.csapak@proxmox.com>
To: pmg-devel@lists.proxmox.com
Subject: [pmg-devel] [PATCH pmg-api 12/12] pmgdb: extend dump output to include add/invert
Date: Fri,  9 Feb 2024 13:54:36 +0100	[thread overview]
Message-ID: <20240209125440.2572239-13-d.csapak@proxmox.com> (raw)
In-Reply-To: <20240209125440.2572239-1-d.csapak@proxmox.com>

if a group type has and/invert set, add a line with that information
and for each object group add its mode too in parenthesis

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 src/PMG/CLI/pmgdb.pm | 38 ++++++++++++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/PMG/CLI/pmgdb.pm b/src/PMG/CLI/pmgdb.pm
index 8368af8..cd94c23 100644
--- a/src/PMG/CLI/pmgdb.pm
+++ b/src/PMG/CLI/pmgdb.pm
@@ -40,6 +40,8 @@ sub print_objects {
 sub print_rule {
     my ($ruledb, $rule) = @_;
 
+    $ruledb->load_rule_attributes($rule);
+
     my $direction = {
 	0 => 'in',
 	1 => 'out',
@@ -52,26 +54,50 @@ sub print_rule {
     print "Found RULE $rule->{id} (prio: $rule->{priority}, $dir, $active): $rulename\n";
 
     my $print_group = sub {
-	my ($type, $og) = @_;
+	my ($type, $og, $print_mode) = @_;
 	my $oname = encode('UTF-8', $og->{name});
-	print "  FOUND $type GROUP $og->{id}: $oname\n";
+	my $mode = "";
+	if ($print_mode) {
+	    my $and = $og->{and} // 0;
+	    my $invert = $og->{invert} // 0;
+	    $mode = " (and=$and, invert=$invert)";
+	}
+	print "  FOUND $type GROUP $og->{id}${mode}: $oname\n";
 	print_objects($ruledb, $og);
     };
 
+    my $print_type_mode = sub {
+	my ($type) = @_;
+	my $and = $rule->{"$type-and"};
+	my $invert = $rule->{"$type-invert"};
+	if (defined($and) || defined($invert)) {
+	    my $print_type = uc($type);
+	    print "  $print_type mode: and=" . ($and // 0) . " invert=". ($invert // 0) . "\n";
+	}
+    };
+
     my ($from, $to, $when, $what, $action) =
 	$ruledb->load_groups($rule);
 
+    $print_type_mode->("from") if scalar(@$from);
     foreach my $og (@$from) {
-	$print_group->("FROM", $og);
+	$ruledb->load_group_attributes($og);
+	$print_group->("FROM", $og, 1);
     }
+    $print_type_mode->("to") if scalar(@$to);
     foreach my $og (@$to) {
-	$print_group->("TO", $og);
+	$ruledb->load_group_attributes($og);
+	$print_group->("TO", $og, 1);
     }
+    $print_type_mode->("when") if scalar(@$when);
     foreach my $og (@$when) {
-	$print_group->("WHEN", $og);
+	$ruledb->load_group_attributes($og);
+	$print_group->("WHEN", $og, 1);
     }
+    $print_type_mode->("what") if scalar(@$what);
     foreach my $og (@$what) {
-	$print_group->("WHAT", $og);
+	$ruledb->load_group_attributes($og);
+	$print_group->("WHAT", $og, 1);
     }
     foreach my $og (@$action) {
 	$print_group->("ACTION", $og);
-- 
2.30.2





  parent reply	other threads:[~2024-02-09 12:55 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-09 12:54 [pmg-devel] [PATCH pmg-api/docs/gui] implement and combination and inversion of groups and objects Dominik Csapak
2024-02-09 12:54 ` [pmg-devel] [PATCH pmg-api 01/12] RuleCache: remove unnecessary copying of marks Dominik Csapak
2024-02-20 14:42   ` [pmg-devel] applied: " Stoiko Ivanov
2024-02-09 12:54 ` [pmg-devel] [PATCH pmg-api 02/12] RuleCache: reorganize to keep group structure Dominik Csapak
2024-02-20 14:45   ` [pmg-devel] applied: " Stoiko Ivanov
2024-02-09 12:54 ` [pmg-devel] [PATCH pmg-api 03/12] RuleCache: reorganize how we gather marks and spaminfo Dominik Csapak
2024-02-20 11:10   ` Stoiko Ivanov
2024-02-09 12:54 ` [pmg-devel] [PATCH pmg-api 04/12] api: refactor rule parameters Dominik Csapak
2024-02-20 11:49   ` Stoiko Ivanov
2024-02-09 12:54 ` [pmg-devel] [PATCH pmg-api 05/12] add objectgroup attributes and/invert Dominik Csapak
2024-02-20 12:35   ` Stoiko Ivanov
2024-02-20 12:47   ` Stoiko Ivanov
2024-02-09 12:54 ` [pmg-devel] [PATCH pmg-api 06/12] add rule attributes and/invert (for each relevant type) Dominik Csapak
2024-02-20 13:03   ` Stoiko Ivanov
2024-02-09 12:54 ` [pmg-devel] [PATCH pmg-api 07/12] RuleCache: load rule/objectgroup attributes from database Dominik Csapak
2024-02-20 13:18   ` Stoiko Ivanov
2024-02-09 12:54 ` [pmg-devel] [PATCH pmg-api 08/12] RuleCache: implement and/invert for when/from/to Dominik Csapak
2024-02-20 13:09   ` Stoiko Ivanov
2024-02-09 12:54 ` [pmg-devel] [PATCH pmg-api 09/12] MailQueue: return maximum AID Dominik Csapak
2024-02-20 13:20   ` Stoiko Ivanov
2024-02-09 12:54 ` [pmg-devel] [PATCH pmg-api 10/12] WIP: ModGroup: add possibility to explode to all targets Dominik Csapak
2024-02-09 12:54 ` [pmg-devel] [PATCH pmg-api 11/12] RuleCache: implement and/invert for what matches Dominik Csapak
2024-02-09 12:54 ` Dominik Csapak [this message]
2024-02-09 12:54 ` [pmg-devel] [PATCH pmg-docs 1/2] rule system: add a small section about matching rules Dominik Csapak
2024-02-20 14:47   ` [pmg-devel] applied: " Stoiko Ivanov
2024-02-09 12:54 ` [pmg-devel] [PATCH pmg-docs 2/2] rule system: explain new and mode and invert flag Dominik Csapak
2024-02-20 14:40   ` Stoiko Ivanov
2024-02-09 12:54 ` [pmg-devel] [PATCH pmg-gui 1/2] rules: use tree panel instead of grouping feature of the grid Dominik Csapak
2024-02-09 12:54 ` [pmg-devel] [PATCH pmg-gui 2/2] rules/objects: add mode selector dropdown Dominik Csapak

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240209125440.2572239-13-d.csapak@proxmox.com \
    --to=d.csapak@proxmox.com \
    --cc=pmg-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal