Peach: Local-first video metadata scraper and media manager.
fix(scan): SMB 扫描整趟遍历共用一条连接
longmeidao5f8252f8b28d
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex d350465e7..d4d522987 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -21,6 +21,10 @@ Removed / Fixed / Security。## [未发布]+### 修复++- **馆藏**:扫描 SMB 共享时整趟共用一条连接,不再每进入一个目录都重新连接和认证,大型媒体库的扫描明显加快;连接断开时自动重连一次后继续。+## [0.53.0] - 2026-11-02作者从 2026 年 10 月 29 日开始游玩《影之刃零》,通关前会暂缓更新和维护。diff --git a/docs/SMB.md b/docs/SMB.mdindex 5f1c8e788..31939ac9d 100644--- a/docs/SMB.md+++ b/docs/SMB.md@@ -16,7 +16,7 @@ Peach 通过 SMB 2/3 按账号权限直接读写网络共享。连接由运行 P媒体工具通过回环 HTTP Range 地址随机读取;这个供工具读取的地址只提供 GET/HEAD,不能借它写回共享。原件修复仍要求本机挂载路径,不将整部远程影片自动下载到临时目录;跨共享、跨声明根的移动不支持。-共享离线或无权读取时保留馆藏记录,不能据此断言文件已删除。直接 SMB 来源使用扫描,不加入本机文件监视。DFS 和重解析点不在支持范围;只连接明确填写的共享。每个读取句柄拥有独立连接与文件位置,请求超时关闭所属连接,恢复网络后重新发起操作。+共享离线或无权读取时保留馆藏记录,不能据此断言文件已删除。直接 SMB 来源使用扫描,不加入本机文件监视。DFS 和重解析点不在支持范围;只连接明确填写的共享。每个读取句柄拥有独立连接与文件位置,请求超时关闭所属连接,恢复网络后重新发起操作。扫描一个来源时整趟遍历共用一条连接,连接断开或超时就换新连接重试一次,仍失败的目录记为问题项后继续。## 配置文件diff --git a/src/peach/scan.py b/src/peach/scan.pyindex 32ad6524c..981713467 100644--- a/src/peach/scan.py+++ b/src/peach/scan.py@@ -495,30 +495,47 @@ def _relative_directory(directory, top):def _walk_smb(top, pending, onerror):+ """SMB 版 `_walk`:整趟遍历共用一条连接。++ 逐目录新建连接时,TCP 握手、会话认证与挂载共享的开销远大于列目录本身。+ 连接断开或请求超时就换一条新连接重试一次;单个路径不存在或无权访问不影响连接,照常跳过。+ """from types import SimpleNamespace+ from .smb_transport import PATH_ERRNOSstack = pending if pending is not None else [str(top)]- while stack:- checkpoint('scan')- directory = stack.pop()- resource = top.joinpath(*_relative_directory(directory, top))- try:- entries = resource.scandir()- except OSError as error:- onerror(error)- continue- files, children = [], []- for entry in entries:- if entry.is_symlink:+ transport = top._transport()+ try:+ while stack:+ checkpoint('scan')+ directory = stack.pop()+ resource = top.joinpath(*_relative_directory(directory, top))+ try:+ try:+ entries = resource.scandir(transport)+ except OSError as error:+ if error.errno in PATH_ERRNOS:+ raise+ transport.close()+ transport = top._transport()+ entries = resource.scandir(transport)+ except OSError as error:+ onerror(error)continue- path = str(resource / entry.name)- if entry.is_dir:- if not entry.name.startswith('@') and entry.name.casefold() != '#recycle':- children.append(path)- else:- stat = SimpleNamespace(st_size=entry.size, st_mtime=entry.mtime, st_mtime_ns=entry.mtime_ns)- files.append(SimpleNamespace(name=entry.name, path=path, stat=lambda value=stat: value))- stack.extend(path for path in sorted(children, reverse=True) if path not in stack)- yield directory, sorted(files, key=lambda entry: entry.name)+ files, children = [], []+ for entry in entries:+ if entry.is_symlink:+ continue+ path = str(resource / entry.name)+ if entry.is_dir:+ if not entry.name.startswith('@') and entry.name.casefold() != '#recycle':+ children.append(path)+ else:+ stat = SimpleNamespace(st_size=entry.size, st_mtime=entry.mtime, st_mtime_ns=entry.mtime_ns)+ files.append(SimpleNamespace(name=entry.name, path=path, stat=lambda value=stat: value))+ stack.extend(path for path in sorted(children, reverse=True) if path not in stack)+ yield directory, sorted(files, key=lambda entry: entry.name)+ finally:+ transport.close()class _ScanProgress:diff --git a/src/peach/smb_media.py b/src/peach/smb_media.pyindex fbca0116f..72446f4c9 100644--- a/src/peach/smb_media.py+++ b/src/peach/smb_media.py@@ -302,7 +302,10 @@ class SmbResource:if not exist_ok or not self.is_dir():raise- def scandir(self):+ def scandir(self, transport=None):+ """列目录。给 `transport` 时沿用调用方的连接,由调用方负责关闭。"""+ if transport is not None:+ return transport.scandir(self.remote_parts)transport = self._transport()try:return transport.scandir(self.remote_parts)diff --git a/src/peach/smb_transport.py b/src/peach/smb_transport.pyindex 7e91cb083..6ee04e106 100644--- a/src/peach/smb_transport.py+++ b/src/peach/smb_transport.py@@ -36,6 +36,9 @@ from smbprotocol.tree import TreeConnectfor _namespace in ("smbprotocol", "smbclient"):logging.getLogger(_namespace).setLevel(logging.WARNING)+#: 只关乎单个路径的错误,连接仍可继续使用;其余错误视为连接已不可用。+PATH_ERRNOS = frozenset({errno.ENOENT, errno.EACCES, errno.EPERM, errno.EISDIR, errno.ENOTDIR})+@dataclass(frozen=True)class SmbConnection:@@ -263,7 +266,7 @@ class SmbTransport:if fd.connected:self._close_fd(fd)error = _error(exc)- if error.errno not in (errno.ENOENT, errno.EACCES, errno.EPERM, errno.EISDIR, errno.ENOTDIR):+ if error.errno not in PATH_ERRNOS:self.close()raise error from Nonediff --git a/tests/test_smb_media.py b/tests/test_smb_media.pyindex c23186792..4b06115b8 100644--- a/tests/test_smb_media.py+++ b/tests/test_smb_media.py@@ -238,6 +238,59 @@ class SmbMediaTests(unittest.TestCase):self.assertEqual(connection.execute("SELECT path FROM asset WHERE medium='video'").fetchall(), [(ledger_root + '\\ABC-123.mp4',)])self.assertEqual(connection.execute('SELECT COUNT(*) FROM asset_subtitle').fetchone()[0], 1)+ def test_scan_walk_shares_one_connection_and_reconnects_once_after_a_drop(self):+ import errno+ from peach.smb_transport import SmbEntry+ tree = {('Movies',): [SmbEntry(0, 1, 1, True, name) for name in ('A', 'B', 'C', 'Gone')]}+ for name in 'ABC':+ tree[('Movies', name)] = [SmbEntry(10, 1, 1, False, f'{name}.mp4'), SmbEntry(0, 1, 1, True, 'extrafanart')]+ tree[('Movies', name, 'extrafanart')] = [SmbEntry(5, 1, 1, False, 'fanart1.jpg')]+ listed_directories = len(tree)++ class Transport:+ def __init__(self, drop_on=None):+ self.drop_on, self.calls, self.closed = drop_on, 0, False+ transports.append(self)++ def scandir(self, parts):+ assert not self.closed, '已关闭的连接不应再被使用'+ self.calls += 1+ if self.calls == self.drop_on:+ raise OSError(errno.ENETDOWN, 'SMB 连接已断开')+ if parts not in tree:+ raise FileNotFoundError(errno.ENOENT, '不存在')+ return tree[parts]++ def close(self):+ self.closed = True++ with tempfile.TemporaryDirectory() as temporary:+ root = Path(temporary).resolve()+ config = settings_file.PeachConfig(root, root / 'config.toml', present=True, locations={})+ sources = media_configuration.prepare_sources([+ dict(location='local', path='smb://nas/share/Movies', library='NAS', cost='free')], windows=True, config=config)+ config = media_identity.configure_sources(config, sources, windows=True)+ with patch('peach.settings_file.active', return_value=config):+ top = scan.walk_root_for('local', sources[0]['root'], declared_roots=config.locations, mounts=config.mounts)+ for drop_on, expected_transports in ((None, 1), (3, 2)):+ with self.subTest(drop_on=drop_on):+ transports, errors = [], []+ with patch.object(smb_media.SmbResource, '_transport',+ side_effect=lambda first_drop=drop_on, created=transports: Transport(None if created else first_drop)):+ walked = list(scan._walk(top, onerror=errors.append))+ self.assertEqual(len(transports), expected_transports)+ self.assertTrue(all(transport.closed for transport in transports))+ self.assertEqual(len(walked), listed_directories)+ self.assertEqual(sorted(entry.name for _, files in walked for entry in files),+ ['A.mp4', 'B.mp4', 'C.mp4', 'fanart1.jpg', 'fanart1.jpg', 'fanart1.jpg'])+ self.assertEqual([error.errno for error in errors], [errno.ENOENT])+ transports = []+ with patch.object(smb_media.SmbResource, '_transport', side_effect=lambda: Transport()):+ walker = scan._walk(top, onerror=lambda error: None)+ next(walker)+ walker.close()+ self.assertEqual([transport.closed for transport in transports], [True])+def test_loopback_bridge_range_and_authorization(self):resource = _Resource(b'0123456789')bridge = smb_media._bridge()