From 68d778d9b845b67e972903f52f11d15ddfa86a21 Mon Sep 17 00:00:00 2001 From: Roland Date: Wed, 8 May 2024 20:33:57 -0600 Subject: [PATCH] Stripping trailing / from directory when un-ignoring. --- wrolpi/files/lib.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wrolpi/files/lib.py b/wrolpi/files/lib.py index d16973b4..564cd3bd 100644 --- a/wrolpi/files/lib.py +++ b/wrolpi/files/lib.py @@ -106,7 +106,7 @@ def _get_recursive_directory_dict(directory: pathlib.Path, directories: List[pat return d -IGNORED_DIRECTORIES = ('lost+found',) +HIDDEN_DIRECTORIES = ('lost+found',) def list_directories_contents(directories_: List[str]) -> Dict: @@ -126,7 +126,7 @@ 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: + if path.is_dir() and path.name in HIDDEN_DIRECTORIES: # Never show ignored directories. continue if path.is_dir(): @@ -1337,7 +1337,7 @@ def add_ignore_directory(directory: Union[pathlib.Path, str]): def remove_ignored_directory(directory: Union[pathlib.Path, str]): """Remove a directory from the `ignored_directories` in the WROLPi config.""" - directory = str(pathlib.Path(directory)) + directory = str(pathlib.Path(directory)).rstrip('/') ignored_directories = get_wrolpi_config().ignored_directories if directory in ignored_directories: ignored_directories.remove(directory)