From c1e9efcd52ee34107488ebdee9ec10d24bfad319 Mon Sep 17 00:00:00 2001 From: Marcel van der Veldt Date: Fri, 8 Jul 2022 02:15:53 +0200 Subject: [PATCH] skip folder we can't access --- music_assistant/music_providers/filesystem.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) 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: -- 2.34.1