diff --git a/core/directories.py b/core/directories.py index 3dbf58e0..47418077 100644 --- a/core/directories.py +++ b/core/directories.py @@ -84,10 +84,11 @@ class Directories: for denied_path_re in self._exclude_list.compiled: if denied_path_re.match(str(path.name)): return DirectoryState.EXCLUDED - # return # We still use the old logic to force state on hidden dirs + return DirectoryState.NORMAL # Override this in subclasses to specify the state of some special folders. if path.name.startswith("."): return DirectoryState.EXCLUDED + return DirectoryState.NORMAL def _get_files(self, from_path, fileclasses, j): try: @@ -214,7 +215,7 @@ class Directories: # direct match? easy result. if path in self.states: return self.states[path] - state = self._default_state_for_path(path) or DirectoryState.NORMAL + state = self._default_state_for_path(path) # Save non-default states in cache, necessary for _get_files() if state != DirectoryState.NORMAL: self.states[path] = state diff --git a/core/tests/directories_test.py b/core/tests/directories_test.py index f9837534..8e0fe7bf 100644 --- a/core/tests/directories_test.py +++ b/core/tests/directories_test.py @@ -326,6 +326,7 @@ def test_default_path_state_override(tmpdir): def _default_state_for_path(self, path): if "foobar" in path.parts: return DirectoryState.EXCLUDED + return DirectoryState.NORMAL d = MyDirectories() p1 = Path(str(tmpdir))