From f59a046bbc56e80815429620af960b59009a2427 Mon Sep 17 00:00:00 2001
From: Jannik <jannikw@users.noreply.github.com>
Date: Tue, 26 May 2020 10:42:29 +0200
Subject: [PATCH] Output backup destination path with output command

---
 src/restic_compose_backup/cli.py           |  4 ++--
 src/restic_compose_backup/containers.py    |  9 ++++++++-
 src/restic_compose_backup/containers_db.py | 15 ++++++++++++---
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/restic_compose_backup/cli.py b/src/restic_compose_backup/cli.py
index 9e969fc..7ac85c5 100644
--- a/src/restic_compose_backup/cli.py
+++ b/src/restic_compose_backup/cli.py
@@ -91,12 +91,12 @@ def status(config, containers):
 
         if container.volume_backup_enabled:
             for mount in container.filter_mounts():
-                logger.info(' - volume: %s', mount.source)
+                logger.info(' - volume: %s -> %s', mount.source, container.get_volume_backup_destination(mount, '/volumes'))
 
         if container.database_backup_enabled:
             instance = container.instance
             ping = instance.ping()
-            logger.info(' - %s (is_ready=%s)', instance.container_type, ping == 0)
+            logger.info(' - %s (is_ready=%s) -> %s', instance.container_type, ping == 0, instance.backup_destination_path())
             if ping != 0:
                 logger.error("Database '%s' in service %s cannot be reached",
                              instance.container_type, container.service_name)
diff --git a/src/restic_compose_backup/containers.py b/src/restic_compose_backup/containers.py
index fbc2049..f5ce4d7 100644
--- a/src/restic_compose_backup/containers.py
+++ b/src/restic_compose_backup/containers.py
@@ -224,12 +224,15 @@ class Container:
         volumes = {}
         for mount in mounts:
             volumes[mount.source] = {
-                'bind': str(Path(source_prefix) / self.service_name / Path(utils.strip_root(mount.destination))),
+                'bind': self.get_volume_backup_destination(mount, source_prefix),
                 'mode': mode,
             }
 
         return volumes
 
+    def get_volume_backup_destination(self, mount, source_prefix) -> str:
+        return str(Path(source_prefix) / self.service_name / Path(utils.strip_root(mount.destination)))
+
     def get_credentials(self) -> dict:
         """dict: get credentials for the service"""
         raise NotImplementedError("Base container class don't implement this")
@@ -242,6 +245,10 @@ class Container:
         """Back up this service"""
         raise NotImplementedError("Base container class don't implement this")
 
+    def backup_destination_path(self) -> str:
+        """Return the path backups will be saved at"""
+        raise NotImplementedError("Base container class don't implement this")
+
     def dump_command(self) -> list:
         """list: create a dump command restic and use to send data through stdin"""
         raise NotImplementedError("Base container class don't implement this")
diff --git a/src/restic_compose_backup/containers_db.py b/src/restic_compose_backup/containers_db.py
index 5ad3ce0..156273d 100644
--- a/src/restic_compose_backup/containers_db.py
+++ b/src/restic_compose_backup/containers_db.py
@@ -48,10 +48,13 @@ class MariadbContainer(Container):
         with utils.environment('MYSQL_PWD', creds['password']):
             return restic.backup_from_stdin(
                 config.repository,
-                f'/databases/{self.service_name}/all_databases.sql',
+                self.backup_destination_path(),
                 self.dump_command(),
             )
 
+    def backup_destination_path(self) -> str:
+        return f'/databases/{self.service_name}/all_databases.sql'
+
 
 class MysqlContainer(Container):
     container_type = 'mysql'
@@ -94,10 +97,13 @@ class MysqlContainer(Container):
         with utils.environment('MYSQL_PWD', creds['password']):
             return restic.backup_from_stdin(
                 config.repository,
-                f'/databases/{self.service_name}/all_databases.sql',
+                self.backup_destination_path(),
                 self.dump_command(),
             )
 
+    def backup_destination_path(self) -> str:
+        return f'/databases/{self.service_name}/all_databases.sql'
+
 
 class PostgresContainer(Container):
     container_type = 'postgres'
@@ -141,6 +147,9 @@ class PostgresContainer(Container):
         with utils.environment('PGPASSWORD', creds['password']):
             return restic.backup_from_stdin(
                 config.repository,
-                f"/databases/{self.service_name}/{creds['database']}.sql",
+                self.backup_destination_path(),
                 self.dump_command(),
             )
+
+    def backup_destination_path(self) -> str:
+        return f"/databases/{self.service_name}/{self.get_credentials()['database']}.sql"