From 16a0844c57c7de23cecb7995bb995ccabee3d7b3 Mon Sep 17 00:00:00 2001 From: Vincent Bidolet Date: Mon, 13 Nov 2023 17:19:50 +0100 Subject: [PATCH] adding *better* filtering --- main.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/main.py b/main.py index 315b042..27ad3b9 100644 --- a/main.py +++ b/main.py @@ -198,12 +198,6 @@ def backup_services(servicename: str, servicesdict: dict, composefilepath: str) if len(servicesdict[servicename]["must_before"]): for dependencie in servicesdict[servicename]["must_before"]: - if arguments.bindexclude not in ("", None) and dependencie.find(arguments.bindexclude) != -1: - # on a un filtre d'exclusion et il matche, donc on ne backup pas - continue - elif arguments.bindinclude not in ("", None) and dependencie.find(arguments.bindinclude) != -1: - #on a un filtre d'inclusion et il ne matche pas, donc on ne backup pas - continue backup_services(dependencie, servicesdict, composefilepath) # TODO: faire la sauvegarde @@ -212,8 +206,17 @@ def backup_services(servicename: str, servicesdict: dict, composefilepath: str) if "Binds" in container.attrs["HostConfig"] and len(container.attrs["HostConfig"]["Binds"]): for bind in container.attrs["HostConfig"]["Binds"]: bindpath = bind.split(":")[0] - print(f" backup of {bindpath}") - restic_backup(dirpath=bindpath, tagslist=[servicename]) + if arguments.bindexclude not in ("", None) and dependencie.find( + arguments.bindexclude) != -1: + # on a un filtre d'exclusion et il matche, donc on ne backup pas + pass + elif arguments.bindinclude not in ("", None) and dependencie.find( + arguments.bindinclude) != -1: + # on a un filtre d'inclusion et il ne matche pas, donc on ne backup pas + pass + else: + print(f" backup of {bindpath}") + restic_backup(dirpath=bindpath, tagslist=[servicename]) for containerindex in range(0, len(containersid)): if containerrunning[containerindex]: