Stone_Red/dvc
1
0
Fork 0
mirror of https://github.com/Stone-Red-Code/dvc.git synced 2026-11-10 07:18:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

repofs: don't use outs

Browse Source 
Using outs directly breaks isolation and makes it really hard to understand
what's going on.

Redundant abspaths will go away in followups when moving to relpaths.
This commit is contained in:
Ruslan Kuprieiev
2022-02-03 23:33:37 +02:00
parent 8497edab93
commit 48641fb41f
1 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dvc/fs/repo.py
+25 -13
View File
@@ -220,6 +220,8 @@ class RepoFileSystem(FileSystem): # pylint:disable=abstract-method
return dvc_fs.open(path, mode=mode, encoding=encoding, **kwargs)
def exists(self, path) -> bool:
path = os.path.abspath(path)
fs, dvc_fs = self._get_fs_pair(path)
if not dvc_fs:
@@ -231,18 +233,21 @@ class RepoFileSystem(FileSystem): # pylint:disable=abstract-method
if fs.exists(path):
return True
try:
info = dvc_fs.info(path)
except FileNotFoundError:
if not dvc_fs.exists(path):
return False
for out in info["outs"]:
if fs.exists(out.fs_path):
return False
for p in self.path.parents(path):
try:
if fs.info(p)["type"] != "directory":
return False
except FileNotFoundError:
continue
return True
def isdir(self, path): # pylint: disable=arguments-renamed
path = os.path.abspath(path)
fs, dvc_fs = self._get_fs_pair(path)
if dvc_fs and dvc_fs.repo.dvcignore.is_ignored_dir(path):
@@ -263,9 +268,12 @@ class RepoFileSystem(FileSystem): # pylint:disable=abstract-method
except FileNotFoundError:
return False
for out in info["outs"]:
if fs.exists(out.fs_path):
return False
for p in self.path.parents(path):
try:
if fs.info(p)["type"] != "directory":
return False
except FileNotFoundError:
continue
return info["type"] == "directory"
@@ -274,6 +282,8 @@ class RepoFileSystem(FileSystem): # pylint:disable=abstract-method
return dvc_fs is not None and dvc_fs.isdvc(path, **kwargs)
def isfile(self, path): # pylint: disable=arguments-renamed
path = os.path.abspath(path)
fs, dvc_fs = self._get_fs_pair(path)
if dvc_fs and dvc_fs.repo.dvcignore.is_ignored_file(path):
@@ -294,10 +304,12 @@ class RepoFileSystem(FileSystem): # pylint:disable=abstract-method
except FileNotFoundError:
return False
(out,) = info["outs"]
assert len(info["outs"]) == 1
if fs.exists(out.fs_path):
return False
for p in self.path.parents(path):
try:
if fs.info(p)["type"] != "directory":
return False
except FileNotFoundError:
continue
return info["type"] == "file"