Skip to content

armgit / peach

Public Imported from GitHub
0

Peach: Local-first video metadata scraper and media manager.

fix(discovery): 过滤飞牛内部元数据目录

longmeidao4e391e58cefa
diff --git a/docs/REUSE.md b/docs/REUSE.md
index 1480d0021..142df533f 100644
--- a/docs/REUSE.md
+++ b/docs/REUSE.md
@@ -1195,6 +1195,7 @@ Python 源文件纳入 `src/peach/library_sharing.py` 与 `src/peach/library_pro
- AFP 的 `.AppleDouble`、`.AppleDesktop`、`.AppleDB`、`Network Trash Folder`、`Icon\r`、`.VolumeIcon.icns` 见 [Netatalk 专用文件与目录](https://netatalk.io/docs/Special-Files-and-Folders)。macOS 的 `.Spotlight-V100`、`.Trashes`、`.fseventsd` 可见 [Apple Remote Desktop 指南](https://images.apple.com/server/docs/ARD_3_Admin_Guide_v3.3.pdf),`__MACOSX` 中的 AppleDouble 见 [Apple DTS 取证示例](https://developer.apple.com/forums/thread/772398)。`.DS_Store` 见 [Apple SMB 说明](https://support.apple.com/102064),`.localized` 沿用已有文件名规则。
- Windows 的 [`System Volume Information`](https://learn.microsoft.com/en-us/windows-hardware/drivers/ddi/fltkernel/nf-fltkernel-fltcreatesystemvolumeinformationfolder)、[`$Recycle.Bin`](https://learn.microsoft.com/en-us/troubleshoot/windows-client/shell-experience/recycle-bin-corrupted)、[`desktop.ini`](https://learn.microsoft.com/en-us/windows/win32/shell/how-to-customize-folders-with-desktop-ini) 和 [`Thumbs.db`](https://learn.microsoft.com/en-us/windows/client-management/mdm/policy-csp-admx-thumbnails) 分别按目录或文件名称匹配。
- Linux 挂载点的 `.Trash` 和 `.Trash-<UID>` 见 [FreeDesktop Trash Specification](https://specifications.freedesktop.org/trash/1.0/),UID 只匹配完整 ASCII 十进制数字;`.Trash-user` 和 `.Trash-1000-old` 仍可登记。Snapper 管理的 Btrfs 快照目录 `.snapshots` 见 [openSUSE 说明](https://doc.opensuse.org/documentation/tumbleweed/snapper/);macOS `.TemporaryItems` 见 [Apple 文件系统模板](https://github.com/apple-oss-distributions/files/blob/main/hierarchy.osx)。这些名称按完整目录段匹配,目录本身作为扫描根、恢复断点或推送路径也跳过,不进入内部文件。
-- TerraMaster 支持团队确认的 [`#recycle`](https://forum.terra-master.com/en/viewtopic.php?t=2443) 已由同名规则覆盖。[ASUSTOR](https://www.asustor.com/en/online/online_help?id=11)、[fnOS](https://help.fnnas.com/articles/v1/file/team) 和 [UGREEN](https://support.ugnas.com/detail/article/en-US/159) 的已查官方说明介绍回收站功能,未据此推导物理目录名称,也不将普通 `Recycle Bin`、`Trash` 或中文文件夹名加入过滤。
+- fnOS 的 `.@#local` 按完整目录段过滤,覆盖个人目录、团队目录和嵌套媒体目录下的 `.@#local/trash`。物理路径依据 [CleanFnOS 回收站实现](https://github.com/kyeo-hub/CleanFnOS/blob/21d10e4ffeb696dd23e817d5b3a5069760b5a9ed/app/ui/api/trash.js);这是第三方应用作者的源码依据,不代表飞牛官方命名契约或所有 fnOS 版本实机验收。正常 `.@#local-old` 与可存放应用共享媒体的 `@appshare` 保留,不按 `@app*` 整批排除。
+- TerraMaster 支持团队确认的 [`#recycle`](https://forum.terra-master.com/en/viewtopic.php?t=2443) 已由同名规则覆盖。[ASUSTOR](https://www.asustor.com/en/online/online_help?id=11) 和 [UGREEN](https://support.ugnas.com/detail/article/en-US/159) 的已查官方说明介绍回收站功能,未据此推导物理目录名称,也不将普通 `Recycle Bin`、`Trash` 或中文文件夹名加入过滤。
不排除任意 `@` 目录或任意点开头文件;`@creator/movie.mp4`、`.hidden.mp4`、`@eaDir-old` 和普通 `Snapshots` 仍可登记。旧数据沿用 `system_file_repair` 可还原隔离,仅处理无番号、无收藏和个人记录的 `other` 行,保留文件与关联行;上一版回执已经隔离过的相同资产与 Windows 路径不再处理,以保留后来的手动还原。路径按 `PureWindowsPath` 比较,大小写和斜杠变化不影响保护,同一 ID 改为另一路径仍按规则检查。旧视频、图片和音频不自动隔离;过滤生效不代表这些历史资产已复核。
diff --git a/src/peach/discovery_rules.py b/src/peach/discovery_rules.py
index 940b9246c..3b08b36d9 100644
--- a/src/peach/discovery_rules.py
+++ b/src/peach/discovery_rules.py
@@ -7,7 +7,7 @@ import re
_DIRECTORIES = frozenset({
'@eadir', '@tmp', '@sharebin', '#recycle', '#snapshot', '@snapshot',
'@recycle', '@recently-snapshot', '.@__thumb', '.@__qini', '.@upload_cache', '.streams',
- '.zfs', '.snapshot', '.snapshots', '~snapshot', '.recycle', '.trash',
+ '.zfs', '.snapshot', '.snapshots', '~snapshot', '.recycle', '.trash', '.@#local',
'.appledouble', '.appledesktop', '.appledb', 'network trash folder',
'.spotlight-v100', '.trashes', '.temporaryitems', '.fseventsd', '__macosx',
'$recycle.bin', 'system volume information',
diff --git a/tests/test_push_discovery.py b/tests/test_push_discovery.py
index 147fcd9ed..3161d0805 100644
--- a/tests/test_push_discovery.py
+++ b/tests/test_push_discovery.py
@@ -200,7 +200,9 @@ class IgnoreAndSourceTests(unittest.TestCase):
for path in (r'R:\media\@eaDir\video.mp4@SynoEAStream',
'/media/@snapshot/nested/video.mp4', r'R:\media\#RECYCLE\video.mp4',
'R:\\media\\@eaDir\\broken\udcff.mp4@SynoEAStream',
- r'R:\media\video.mp4@SynoEAStream'):
+ r'R:\media\video.mp4@SynoEAStream',
+ '/vol1/1000/Movies/.@#local/trash/movie.mp4',
+ '/vol1/@team/Movies/.@#local/trash/movie.mp4'):
with self.subTest(path=ascii(path)):
self.assertTrue(push.ignored(path))
self.assertFalse(push.ignored(r'R:\media\scene@home\video.mp4'))
@@ -212,7 +214,8 @@ class IgnoreAndSourceTests(unittest.TestCase):
self.assertTrue(push.ignored(str(PureWindowsPath(r'R:\media', name))))
for name in ('@creator', 'normal', '@eaDir-old', '#recycle-old', '.snapshot-old',
'Snapshots', 'Recycle Bin', 'Temporary Items', '.Trash-', '.Trash-1000-old',
- '.Trash-user', '.Trash-١٠٠٠', '.snapshots-old', '.TemporaryItems-old'):
+ '.Trash-user', '.Trash-١٠٠٠', '.snapshots-old', '.TemporaryItems-old',
+ '.@#local-old', '@appshare'):
with self.subTest(directory=name):
self.assertFalse(system_directory(name))
self.assertFalse(push.ignored(str(PureWindowsPath(r'R:\media', name, 'movie.mp4'))))
@@ -398,7 +401,8 @@ class IngestPathTests(_ServiceCase):
for parts in (('@Recently-Snapshot', 'movie.mp4'), ('.AppleDouble', 'movie.mp4'),
('.zfs', 'snapshot', 'movie.mp4'), ('$Recycle.Bin', 'movie.mp4'),
('._movie.mp4',), ('desktop.ini',), ('@eaDir',), ('.Trash-1000',),
- ('.snapshots',), ('.TemporaryItems',)):
+ ('.snapshots',), ('.TemporaryItems',), ('.@#local',),
+ ('.@#local', 'trash', 'movie.mp4')):
path = self.ledger('local', *parts)
with self.subTest(parts=parts), mock.patch.object(service.queue, 'submit') as submit, \
mock.patch.object(service, '_ingest') as ingest:
diff --git a/tests/test_scan.py b/tests/test_scan.py
index 0f133d944..ad0bf0454 100644
--- a/tests/test_scan.py
+++ b/tests/test_scan.py
@@ -592,7 +592,7 @@ class NasDirectoryTests(unittest.TestCase):
for name in ("#recycle", "#RECYCLE", "@eaDir", "@snapshot", "@Recycle",
"@Recently-Snapshot", ".@__thumb", ".@__qini", ".@upload_cache", ".streams",
".zfs", ".snapshot", ".snapshots", "~snapshot", ".recycle", ".Trash", ".Trash-1000",
- ".TemporaryItems", ".AppleDouble", ".AppleDB",
+ ".TemporaryItems", ".AppleDouble", ".AppleDB", ".@#local",
".AppleDesktop", "Network Trash Folder", ".Spotlight-V100", ".Trashes",
".fseventsd", "__MACOSX", "$Recycle.Bin", "System Volume Information",
".wfm_upload123", "normal", "@creator", ".hidden"):