removed individual action parameters, and used make_flags_from_arguments

Signed-off-by: Chirag Aggarwal <thechiragaggarwal@gmail.com>

borgmatic/actions/mount.py

@@ -31,10 +31,6 @@ def run_mount(
                 local_path,
                 remote_path,
             ),
-            mount_arguments.mount_point,
-            mount_arguments.paths,
-            mount_arguments.foreground,
-            mount_arguments.options,
             mount_arguments,
             storage,
             local_borg_version,

borgmatic/actions/prune.py

@@ -47,8 +47,6 @@ def run_prune(
         prune_arguments,
         local_path=local_path,
         remote_path=remote_path,
-        stats=prune_arguments.stats,
-        list_archives=prune_arguments.list_archives,
     )
     borgmatic.hooks.command.execute_hook(
         hooks.get('after_prune'),

borgmatic/borg/mount.py

@@ -9,10 +9,6 @@ logger = logging.getLogger(__name__)
 def mount_archive(
     repository,
     archive,
-    mount_point,
-    paths,
-    foreground,
-    options,
     mount_arguments,
     storage_config,
     local_borg_version,
@@ -35,14 +31,13 @@ def mount_archive(
         + (('--lock-wait', str(lock_wait)) if lock_wait else ())
         + (('--info',) if logger.getEffectiveLevel() == logging.INFO else ())
         + (('--debug', '--show-rc') if logger.isEnabledFor(logging.DEBUG) else ())
-        + (('--foreground',) if foreground else ())
-        + (flags.make_flags('first', mount_arguments.first) if mount_arguments.first else ())
-        + (flags.make_flags('last', mount_arguments.last) if mount_arguments.last else ())
-        + (flags.make_flags('newest', mount_arguments.newest) if mount_arguments.newest else ())
-        + (flags.make_flags('oldest', mount_arguments.oldest) if mount_arguments.oldest else ())
-        + (flags.make_flags('older', mount_arguments.older) if mount_arguments.older else ())
-        + (flags.make_flags('newer', mount_arguments.newer) if mount_arguments.newer else ())
-        + (('-o', options) if options else ())
+        
+        + flags.make_flags_from_arguments(
+            mount_arguments,
+            excludes=('repository', 'archive', 'mount_point', 'path', 'options'),
+        )
+
+        + (('-o', mount_arguments.options) if mount_arguments.options else ())
         + (
             (
                 flags.make_repository_flags(repository, local_borg_version)
@@ -59,14 +54,14 @@ def mount_archive(
                 else flags.make_repository_flags(repository, local_borg_version)
             )
         )
-        + (mount_point,)
-        + (tuple(paths) if paths else ())
+        + (mount_arguments.mount_point,)
+        + (tuple(mount_arguments.paths) if mount_arguments.paths else ())
     )
 
     borg_environment = environment.make_environment(storage_config)
 
     # Don't capture the output when foreground mode is used so that ctrl-C can work properly.
-    if foreground:
+    if mount_arguments.foreground:
         execute_command(
             full_command,
             output_file=DO_NOT_CAPTURE,

borgmatic/borg/prune.py

@@ -46,8 +46,6 @@ def prune_archives(
     prune_arguments,
     local_path='borg',
     remote_path=None,
-    stats=False,
-    list_archives=False,
 ):
     '''
     Given dry-run flag, a local or remote repository path, a storage config dict, and a
@@ -69,20 +67,21 @@ def prune_archives(
         + (('--remote-path', remote_path) if remote_path else ())
         + (('--umask', str(umask)) if umask else ())
         + (('--lock-wait', str(lock_wait)) if lock_wait else ())
-        + (('--stats',) if stats and not dry_run else ())
+        + (('--stats',) if prune_arguments.stats and not dry_run else ())
         + (('--info',) if logger.getEffectiveLevel() == logging.INFO else ())
-        + (('--list',) if list_archives else ())
-        + (flags.make_flags('newest', prune_arguments.newest) if prune_arguments.newest else ())
-        + (flags.make_flags('oldest', prune_arguments.oldest) if prune_arguments.oldest else ())
-        + (flags.make_flags('older', prune_arguments.older) if prune_arguments.older else ())
-        + (flags.make_flags('newer', prune_arguments.newer) if prune_arguments.newer else ())
+        
+        + flags.make_flags_from_arguments(
+            prune_arguments,
+            excludes=('repository', 'stats'),
+        )
+
         + (('--debug', '--show-rc') if logger.isEnabledFor(logging.DEBUG) else ())
-        + (('--dry-run',) if dry_run else ())
+
         + (tuple(extra_borg_options.split(' ')) if extra_borg_options else ())
         + flags.make_repository_flags(repository, local_borg_version)
     )
 
-    if stats or list_archives:
+    if prune_arguments.stats or prune_arguments.list_archives:
         output_log_level = logging.ANSWER
     else:
         output_log_level = logging.INFO