From 782df25bee8d2e8b929fb75924cb8ca0951749f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krist=C3=B3f=20T=C3=B3th?= Date: Mon, 6 Aug 2018 13:40:16 +0200 Subject: [PATCH] =?UTF-8?q?Fix=20broken=20init=5Fgit=5Fdir=20logic=20?= =?UTF-8?q?=F0=9F=90=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../directory_snapshotting_event_handler.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/lib/tfw/components/directory_snapshotting_event_handler.py b/lib/tfw/components/directory_snapshotting_event_handler.py index 3d50315..246bb60 100644 --- a/lib/tfw/components/directory_snapshotting_event_handler.py +++ b/lib/tfw/components/directory_snapshotting_event_handler.py @@ -4,8 +4,6 @@ from os.path import join as joinpath from os.path import basename from os import makedirs -from uuid import uuid4 -from glob import glob from dateutil import parser as dateparser @@ -29,19 +27,16 @@ class DirectorySnapshottingEventHandler(EventHandlerBase): } def init_snapshot_providers(self, directories): - for directory in directories: - git_dir = self.init_git_dir(directory) + for index, directory in enumerate(directories): + git_dir = self.init_git_dir(index, directory) self.snapshot_providers[directory] = SnapshotProvider(directory, git_dir) @staticmethod - def init_git_dir(directory): - git_dir_prefix = joinpath( + def init_git_dir(index, directory): + git_dir = joinpath( TFWENV.SNAPSHOTS_DIR, - f'{basename(directory)}-' + f'{basename(directory)}-{index}' ) - potential_dirs = glob(f'{git_dir_prefix}*') - - git_dir = potential_dirs[0] if potential_dirs else f'{git_dir_prefix}{str(uuid4())}' makedirs(git_dir, exist_ok=True) return git_dir