From 9e033b5dfdeb39b231c3b456b89bcacd58963df8 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Mon, 15 Apr 2024 17:33:48 +0200 Subject: [PATCH] Changing names of default CSV files. --- .gitignore | 1 + lib/pp_admintools/app/get_from_addr.py | 12 +++++------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index d00cfa6..531bb82 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ tmp/* venv/* etc/*.ini get-from-addr-totals.yaml +get-from-addr-per-*.csv diff --git a/lib/pp_admintools/app/get_from_addr.py b/lib/pp_admintools/app/get_from_addr.py index eab96be..254f1e3 100644 --- a/lib/pp_admintools/app/get_from_addr.py +++ b/lib/pp_admintools/app/get_from_addr.py @@ -49,8 +49,8 @@ class GetFromAddressesApp(BaseDPXApplication): default_limit = 10 default_totals_yaml_file = Path('get-from-addr-totals.yaml') - default_stats_per_address_csv_file = Path('get-from-addr-per-address-{loghost}.csv') - default_stats_per_domain_csv_file = Path('get-from-addr-per-domain-{loghost}.csv') + default_stats_per_address_csv_file = Path('get-from-addr-per-address.csv') + default_stats_per_domain_csv_file = Path('get-from-addr-per-domain.csv') re_mail_domain = re.compile(r'.*@') @@ -147,8 +147,7 @@ class GetFromAddressesApp(BaseDPXApplication): action=OutputFileOptionAction, help=_( 'The output CSV file about found FROM addresses for importing in a spread sheet ' - 'or into a database. The file name may have the tag {{loghost}}, which will be ' - 'substituted with the hostname of the mailserver. Default: {!r}').format( + 'or into a database. Default: {!r}').format( str(self.stats_per_address_csv_file)) ) @@ -157,9 +156,8 @@ class GetFromAddressesApp(BaseDPXApplication): action=OutputFileOptionAction, help=_( 'The output CSV file about the domains of found FROM addresses for importing ' - 'in a spread sheet or into a database. The file name may have the tag ' - '{{loghost}}, which will be substituted with the hostname of the mailserver. ' - 'Default: {!r}').format(str(self.stats_per_domain_csv_file)) + 'in a spread sheet or into a database. Default: {!r}').format( + str(self.stats_per_domain_csv_file)) ) logfiles_default = str(self.logdir / self.logfile_pattern) -- 2.39.5