From c82ef9522578a399f06deb5cb00311df98906c01 Mon Sep 17 00:00:00 2001 From: Thomas Erlang Date: Mon, 6 Nov 2023 22:04:25 +0100 Subject: [PATCH] Cache the scanned files useful for when we scan for subtitles directly after having scanned directory for video files --- seplis_play_server/scanners/base.py | 39 +++++++++++++++++------------ 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/seplis_play_server/scanners/base.py b/seplis_play_server/scanners/base.py index 4baeeff..2c636f3 100644 --- a/seplis_play_server/scanners/base.py +++ b/seplis_play_server/scanners/base.py @@ -7,6 +7,7 @@ class Play_scan: SCANNER_NAME = 'Unnamed scanner' SUPPORTED_EXTS = config.media_types + _cached_paths = {} def __init__(self, scan_path: str, make_thumbnails: bool = False, cleanup_mode = False, parser = 'internal'): if not os.path.exists(scan_path): @@ -37,24 +38,30 @@ async def scan(self): await self.save_item(title, f) def get_files(self): - ''' - Looks for files in the `self.scan_path` directory. - ''' files = [] - for dirname, dirnames, filenames in os.walk(self.scan_path): - for file_ in filenames: - info = os.path.splitext(file_) - if file_.startswith('._'): - continue - if len(info) != 2: - continue - if info[1][1:].lower() not in self.SUPPORTED_EXTS: - continue - files.append( - os.path.join(dirname, file_) - ) + for dirname, file_ in self._get_files(self.scan_path): + info = os.path.splitext(file_) + if file_.startswith('._'): + continue + if len(info) != 2: + continue + if info[1][1:].lower() not in self.SUPPORTED_EXTS: + continue + files.append( + os.path.join(dirname, file_) + ) return files - + + def _get_files(self, scan_path) -> tuple[str, str]: + if scan_path in self._cached_paths: + for r in self._cached_paths[scan_path]: + yield r + else: + self._cached_paths[scan_path] = [] + for dirname, _, filenames in os.walk(scan_path): + for file_ in filenames: + self._cached_paths[scan_path].append((dirname, file_)) + yield (dirname, file_) async def get_metadata(self, path): '''