diff --git a/brename.py b/brename.py index 57c3f39..970d805 100644 --- a/brename.py +++ b/brename.py @@ -60,7 +60,7 @@ def unicode_normalize(s): def brename(transformation, autoyes=False, do_naturalsort=False, recurse=False): if recurse: - walker = spinal.walk_generator('.', yield_files=True, yield_directories=True) + walker = spinal.walk('.', yield_files=True, yield_directories=True) olds = list(walker) else: olds = cwd.listdir() diff --git a/duplicate_dirs.py b/duplicate_dirs.py index 1e9cb8d..8a0297b 100644 --- a/duplicate_dirs.py +++ b/duplicate_dirs.py @@ -2,7 +2,7 @@ from voussoirkit import spinal basenames = {} -walker = spinal.walk_generator('.', yield_directories=True, yield_files=False) +walker = spinal.walk('.', yield_directories=True, yield_files=False) for directory in walker: basenames.setdefault(directory.basename, []).append(directory) diff --git a/extension_summary.py b/extension_summary.py index 2d18029..fa2a65a 100644 --- a/extension_summary.py +++ b/extension_summary.py @@ -4,7 +4,7 @@ from voussoirkit import spinal counts = collections.Counter() extensions = {} -walker = spinal.walk_generator() +walker = spinal.walk() for file in walker: extensions.setdefault(file.extension, []).append(file) counts[file.extension] += 1 diff --git a/filepull.py b/filepull.py index 0f2341e..1606363 100644 --- a/filepull.py +++ b/filepull.py @@ -9,7 +9,7 @@ from voussoirkit import interactive from voussoirkit import spinal def filepull(pull_from='.', autoyes=False): - files = list(spinal.walk_generator(pull_from)) + files = list(spinal.walk(pull_from)) cwd = os.getcwd() files = [f for f in files if os.path.split(f.absolute_path)[0] != cwd] diff --git a/hash_hardlink.py b/hash_hardlink.py index 4508ead..df42c57 100644 --- a/hash_hardlink.py +++ b/hash_hardlink.py @@ -35,7 +35,7 @@ def hash_hardlink_argparse(args): if path.is_file: files.append(path) elif path.is_dir: - files.extend(spinal.walk_generator(path)) + files.extend(spinal.walk(path)) inodes = set() hashes = {} diff --git a/inputrename.py b/inputrename.py index 3f46375..e97f705 100644 --- a/inputrename.py +++ b/inputrename.py @@ -12,7 +12,7 @@ from voussoirkit import spinal @pipeable.ctrlc_return1 def inputrename_argparse(args): if args.recurse: - files = (file for file in spinal.walk_generator('.') if args.keyword in file.basename) + files = (file for file in spinal.walk('.') if args.keyword in file.basename) else: files = (file for file in pathclass.cwd().listdir() if args.keyword in file.basename) prev = None diff --git a/prune_dirs.py b/prune_dirs.py index 8eba6e4..3a4851e 100644 --- a/prune_dirs.py +++ b/prune_dirs.py @@ -17,7 +17,7 @@ from voussoirkit import pathclass def prune_dirs(starting): starting = pathclass.Path(starting) - walker = spinal.walk_generator(starting, yield_directories=True, yield_files=False) + walker = spinal.walk(starting, yield_directories=True, yield_files=False) double_check = set() diff --git a/prune_shortcuts.py b/prune_shortcuts.py index 471a853..155313e 100644 --- a/prune_shortcuts.py +++ b/prune_shortcuts.py @@ -14,7 +14,7 @@ from voussoirkit import spinal def prune_shortcuts(recurse=False, autoyes=False): if recurse: - lnks = [file for file in spinal.walk_generator('.') if file.extension == 'lnk'] + lnks = [file for file in spinal.walk('.') if file.extension == 'lnk'] else: lnks = pathclass.cwd().glob('*.lnk') diff --git a/search.py b/search.py index 385e4c2..2f65ea4 100644 --- a/search.py +++ b/search.py @@ -165,7 +165,7 @@ def search( terms = {k: [x.lower() for x in v] for (k, v) in terms.items()} if text is None: - search_objects = spinal.walk_generator( + search_objects = spinal.walk( root_path, recurse=not local_only, yield_directories=True,