added filters on counting

Author: Rishab87

jupyter_server/services/contents/filemanager.py

@@ -296,7 +296,16 @@ def _dir_model(self, path, content=True):
         model["size"] = None
         os_dir = self._get_os_path(path)
         dir_contents = os.listdir(os_dir)
-        model["item_count"] = len(dir_contents)
+        filtered_count = 0
+        for name in dir_contents:
+            try:
+                os_path = os.path.join(os_dir, name)
+                if self.should_list(name) and (self.allow_hidden or not is_file_hidden(os_path)):
+                    filtered_count += 1
+            except OSError as e:
+                self.log.warning("Error accessing %s: %s", os.path.join(os_dir, name), e)
+
+        model["item_count"] = filtered_count
         if content:
             model["content"] = contents = []
             for name in os.listdir(os_dir):
@@ -770,7 +779,16 @@ async def _dir_model(self, path, content=True):
         model["size"] = None
         os_dir = self._get_os_path(path)
         dir_contents = await run_sync(os.listdir, os_dir)
-        model["item_count"] = len(dir_contents)
+        filtered_count = 0
+        for name in dir_contents:
+            try:
+                os_path = os.path.join(os_dir, name)
+                if self.should_list(name) and (self.allow_hidden or not is_file_hidden(os_path)):
+                    filtered_count += 1
+            except OSError as e:
+                self.log.warning("Error accessing %s: %s", os.path.join(os_dir, name), e)
+
+        model["item_count"] = filtered_count
         if content:
             model["content"] = contents = []
             for name in dir_contents:

tests/services/contents/test_manager.py

@@ -644,7 +644,7 @@ async def test_get(jp_contents_manager):
     assert "item_count" in dirmodel
     assert isinstance(dirmodel["content"], list)
     assert len(dirmodel["content"]) == 3
-    assert dirmodel["item_count"] == 4
+    assert dirmodel["item_count"] == 3
     assert dirmodel["path"] == "foo"
     assert dirmodel["name"] == "foo"