From 32822d50bd317a23ad37298ec80fda2bc0ff4239 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Sun, 26 Nov 2017 15:24:04 +0200 Subject: [PATCH] data_item: generalize state files Signed-off-by: Ruslan Kuprieiev --- dvc/path/data_item.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dvc/path/data_item.py b/dvc/path/data_item.py index 47cbe5006..8b0f0e41c 100644 --- a/dvc/path/data_item.py +++ b/dvc/path/data_item.py @@ -76,10 +76,13 @@ class DataItem(object): def state_dir(self): return os.path.join(self._git.git_dir_abs, self._config.state_dir) + def _state(self, suffix): + state_file = os.path.join(self.state_dir, self.data.dvc + suffix) + return Path(state_file, self._git) + @cached_property def state(self): - state_file = os.path.join(self.state_dir, self.data.dvc + self.STATE_FILE_SUFFIX) - return Path(state_file, self._git) + return self._state(self.STATE_FILE_SUFFIX) @cached_property def cache_dir_abs(self): @@ -87,13 +90,11 @@ class DataItem(object): @cached_property def local_state(self): - local_state_file = os.path.join(self.state_dir, self.data.dvc + self.LOCAL_STATE_FILE_SUFFIX) - return Path(local_state_file, self._git) + return self._state(self.LOCAL_STATE_FILE_SUFFIX) @cached_property def cache_state(self): - cache_state_file = os.path.join(self.state_dir, self.data.dvc + self.CACHE_STATE_FILE_SUFFIX) - return Path(cache_state_file, self._git) + return self._state(self.CACHE_STATE_FILE_SUFFIX) @cached_property def cache_dir(self):