From 12df14ebf025e5ba7d717ba82a62d68fc4156433 Mon Sep 17 00:00:00 2001 From: mac Date: Wed, 11 Nov 2026 23:11:00 +0800 Subject: [PATCH] Refine job estimates, mount cleanup and NTFS identification tests --- HANDOFF.md | 2 ++ application/broker.py | 26 ++++++++++++++++++++++---- packaging/fpk/manifest | 2 +- tests/test_application.py | 17 +++++++++++++++++ 4 files changed, 42 insertions(+), 5 deletions(-) diff --git a/HANDOFF.md b/HANDOFF.md index e86ee89..5fd12d6 100644 --- a/HANDOFF.md +++ b/HANDOFF.md @@ -11,6 +11,8 @@ - NAS 已核实为 fnOS `1.2.0701`,有 ntfs-3g、mkntfs、ntfscp。NTFS 已有系统挂载时优先复用,应用只读取源文件;不强行卸载或修改系统在用盘。未挂载的新盘使用只读挂载。 - 应用第一版代码位于 `application/`,FPK 定义在 `packaging/fpk/`,构建入口 `scripts/build-fpk.py`。当前版本 0.1.0;使用官方网关 Unix Socket,不开放新的网络端口。Web 进程启动后降为专用包用户,原始设备操作由本机 Socket 服务处理并核验调用 UID。 - 已通过五项边界测试:匿名及非管理员拒绝、管理员页面可读、写请求来源校验、路径穿越和符号链接越界拒绝、系统身份拒绝;Python/生命周期脚本语法通过。FPK 构建和实机界面/NTFS 镜像验证正在进行,尚未宣称正式交付。 +- 0.1.0 已实际安装并启动:官方网关登录态生效,浏览器可浏览 APFS 目录并显示当前后台任务;Web 进程实际 UID 985(非 root),设备服务为 root,两个 Unix Socket 均为 0660。 +- 新版 0.1.1 修正根目录显示、平滑速度/剩余时间估算,并在服务退出时清理应用闲置挂载(不影响正在拷贝的盘)。七项边界测试通过;NTFS 64 MiB 自建镜像只读挂载、1 MiB 文件复制 SHA-256 比对已通过,无实体 NTFS USB 盘测试。0.1.1 待升级并做最终端到端 UI 复制验证。 ## 当前复制任务(2026-11-11 22:36 启动) diff --git a/application/broker.py b/application/broker.py index 891ce3b..dae983b 100644 --- a/application/broker.py +++ b/application/broker.py @@ -21,6 +21,7 @@ APP_UID = int(os.environ['TRIM_UID']) APP_GID = int(os.environ['TRIM_GID']) LEGACY = Path('/var/tmp/dayu-apfs-validation') TERMINAL = {'complete', 'failed', 'needs_attention', 'cleanup_failed', 'cancelled'} +HISTORY = {} def command(args, timeout=30): @@ -95,9 +96,13 @@ def jobs(uid=None): if phase == 'complete' and 'source_write_counters_after' not in state: phase = 'finalizing' speed = 0 - if progress and phase == 'copying': - multiplier = 1024 ** ('kMGT'.find(progress[-1][4]) + 1) if progress[-1][4] else 1 - speed = float(progress[-1][3]) * multiplier + if phase == 'copying': + now = time.time() + samples = HISTORY.setdefault(str(folder), []) + samples.append((now, copied)) + samples[:] = [sample for sample in samples if sample[0] >= now - 90] + elapsed = now - samples[0][0] + speed = (copied - samples[0][1]) / elapsed if elapsed >= 15 else copied / max(1, now - state.get('copy_started', now)) total = config.get('planned_copy_bytes', 0) if phase == 'complete': copied = total @@ -178,13 +183,14 @@ def target_path(path, uid, must_exist=True): def listing(root, relative=''): + root = root.resolve(strict=True) path = beneath(root / relative, root) entries = [] for entry in path.iterdir(): if entry.name.startswith('.') or entry.is_symlink() or not entry.is_dir(): continue entries.append({'name': entry.name, 'path': str(entry.relative_to(root))}) - return {'path': str(path.relative_to(root)), 'entries': sorted(entries, key=lambda item: item['name'].casefold())} + return {'path': '' if path == root else str(path.relative_to(root)), 'entries': sorted(entries, key=lambda item: item['name'].casefold())} def dispatch(request): @@ -311,3 +317,15 @@ if __name__ == '__main__': finally: server.server_close() path.unlink(missing_ok=True) + in_use = {job['device_id'] for job in active()} + for identity, item in mounts().items(): + if identity in in_use or not item.get('managed'): + continue + try: + if os.path.ismount(item['mount']): + command(['umount', item['mount']]) + properties = command(['udevadm', 'info', '-q', 'property', '-n', item['device']]) + if ('ID_SERIAL_SHORT=' + item['serial']) in properties.splitlines() and item['original_ro'] == '0': + command(['blockdev', '--setrw', item['device']]) + except Exception: + pass diff --git a/packaging/fpk/manifest b/packaging/fpk/manifest index 5ee08fc..7301ece 100644 --- a/packaging/fpk/manifest +++ b/packaging/fpk/manifest @@ -1,5 +1,5 @@ appname=dayu-diskcopy -version=0.1.0 +version=0.1.1 display_name=大鱼硬盘拷贝 desc=直接读取 APFS、NTFS 外接硬盘,在飞牛 NAS 本机后台拷贝目录、查看进度和校验结果。 source=thirdparty diff --git a/tests/test_application.py b/tests/test_application.py index 7b5309f..911b320 100644 --- a/tests/test_application.py +++ b/tests/test_application.py @@ -6,6 +6,7 @@ import socket import tempfile import threading import unittest +from unittest.mock import patch ROOT = Path(__file__).resolve().parents[1] @@ -39,6 +40,22 @@ class PathBoundaryTests(unittest.TestCase): with self.assertRaises(ValueError): broker.dispatch({'uid': 0, 'action': 'start', 'args': {}}) + def test_usb_apfs_ntfs_identified_and_internal_disks_excluded(self): + broker = module('broker') + tree = {'blockdevices': [ + {'tran': 'usb', 'size': 1000, 'serial': 'usb1', 'model': 'Test', 'children': [ + {'path': '/dev/test1', 'size': 900, 'fstype': 'ntfs', 'partuuid': 'abc', 'mountpoints': []}, + {'path': '/dev/test2', 'size': 100, 'fstype': 'apfs', 'partuuid': 'def', 'mountpoints': []}]}, + {'tran': 'sata', 'size': 1000, 'serial': 'system', 'fstype': 'ntfs'}]} + with patch.object(broker, 'command', return_value=json.dumps(tree)): + detected = broker.disks() + self.assertEqual([item['filesystem'] for item in detected], ['ntfs', 'apfs']) + + def test_root_listing_uses_empty_relative_path(self): + broker = module('broker') + with tempfile.TemporaryDirectory() as folder: + self.assertEqual(broker.listing(Path(folder))['path'], '') + class GatewayTests(unittest.TestCase): @classmethod