From e681030c72e8393f5f911c3ae5be1fcaea0dbfd3 Mon Sep 17 00:00:00 2001 From: Ronan Lamy Date: Tue, 23 Aug 2022 12:57:29 +0100 Subject: [PATCH] fs: simplify filtering out dvcfiles --- dvc/fs/dvc.py | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dvc/fs/dvc.py b/dvc/fs/dvc.py index 90994d142..6cc6c44d8 100644 --- a/dvc/fs/dvc.py +++ b/dvc/fs/dvc.py @@ -34,6 +34,14 @@ def _wrap_walk(dvc_fs, *args, **kwargs): yield dvc_fs.path.join(dvc_fs.repo.root_dir, root), dnames, fnames +# NOT the same as dvc.dvcfile.is_dvc_file()! +def _is_dvc_file(fname): + from dvc.dvcfile import is_valid_filename + from dvc.ignore import DvcIgnore + + return is_valid_filename(fname) or fname == DvcIgnore.DVCIGNORE_FILE + + def _ls(fs, path): dnames = [] fnames = [] @@ -353,19 +361,8 @@ class _DvcFileSystem(AbstractFileSystem): # pylint:disable=abstract-method pass dvcfiles = kwargs.get("dvcfiles", False) - - def _func(fname): - from dvc.dvcfile import is_valid_filename - from dvc.ignore import DvcIgnore - - if dvcfiles: - return True - - return not ( - is_valid_filename(fname) or fname == DvcIgnore.DVCIGNORE_FILE - ) - - names = filter(_func, names) + if not dvcfiles: + names = (name for name in names if not _is_dvc_file(name)) infos = [] paths = []