From f3f93f747aa1d293b5c293cc78c391ee79e2528d Mon Sep 17 00:00:00 2001 From: Roland Date: Thu, 9 Feb 2023 11:56:47 -0700 Subject: [PATCH] Ignoring lost+found directory. --- wrolpi/files/lib.py | 6 ++++++ wrolpi/files/test/test_api.py | 1 + 2 files changed, 7 insertions(+) diff --git a/wrolpi/files/lib.py b/wrolpi/files/lib.py index 81c65c94..55b4b10b 100644 --- a/wrolpi/files/lib.py +++ b/wrolpi/files/lib.py @@ -87,6 +87,9 @@ def _get_directory_dict(directory: pathlib.Path, directories: List[pathlib.Path] return d +IGNORED_DIRECTORIES = ('lost+found',) + + def list_directories_contents(directories_: List[str]) -> Dict: """List all files down to (and within) the directories provided. @@ -104,6 +107,9 @@ def list_directories_contents(directories_: List[str]) -> Dict: paths = dict() for path in media_directory.iterdir(): + if path.is_dir() and path.name in IGNORED_DIRECTORIES: + # Never show ignored directories. + continue if path.is_dir(): paths[f'{path.name}/'] = _get_directory_dict(path, directories) else: diff --git a/wrolpi/files/test/test_api.py b/wrolpi/files/test/test_api.py index 9a6e631a..b5f7d921 100644 --- a/wrolpi/files/test/test_api.py +++ b/wrolpi/files/test/test_api.py @@ -20,6 +20,7 @@ def test_list_files_api(test_client, make_files_structure, test_directory): 'empty directory/', 'videos/other video.mp4', 'videos/some video.mp4', + 'lost+found/', # Should always be ignored. ] files = make_files_structure(files) files[0].write_text('bar contents')