github/DeepFaceLab
1
0
Fork 0
mirror of https://github.com/iperov/DeepFaceLab.git synced 2025-07-06 21:12:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix sorting pathlib objects (#353)

Browse source 
Fixing an issue caused by attempting to sort Path objects. Directly using `<` is unsupported between these, so `sorted()` needs a key specified. 

"PurePath" objects support `>` while normal paths do not, causing the confusion. 
https://docs.python.org/3/library/pathlib.html
This commit is contained in:
Auroir 2019-08-17 21:01:44 -07:00 • committed by iperov
parent a906f24a4d
commit e7562054d0
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
utils/Path_utils.py
View file

@ -31,19 +31,18 @@ def get_image_unique_filestem_paths(dir_path, verbose_print_func=None):
def get_file_paths(dir_path): def get_file_paths(dir_path):
dir_path = Path (dir_path) dir_path = Path (dir_path)
result = []
if dir_path.exists(): if dir_path.exists():
return [ x.path for x in list(scandir(str(dir_path))) if x.is_file() ] return sorted([ x.path for x in list(scandir(str(dir_path))) if x.is_file() ])
return sorted(result) else:
return []
def get_all_dir_names (dir_path): def get_all_dir_names (dir_path):
dir_path = Path (dir_path) dir_path = Path (dir_path)
result = []
if dir_path.exists(): if dir_path.exists():
return [ x.name for x in list(scandir(str(dir_path))) if x.is_dir() ] return sorted([ x.name for x in list(scandir(str(dir_path))) if x.is_dir() ])
else:
return sorted(result) return []
def get_all_dir_names_startswith (dir_path, startswith): def get_all_dir_names_startswith (dir_path, startswith):
dir_path = Path (dir_path) dir_path = Path (dir_path)
@ -61,7 +60,7 @@ def get_first_file_by_stem (dir_path, stem, exts=None):
stem = stem.lower() stem = stem.lower()
if dir_path.exists(): if dir_path.exists():
for x in sorted(list(scandir(str(dir_path)))): for x in sorted(list(scandir(str(dir_path))), key=lambda x: x.name):
if not x.is_file(): if not x.is_file():
continue continue
xp = Path(x.path) xp = Path(x.path)