新增下载目录整理、修复计划任务状态回显并优化启动检测速度
- 下载目录整理:按当天日期在下载目录内建子目录,文件按类型分类(安装包/压缩包/文档/图片/视频/音频/其他),文件夹进日期目录根;跳过下载中临时文件、日期格式旧目录和系统项;支持撤销与每月计划任务 - 修复:重开软件后目录整理页现在回填已保存配置,并以任务计划程序实际状态为准显示开关;撤销按 profile 过滤,桌面与下载互不干扰 - 性能:激活状态查询移出启动流程,仅在 KMS 页/相关操作/手动刷新时按需执行;Defender 状态后台异步刷新;新增状态缓存供下次启动首显 - 去除 D:\desktop 硬编码默认值;Verification 增加下载整理、同日合并、排除规则与撤销过滤测试
This commit is contained in:
@@ -85,7 +85,8 @@ try
|
||||
var undo = await desktopService.UndoLatestAsync(new ToolboxCommand
|
||||
{
|
||||
Id = Guid.NewGuid().ToString("N"),
|
||||
Kind = ToolboxCommandKind.UndoDesktopArchive
|
||||
Kind = ToolboxCommandKind.UndoDesktopArchive,
|
||||
Arguments = new Dictionary<string, string> { ["profile"] = "verification" }
|
||||
});
|
||||
Check(undo.Success, "撤销最近桌面归档失败");
|
||||
Check(File.Exists(Path.Combine(testDesktop, "Project", "third.txt")), "撤销没有恢复最近一次文件夹");
|
||||
@@ -93,6 +94,89 @@ try
|
||||
Check(File.Exists(Path.Combine(dateFolder, "report (1).txt")), "撤销文件夹归档不应影响更早归档文件");
|
||||
Check(Directory.Exists(Path.Combine(dateFolder, "Project")), "撤销最近一次不应影响更早归档文件夹");
|
||||
Check(Directory.Exists(Path.Combine(dateFolder, "Project (1)")), "撤销最近一次不应影响第二次归档文件夹");
|
||||
|
||||
// 下载目录整理:分类、排除、二次整理合并、撤销与 profile 过滤。
|
||||
var testDownloads = Path.Combine(temporaryRoot, "Downloads");
|
||||
Directory.CreateDirectory(testDownloads);
|
||||
File.WriteAllText(Path.Combine(testDownloads, "setup.exe"), "exe");
|
||||
File.WriteAllText(Path.Combine(testDownloads, "report.pdf"), "pdf");
|
||||
File.WriteAllText(Path.Combine(testDownloads, "photo.png"), "png");
|
||||
File.WriteAllText(Path.Combine(testDownloads, "unknown.xyz"), "xyz");
|
||||
File.WriteAllText(Path.Combine(testDownloads, "movie.mp4"), "mp4");
|
||||
File.WriteAllText(Path.Combine(testDownloads, "half.crdownload"), "downloading");
|
||||
File.WriteAllText(Path.Combine(testDownloads, "desktop.ini"), "ini");
|
||||
var extractedFolder = Path.Combine(testDownloads, "Extracted");
|
||||
Directory.CreateDirectory(extractedFolder);
|
||||
File.WriteAllText(Path.Combine(extractedFolder, "inner.txt"), "inner");
|
||||
var oldDateFolder = Path.Combine(testDownloads, "2020-01-01");
|
||||
Directory.CreateDirectory(oldDateFolder);
|
||||
|
||||
var downloadsService = new DownloadsTidyService(
|
||||
new TaskSchedulerService(),
|
||||
() => testDownloads,
|
||||
Path.Combine(temporaryRoot, "Data"));
|
||||
var tidyCommand = new ToolboxCommand
|
||||
{
|
||||
Id = Guid.NewGuid().ToString("N"),
|
||||
Kind = ToolboxCommandKind.TidyDownloads,
|
||||
Arguments = new Dictionary<string, string> { ["profile"] = "downloads" }
|
||||
};
|
||||
var firstTidy = await downloadsService.TidyAsync(tidyCommand);
|
||||
var downloadsDateFolder = Path.Combine(testDownloads, DateTime.Now.ToString("yyyy-MM-dd"));
|
||||
Check(firstTidy.Success, "第一次下载目录整理失败");
|
||||
Check(File.Exists(Path.Combine(downloadsDateFolder, "安装包", "setup.exe")), "安装包没有进入类型目录");
|
||||
Check(File.Exists(Path.Combine(downloadsDateFolder, "文档", "report.pdf")), "文档没有进入类型目录");
|
||||
Check(File.Exists(Path.Combine(downloadsDateFolder, "图片", "photo.png")), "图片没有进入类型目录");
|
||||
Check(File.Exists(Path.Combine(downloadsDateFolder, "视频", "movie.mp4")), "视频没有进入类型目录");
|
||||
Check(File.Exists(Path.Combine(downloadsDateFolder, "其他", "unknown.xyz")), "未识别类型没有进入其他目录");
|
||||
Check(Directory.Exists(Path.Combine(downloadsDateFolder, "Extracted")), "文件夹没有进入日期目录根");
|
||||
Check(File.Exists(Path.Combine(testDownloads, "half.crdownload")), "下载中的临时文件不应被移动");
|
||||
Check(File.Exists(Path.Combine(testDownloads, "desktop.ini")), "desktop.ini 不应被移动");
|
||||
Check(Directory.Exists(oldDateFolder), "日期格式的旧整理目录不应被移动");
|
||||
|
||||
await Task.Delay(5);
|
||||
File.WriteAllText(Path.Combine(testDownloads, "setup.exe"), "exe-second");
|
||||
File.WriteAllText(Path.Combine(testDownloads, "report.pdf"), "pdf-second");
|
||||
var secondTidy = await downloadsService.TidyAsync(tidyCommand with { Id = Guid.NewGuid().ToString("N") });
|
||||
Check(secondTidy.Success, "第二次下载目录整理失败");
|
||||
Check(File.Exists(Path.Combine(downloadsDateFolder, "安装包", "setup (1).exe")), "同日同名文件没有自动编号");
|
||||
Check(File.Exists(Path.Combine(downloadsDateFolder, "文档", "report (1).pdf")), "同日同名文档没有自动编号");
|
||||
|
||||
var emptyDownloads = Path.Combine(temporaryRoot, "EmptyDownloads");
|
||||
Directory.CreateDirectory(emptyDownloads);
|
||||
var emptyService = new DownloadsTidyService(
|
||||
new TaskSchedulerService(),
|
||||
() => emptyDownloads,
|
||||
Path.Combine(temporaryRoot, "Data"));
|
||||
var emptyTidy = await emptyService.TidyAsync(tidyCommand with { Id = Guid.NewGuid().ToString("N") });
|
||||
Check(emptyTidy.Success, "空目录整理应成功返回");
|
||||
Check(!Directory.Exists(Path.Combine(emptyDownloads, DateTime.Now.ToString("yyyy-MM-dd"))), "空目录整理不应创建日期目录");
|
||||
|
||||
// 撤销按 profile 过滤:先制造一个更新的桌面清单,下载撤销必须仍找下载清单。
|
||||
File.WriteAllText(Path.Combine(testDesktop, "filter-test.txt"), "filter");
|
||||
var desktopFilterArchive = await desktopService.ArchiveAsync(archiveCommand with { Id = Guid.NewGuid().ToString("N") });
|
||||
Check(desktopFilterArchive.Success, "桌面归档(过滤测试前置)失败");
|
||||
|
||||
var undoDownloads = await downloadsService.UndoLatestAsync(new ToolboxCommand
|
||||
{
|
||||
Id = Guid.NewGuid().ToString("N"),
|
||||
Kind = ToolboxCommandKind.UndoDownloadsTidy
|
||||
});
|
||||
Check(undoDownloads.Success, "撤销最近一次下载整理失败");
|
||||
Check(File.Exists(Path.Combine(testDownloads, "setup.exe")), "撤销没有恢复最近整理的文件");
|
||||
Check(File.Exists(Path.Combine(testDownloads, "report.pdf")), "撤销没有恢复最近整理的文档");
|
||||
Check(File.Exists(Path.Combine(downloadsDateFolder, "安装包", "setup.exe")), "撤销最近一次不应影响更早整理的文件");
|
||||
Check(Directory.Exists(Path.Combine(downloadsDateFolder, "Extracted")), "撤销最近一次不应影响更早整理的文件夹");
|
||||
Check(File.Exists(Path.Combine(dateFolder, "filter-test.txt")), "下载撤销不应影响桌面归档内容");
|
||||
|
||||
var undoDesktopAfterFilter = await desktopService.UndoLatestAsync(new ToolboxCommand
|
||||
{
|
||||
Id = Guid.NewGuid().ToString("N"),
|
||||
Kind = ToolboxCommandKind.UndoDesktopArchive,
|
||||
Arguments = new Dictionary<string, string> { ["profile"] = "verification" }
|
||||
});
|
||||
Check(undoDesktopAfterFilter.Success, "下载撤销后桌面撤销失败");
|
||||
Check(File.Exists(Path.Combine(testDesktop, "filter-test.txt")), "桌面撤销没有恢复过滤测试文件");
|
||||
}
|
||||
finally
|
||||
{
|
||||
@@ -112,7 +196,7 @@ if (failures.Count > 0)
|
||||
return 1;
|
||||
}
|
||||
|
||||
Console.WriteLine($"验证通过:{catalog.Count} 个 KMS 版本条目;命令模型、权限边界、文件与文件夹归档、系统项排除、同名处理和撤销正常。");
|
||||
Console.WriteLine($"验证通过:{catalog.Count} 个 KMS 版本条目;命令模型、权限边界、桌面归档与撤销、下载目录分类整理、排除规则、同日合并和按 profile 撤销正常。");
|
||||
return 0;
|
||||
|
||||
void Check(bool condition, string message)
|
||||
|
||||
Reference in New Issue
Block a user