From: Marcel van der Veldt <m.vanderveldt@outlook.com>
Date: Fri, 8 Jul 2022 00:15:53 +0000 (+0200)
Subject: skip folder we can't access
X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=c1e9efcd52ee34107488ebdee9ec10d24bfad319;p=music-assistant-server.git

skip folder we can't access
---

diff --git a/music_assistant/music_providers/filesystem.py b/music_assistant/music_providers/filesystem.py
index de892559..b347dda5 100644
--- a/music_assistant/music_providers/filesystem.py
+++ b/music_assistant/music_providers/filesystem.py
@@ -57,16 +57,15 @@ async def scantree(path: str) -> AsyncGenerator[os.DirEntry, None]:
 
     loop = asyncio.get_running_loop()
     try:
-        entries = await loop.run_in_executor(None, os.scandir, path)
-    except (OSError, PermissionError) as err:
-        LOGGER.warning("Skip folder %s: %s", path, str(err))
-    else:
-        for entry in entries:
+        for entry in await loop.run_in_executor(None, os.scandir, path):
             if await loop.run_in_executor(None, is_dir, entry):
                 async for subitem in scantree(entry.path):
                     yield subitem
             else:
                 yield entry
+    except (OSError, PermissionError) as err:
+        LOGGER.warning("Skip folder %s: %s", path, str(err))
+        return
 
 
 def get_parentdir(base_path: str, name: str) -> str | None: