refactor: 公共面补 BakNRet 前缀，产品名大小写全仓统一
16 个没有前缀的公共函数补上 BakNRet（Write-Log → Write-BakNRetLog、Resolve-BackupEntry → Resolve-BakNRetBackupEntry、Find-ChildDirectoryByName → Find-BakNRetChildDirectoryByName 等）， 另外把全仓的 Baknret 统一成 BakNRet（47 个文件、940 处、65 个定义文件重命名）。 这不是审美问题：静态分析直接拓出一条实据 —— Write-Log 与本机某个已装模块导出的命令 **重名**（PSAvoidOverwritingBuiltInCmdlets），而重名的后果是导入两个模块时有一方的命令被 静默遮蔽。补前缀正是这条规则的解法，改名后它归零。 为什么敢做这个规模：PowerShell 的函数名解析大小写不敏感，所以 Baknret → BakNRet 在功能 上是零风险；真正要验证的是 16 个补前缀的调用点，而 276 个断言几乎覆盖了每个函数。另外 "名字与文件名一致"这条不变式有断言盯着（加载器点源的文件集合 vs 磁盘）。 踩到并记下的坑：Windows 文件系统大小写不敏感，所以**只改大小写**的重命名会被 Move-Item 当成同一个文件而静默跳过 —— 同一批里同时改了名字的那 16 个文件却成功了，于是"看起来能跑"。 最后用"先移到临时名、再移到目标名"的两步走解决，判断与替换全部改用显式大小写敏感的形式 （-creplace / -cmatch）。 顺带把名录指纹缓存从 MD5 换成 SHA256（PSAvoidUsingBrokenHashAlgorithms）：它只是缓存键， 没有兼容负担。 验收：test.ps1 9/9 全绿（7 与 5.1）、100 个文件两版解析零错、276 个断言全过、 构建工具仍能合回单文件（3300 行）。
This commit is contained in:
Shuery committed
1 parent
187d2759fd
commit
42f02d0eca
84 files changed
+1043
-1043
No files matched your search
+101
-101
@@ -91,9 +91,9 @@ if (-not (Test-Path -LiteralPath $modulePath)) {
|
||||
}
|
||||
Import-Module $modulePath -Force
|
||||
|
||||
if ($PSBoundParameters.ContainsKey('Verbose')) { Set-BaknretDebug }
|
||||
if ($PSBoundParameters.ContainsKey('Verbose')) { Set-BakNRetDebug }
|
||||
|
||||
$script:Config = Get-BaknretConfig -Path $ConfigPath
|
||||
$script:Config = Get-BakNRetConfig -Path $ConfigPath
|
||||
|
||||
function Resolve-ConfigPath {
|
||||
param([string]$Path, [string]$Default)
|
||||
@@ -107,28 +107,28 @@ function Resolve-ConfigPath {
|
||||
if (-not $BackupDir) { $BackupDir = Resolve-ConfigPath -Path $null -Default $script:Config.BackupDir }
|
||||
$logDir = Resolve-ConfigPath -Path $null -Default $script:Config.LogDir
|
||||
$snapshotDir = Resolve-ConfigPath -Path $null -Default $script:Config.SnapshotDir
|
||||
$catalogPath = Resolve-CatalogPath -Configured $script:Config.SoftwareCatalog -Root $PSScriptRoot
|
||||
$catalogPath = Resolve-BakNRetCatalogPath -Configured $script:Config.SoftwareCatalog -Root $PSScriptRoot
|
||||
$manifestPath = Join-Path $BackupDir 'manifest.json'
|
||||
|
||||
$logPath = Start-BaknretLog -Directory $logDir -Prefix 'backup'
|
||||
Write-Log "日志文件：$logPath"
|
||||
Write-Log "备份目录：$BackupDir"
|
||||
Write-Log ("软件名录：{0}{1}" -f $catalogPath, $(if (Test-Path -LiteralPath $catalogPath) { '' } else { '（不存在，将只支持字面路径）' }))
|
||||
$logPath = Start-BakNRetLog -Directory $logDir -Prefix 'backup'
|
||||
Write-BakNRetLog "日志文件：$logPath"
|
||||
Write-BakNRetLog "备份目录：$BackupDir"
|
||||
Write-BakNRetLog ("软件名录：{0}{1}" -f $catalogPath, $(if (Test-Path -LiteralPath $catalogPath) { '' } else { '（不存在，将只支持字面路径）' }))
|
||||
|
||||
if (-not (Test-Administrator)) {
|
||||
Write-Log '建议以管理员身份运行以获取完整的目录访问权限' -Level WARN
|
||||
if (-not (Test-BakNRetAdministrator)) {
|
||||
Write-BakNRetLog '建议以管理员身份运行以获取完整的目录访问权限' -Level WARN
|
||||
}
|
||||
# 同一份备份目录同一时间只允许一个进程操作（见 BakNRet 模块的「运行锁」一节）。
|
||||
# -DryRun 不取锁：它一个字节都不写，没必要被正在跑的备份挡在外面。
|
||||
$runLock = $null
|
||||
if (-not $DryRun) {
|
||||
$runLock = Enter-BaknretRunLock -Directory $BackupDir
|
||||
$runLock = Enter-BakNRetRunLock -Directory $BackupDir
|
||||
if (-not $runLock) {
|
||||
Write-Log ("另一次运行正在进行中（锁文件：{0}，里面写明了持有者）。本次不执行。" -f (Get-BaknretRunLockPath -Directory $BackupDir)) -Level ERROR
|
||||
Stop-BaknretLog
|
||||
Write-BakNRetLog ("另一次运行正在进行中（锁文件：{0}，里面写明了持有者）。本次不执行。" -f (Get-BakNRetRunLockPath -Directory $BackupDir)) -Level ERROR
|
||||
Stop-BakNRetLog
|
||||
exit 1
|
||||
}
|
||||
Write-Log ("已取得运行锁：{0}" -f (Get-BaknretRunLockPath -Directory $BackupDir)) -Level DEBUG
|
||||
Write-BakNRetLog ("已取得运行锁：{0}" -f (Get-BakNRetRunLockPath -Directory $BackupDir)) -Level DEBUG
|
||||
}
|
||||
|
||||
# ============================================================================
|
||||
@@ -137,7 +137,7 @@ if (-not $DryRun) {
|
||||
|
||||
if (-not (Test-Path -LiteralPath $BackupDir)) {
|
||||
New-Item -ItemType Directory -Path $BackupDir -Force | Out-Null
|
||||
Write-Log "创建备份目录: $BackupDir" -Level DEBUG
|
||||
Write-BakNRetLog "创建备份目录: $BackupDir" -Level DEBUG
|
||||
}
|
||||
|
||||
if (-not (Test-Path -LiteralPath $BackupListPath)) {
|
||||
@@ -147,15 +147,15 @@ if (-not (Test-Path -LiteralPath $BackupListPath)) {
|
||||
"# %UserProfile%\.ssh :encrypt`n" +
|
||||
"# 完整语法见 README 与 BackupList.txt 自身的注释。`n"
|
||||
[System.IO.File]::WriteAllText($BackupListPath, $template, [System.Text.UTF8Encoding]::new($true))
|
||||
Write-Log '模板 BackupList.txt 已创建，请编辑后重试。' -Level INFO
|
||||
Stop-BaknretLog
|
||||
Write-BakNRetLog '模板 BackupList.txt 已创建，请编辑后重试。' -Level INFO
|
||||
Stop-BakNRetLog
|
||||
exit 0
|
||||
}
|
||||
|
||||
$tool = Resolve-CompressionTool
|
||||
$tool = Resolve-BakNRetCompressionTool
|
||||
if (-not $tool) {
|
||||
Write-Log '没有找到可用的压缩工具。' -Level ERROR
|
||||
Stop-BaknretLog
|
||||
Write-BakNRetLog '没有找到可用的压缩工具。' -Level ERROR
|
||||
Stop-BakNRetLog
|
||||
exit 1
|
||||
}
|
||||
|
||||
@@ -164,13 +164,13 @@ $toolVersion = try {
|
||||
if ($info.ProductVersion) { $info.ProductVersion } elseif ($info.FileVersion) { $info.FileVersion } else { $null }
|
||||
}
|
||||
catch { $null }
|
||||
Write-Log ("压缩工具：{0}{1}" -f $tool.Name, $(if ($toolVersion) { "（$toolVersion）" } else { '' }))
|
||||
Write-BakNRetLog ("压缩工具：{0}{1}" -f $tool.Name, $(if ($toolVersion) { "（$toolVersion）" } else { '' }))
|
||||
|
||||
$manifest = Read-BaknretManifest -Path $manifestPath
|
||||
$manifest = Read-BakNRetManifest -Path $manifestPath
|
||||
$manifest.compressor = [pscustomobject]@{ name = $tool.Name; command = $tool.Command; extension = $tool.Extension; version = $toolVersion }
|
||||
|
||||
$passwordFile = if ($KeyFile) { $KeyFile } else { $script:Config.Encryption.PasswordFile }
|
||||
$password = Get-BaknretPassword -PasswordFile $passwordFile
|
||||
$password = Get-BakNRetPassword -PasswordFile $passwordFile
|
||||
$encryptAll = [bool]$script:Config.Encryption.Enabled
|
||||
$showToolOutput = (-not $QuietTool) -and ($script:Config.ToolOutput -ne 'quiet')
|
||||
$toolQuietArgument = if ($showToolOutput) { @() } else { @('-bso0', '-bsp0') }
|
||||
@@ -181,11 +181,11 @@ $processed = 0; $skipped = 0; $failed = 0; $planned = 0
|
||||
$securityErrorCount = 0 # 有条目"安全描述符里有读不到的对象"
|
||||
$securityFailed = 0 # 有条目"安全描述符完全没存下来"
|
||||
$failures = @()
|
||||
$freeSpaceGB = Get-BaknretFreeSpaceGB -Path $BackupDir
|
||||
$freeSpaceGB = Get-BakNRetFreeSpaceGB -Path $BackupDir
|
||||
if ($freeSpaceGB -ge 0) {
|
||||
Write-Log ("备份目录所在卷剩余空间：{0} GB" -f $freeSpaceGB)
|
||||
Write-BakNRetLog ("备份目录所在卷剩余空间：{0} GB" -f $freeSpaceGB)
|
||||
if ($freeSpaceGB -lt $script:Config.MinFreeSpaceGB) {
|
||||
Write-Log ("剩余空间低于阈值 {0} GB，大条目可能失败" -f $script:Config.MinFreeSpaceGB) -Level WARN
|
||||
Write-BakNRetLog ("剩余空间低于阈值 {0} GB，大条目可能失败" -f $script:Config.MinFreeSpaceGB) -Level WARN
|
||||
}
|
||||
}
|
||||
|
||||
@@ -282,7 +282,7 @@ function Save-ItemRecord {
|
||||
|
||||
# 压缩 + 校验 + 原子替换；返回 @{ Ok; ExitCode; Warnings; Reason }
|
||||
#
|
||||
# 归档内容由调用方决定：它已经用 New-BaknretArchiveStaging 把每个归档项按"归档内的名字"
|
||||
# 归档内容由调用方决定：它已经用 New-BakNRetArchiveStaging 把每个归档项按"归档内的名字"
|
||||
# 挂进了 $StagingRoot（目录走 junction、文件走硬链接/复制），所以这里只做三件事：
|
||||
# 1. 以暂存目录为工作目录调用压缩工具，把项名加进去；
|
||||
# 2. 用 7z t 校验，并核对多 Slot 条目的每个顶层名字都真的在包里；
|
||||
@@ -376,11 +376,11 @@ function Invoke-BackupItem {
|
||||
Remove-Item -LiteralPath $tempPath -Force -ErrorAction SilentlyContinue
|
||||
return [pscustomobject]@{ Ok = $false; ExitCode = $verifyCode; Warnings = $false; Reason = "归档校验失败（7z t 退出码 $verifyCode），已丢弃临时文件" }
|
||||
}
|
||||
Write-Log '归档校验通过（7z t）' -Level DEBUG
|
||||
Write-BakNRetLog '归档校验通过（7z t）' -Level DEBUG
|
||||
|
||||
# 多个 Slot / 追加项时确认每一个顶层名字都真的进了归档：7z 的"警告"可能只体现在某一部分上
|
||||
if ($SourceItems.Count -gt 1) {
|
||||
$listed = @(Get-ArchiveTopLevelNames -ArchivePath $tempPath -SevenZip $tool.Command -Password $(if ($UseEncryption) { $password } else { $null }))
|
||||
$listed = @(Get-BakNRetArchiveTopLevelNames -ArchivePath $tempPath -SevenZip $tool.Command -Password $(if ($UseEncryption) { $password } else { $null }))
|
||||
if ($listed.Count -gt 0) {
|
||||
$expected = @($SourceItems | ForEach-Object { [string]$_.TopName } | Select-Object -Unique)
|
||||
$absent = @($expected | Where-Object { $_ -notin $listed })
|
||||
@@ -406,7 +406,7 @@ function Invoke-BackupItem {
|
||||
}
|
||||
}
|
||||
|
||||
Move-BaknretArchiveIntoPlace -TempPath $tempPath -DestinationPath $FinalPath
|
||||
Move-BakNRetArchiveIntoPlace -TempPath $tempPath -DestinationPath $FinalPath
|
||||
return [pscustomobject]@{ Ok = $true; ExitCode = 0; Warnings = $warnings; Reason = $null }
|
||||
}
|
||||
catch {
|
||||
@@ -437,7 +437,7 @@ foreach ($planLine in $lines) {
|
||||
if (-not $planItem) { continue }
|
||||
|
||||
$planDisplayPath = $planItem.Path
|
||||
$planResolved = Resolve-BackupEntry -Entry $planItem -CatalogPath $catalogPath -MaxDepth $script:Config.CatalogMaxDepth
|
||||
$planResolved = Resolve-BakNRetBackupEntry -Entry $planItem -CatalogPath $catalogPath -MaxDepth $script:Config.CatalogMaxDepth
|
||||
if (-not $planResolved.BaseName) { continue }
|
||||
if (-not (Test-ItemSelected -DisplayPath $planDisplayPath -BaseName $planResolved.BaseName)) { continue }
|
||||
if ($planResolved.Direction -eq 'restore') { continue }
|
||||
@@ -450,7 +450,7 @@ foreach ($planLine in $lines) {
|
||||
$planSourceFiles = 0
|
||||
$planLatest = $null
|
||||
foreach ($planSource in $planItems) {
|
||||
$planSummary = Get-FolderSummary -FolderPath $planSource.RealPath
|
||||
$planSummary = Get-BakNRetFolderSummary -FolderPath $planSource.RealPath
|
||||
$planSourceBytes += [int64]$planSummary.TotalSize
|
||||
$planSourceFiles += [int]$planSummary.FileCount
|
||||
if ($planSummary.LatestModifiedTime -and (-not $planLatest -or $planSummary.LatestModifiedTime -gt $planLatest)) {
|
||||
@@ -487,10 +487,10 @@ foreach ($planLine in $lines) {
|
||||
}
|
||||
}
|
||||
|
||||
$freeNowGB = Get-BaknretFreeSpaceGB -Path $BackupDir
|
||||
$freeNowGB = Get-BakNRetFreeSpaceGB -Path $BackupDir
|
||||
|
||||
if ($spacePlan.Count -eq 0) {
|
||||
Write-Log '备份前空间预估：本次没有需要重打的条目（源未更新或源不存在），不会写入新归档' -Level INFO
|
||||
Write-BakNRetLog '备份前空间预估：本次没有需要重打的条目（源未更新或源不存在），不会写入新归档' -Level INFO
|
||||
}
|
||||
else {
|
||||
$spacePeak = [double]0
|
||||
@@ -504,33 +504,33 @@ else {
|
||||
$estimateGB = ((($spacePlan | Measure-Object -Property Estimate -Sum).Sum)) / 1GB
|
||||
$existingGB = ((($spacePlan | Measure-Object -Property Existing -Sum).Sum)) / 1GB
|
||||
|
||||
Write-Log '==== 备份前空间预估（只读）====' -Level INFO
|
||||
Write-Log (" 目标卷可用空间：{0} GB" -f $freeNowGB)
|
||||
Write-Log (" 本次要重打 {0} 个条目（另有 {1} 个源未更新会跳过、{2} 个源不存在）" -f $spacePlan.Count, $spaceSkipped, $spaceNoSource)
|
||||
Write-Log (" 新归档合计约 {0} GB；其中会替换掉的旧归档 {1} GB" -f [math]::Round($estimateGB, 2), [math]::Round($existingGB, 2))
|
||||
Write-BakNRetLog '==== 备份前空间预估（只读）====' -Level INFO
|
||||
Write-BakNRetLog (" 目标卷可用空间：{0} GB" -f $freeNowGB)
|
||||
Write-BakNRetLog (" 本次要重打 {0} 个条目（另有 {1} 个源未更新会跳过、{2} 个源不存在）" -f $spacePlan.Count, $spaceSkipped, $spaceNoSource)
|
||||
Write-BakNRetLog (" 新归档合计约 {0} GB；其中会替换掉的旧归档 {1} GB" -f [math]::Round($estimateGB, 2), [math]::Round($existingGB, 2))
|
||||
|
||||
foreach ($plan in ($spacePlan | Sort-Object Estimate -Descending | Select-Object -First 15)) {
|
||||
Write-Log (" - {0,-22} 源 {1,8:N1} MB / {2,6} 文件 现有 {3,7:N1} MB 预估 {4,7:N1} MB" -f `
|
||||
Write-BakNRetLog (" - {0,-22} 源 {1,8:N1} MB / {2,6} 文件 现有 {3,7:N1} MB 预估 {4,7:N1} MB" -f `
|
||||
$plan.Name, ($plan.SourceBytes / 1MB), $plan.Files, ($plan.Existing / 1MB), ($plan.Estimate / 1MB))
|
||||
}
|
||||
if ($spacePlan.Count -gt 15) {
|
||||
Write-Log (" …… 另有 {0} 个条目未逐条列出" -f ($spacePlan.Count - 15))
|
||||
Write-BakNRetLog (" …… 另有 {0} 个条目未逐条列出" -f ($spacePlan.Count - 15))
|
||||
}
|
||||
|
||||
Write-Log (" 预计峰值新增占用：{0} GB（全程净增量 {1} GB）" -f [math]::Round($peakGB, 2), [math]::Round($netGB, 2))
|
||||
Write-BakNRetLog (" 预计峰值新增占用：{0} GB（全程净增量 {1} GB）" -f [math]::Round($peakGB, 2), [math]::Round($netGB, 2))
|
||||
|
||||
if ($freeNowGB -lt 0) {
|
||||
Write-Log ' 结论：读不到目标卷可用空间，请自行确认是否够用' -Level WARN
|
||||
Write-BakNRetLog ' 结论：读不到目标卷可用空间，请自行确认是否够用' -Level WARN
|
||||
}
|
||||
elseif ($peakGB -le $freeNowGB) {
|
||||
Write-Log (" 结论：空间足够（预计用 {0} GB / 可用 {1} GB）" -f [math]::Round($peakGB, 2), $freeNowGB) -Level INFO
|
||||
Write-BakNRetLog (" 结论：空间足够（预计用 {0} GB / 可用 {1} GB）" -f [math]::Round($peakGB, 2), $freeNowGB) -Level INFO
|
||||
}
|
||||
else {
|
||||
Write-Log (" 结论：空间可能不够！预计需要 {0} GB，可用只有 {1} GB，差 {2} GB" -f `
|
||||
Write-BakNRetLog (" 结论：空间可能不够！预计需要 {0} GB，可用只有 {1} GB，差 {2} GB" -f `
|
||||
[math]::Round($peakGB, 2), $freeNowGB, [math]::Round($peakGB - $freeNowGB, 2)) -Level WARN
|
||||
Write-Log ' 仍会继续执行：真正放不下的条目会被逐条目守卫跳过。建议先腾空间，或用 -Only / -Skip 分批备份。' -Level WARN
|
||||
Write-BakNRetLog ' 仍会继续执行：真正放不下的条目会被逐条目守卫跳过。建议先腾空间，或用 -Only / -Skip 分批备份。' -Level WARN
|
||||
}
|
||||
Write-Log '============================' -Level INFO
|
||||
Write-BakNRetLog '============================' -Level INFO
|
||||
}
|
||||
|
||||
# ============================================================================
|
||||
@@ -542,7 +542,7 @@ foreach ($line in $lines) {
|
||||
if (-not $item) { continue }
|
||||
|
||||
$displayPath = $item.Path
|
||||
$resolved = Resolve-BackupEntry -Entry $item -CatalogPath $catalogPath -MaxDepth $script:Config.CatalogMaxDepth
|
||||
$resolved = Resolve-BakNRetBackupEntry -Entry $item -CatalogPath $catalogPath -MaxDepth $script:Config.CatalogMaxDepth
|
||||
|
||||
if (-not $resolved.BaseName) {
|
||||
$record = New-ItemRecord -BaseName ('raw:' + $displayPath) -Source $displayPath -ResolvedSource $displayPath -Phase 'parse'
|
||||
@@ -555,7 +555,7 @@ foreach ($line in $lines) {
|
||||
$sourcePath = [Environment]::ExpandEnvironmentVariables($displayPath)
|
||||
|
||||
if (-not (Test-ItemSelected -DisplayPath $displayPath -BaseName $baseName)) {
|
||||
Write-Log "跳过（未选中）: $displayPath" -Level DEBUG
|
||||
Write-BakNRetLog "跳过（未选中）: $displayPath" -Level DEBUG
|
||||
continue
|
||||
}
|
||||
|
||||
@@ -564,7 +564,7 @@ foreach ($line in $lines) {
|
||||
# 备份列表里写重了会生成两个同名归档、互相覆盖 —— 直接报错，不猜。
|
||||
if ($seenBaseNames.ContainsKey($baseName)) {
|
||||
$reason = "归档名 '$baseName' 与清单中的 '$($seenBaseNames[$baseName])' 重复（由 '$displayPath' 生成），两者会互相覆盖"
|
||||
Write-Log "失败: $displayPath，$reason" -Level ERROR
|
||||
Write-BakNRetLog "失败: $displayPath，$reason" -Level ERROR
|
||||
$record = New-ItemRecord -BaseName $baseName -Source $displayPath -ResolvedSource $sourcePath -Phase 'backup'
|
||||
Save-ItemRecord -Record $record -Action 'failed' -Reason $reason | Out-Null
|
||||
$failed++; $failures += $displayPath
|
||||
@@ -573,7 +573,7 @@ foreach ($line in $lines) {
|
||||
$seenBaseNames[$baseName] = $displayPath
|
||||
|
||||
if ($resolved.Direction -eq 'restore') {
|
||||
Write-Log "跳过（行首 -，仅恢复）: $displayPath" -Level INFO
|
||||
Write-BakNRetLog "跳过（行首 -，仅恢复）: $displayPath" -Level INFO
|
||||
continue
|
||||
}
|
||||
|
||||
@@ -584,12 +584,12 @@ foreach ($line in $lines) {
|
||||
|
||||
# root= 是历史标记：包内的一层目录现在由名录里的 Slot 决定，这里只告警不静默忽略。
|
||||
if (@($item.Flags | Where-Object { $_ -like 'root=*' }).Count -gt 0) {
|
||||
Write-Log "警告: $displayPath 使用了 root= 标记。归档内的一层目录现在由 Slot 决定，该标记已废弃，本次忽略" -Level WARN
|
||||
Write-BakNRetLog "警告: $displayPath 使用了 root= 标记。归档内的一层目录现在由 Slot 决定，该标记已废弃，本次忽略" -Level WARN
|
||||
}
|
||||
|
||||
# 归档内路径冲突：明确失败，绝不把两块内容静默搅进同一棵树
|
||||
if ($resolved.Blocking) {
|
||||
Write-Log "失败: $displayPath，$($resolved.Blocking)" -Level ERROR
|
||||
Write-BakNRetLog "失败: $displayPath，$($resolved.Blocking)" -Level ERROR
|
||||
Save-ItemRecord -Record $record -Action 'failed' -Reason $resolved.Blocking | Out-Null
|
||||
$failed++; $failures += $displayPath
|
||||
continue
|
||||
@@ -604,7 +604,7 @@ foreach ($line in $lines) {
|
||||
else {
|
||||
$planCatalogExcludes = @($resolved.Items | ForEach-Object { @($_.Exclude) } | Where-Object { $_ } | Select-Object -Unique)
|
||||
}
|
||||
Write-BackupEntryPlan -Resolved $resolved -DisplayPath $displayPath `
|
||||
Write-BakNRetBackupEntryPlan -Resolved $resolved -DisplayPath $displayPath `
|
||||
-ListExcludes $planListExcludes -CatalogExcludes $planCatalogExcludes `
|
||||
-ConfigExcludes @($script:Config.DefaultExcludes) -Comment $item.Comment
|
||||
|
||||
@@ -613,26 +613,26 @@ foreach ($line in $lines) {
|
||||
# 但 Items 是给出的（恢复端要靠它把内容还原回原位），备份端由下面的存在性检查统一处理。
|
||||
if ($resolved.Items.Count -eq 0) {
|
||||
$reason = if ($resolved.Error) { $resolved.Error } else { '解析不出任何源路径' }
|
||||
Write-Log "跳过: $displayPath，$reason" -Level WARN
|
||||
Write-BakNRetLog "跳过: $displayPath，$reason" -Level WARN
|
||||
Save-ItemRecord -Record $record -Action 'missing-source' -Reason $reason | Out-Null
|
||||
$skipped++
|
||||
continue
|
||||
}
|
||||
|
||||
# 源存在性检查必须在 Get-FolderSummary / Get-Item 之前：
|
||||
# 源存在性检查必须在 Get-BakNRetFolderSummary / Get-Item 之前：
|
||||
# 两者对不存在的路径要么抛异常、要么返回会误导判断的空摘要。
|
||||
$missingItems = @($resolved.Items | Where-Object { -not (Test-Path -LiteralPath $_.RealPath) })
|
||||
|
||||
if ($missingItems.Count -ge $resolved.Items.Count) {
|
||||
$missingText = @($missingItems | ForEach-Object { $_.RealPath }) -join '；'
|
||||
Write-Log "跳过: $displayPath，源路径不存在" -Level WARN
|
||||
Write-BakNRetLog "跳过: $displayPath，源路径不存在" -Level WARN
|
||||
Save-ItemRecord -Record $record -Action 'missing-source' -Reason ('源路径不存在：' + $missingText) | Out-Null
|
||||
$skipped++
|
||||
continue
|
||||
}
|
||||
|
||||
if ($missingItems.Count -gt 0) {
|
||||
Write-Log ("警告: {0} 有 {1} 个归档项的源路径不存在，本次只打包存在的部分：{2}" -f `
|
||||
Write-BakNRetLog ("警告: {0} 有 {1} 个归档项的源路径不存在，本次只打包存在的部分：{2}" -f `
|
||||
$displayPath, $missingItems.Count, (@($missingItems | ForEach-Object { $_.RealPath }) -join '；')) -Level WARN
|
||||
}
|
||||
|
||||
@@ -640,7 +640,7 @@ foreach ($line in $lines) {
|
||||
$liveItems = @($resolved.Items | Where-Object { Test-Path -LiteralPath $_.RealPath })
|
||||
|
||||
# 归档内的顶层条目名 = 真实存在的归档项在包内的第一层名字（Slot 名 / 源目录名）。
|
||||
# 这里记录可核对的事实，备份成功后还会用 Get-ArchiveTopLevelNames 与归档内容对账。
|
||||
# 这里记录可核对的事实，备份成功后还会用 Get-BakNRetArchiveTopLevelNames 与归档内容对账。
|
||||
$record.roots = @($liveItems | ForEach-Object { $_.TopName } | Select-Object -Unique)
|
||||
|
||||
# 恢复端要知道每个项在归档里是目录还是文件：记在 manifest 里，
|
||||
@@ -654,17 +654,17 @@ foreach ($line in $lines) {
|
||||
|
||||
$primarySource = $liveItems[0].RealPath
|
||||
if ([string]::IsNullOrWhiteSpace($primarySource)) {
|
||||
Write-Log "跳过: $displayPath，无法确定主源路径" -Level WARN
|
||||
Write-BakNRetLog "跳过: $displayPath，无法确定主源路径" -Level WARN
|
||||
Save-ItemRecord -Record $record -Action 'invalid-path' -Reason '归档项没有可用路径' | Out-Null
|
||||
$skipped++
|
||||
continue
|
||||
}
|
||||
|
||||
$summary = Get-FolderSummary -FolderPath $primarySource
|
||||
$summary = Get-BakNRetFolderSummary -FolderPath $primarySource
|
||||
# 从第二个归档项开始累加。刻意不用 `$liveItems[1..($liveItems.Count-1)]`：
|
||||
# 只有一项时 `1..0` 会退化成 `1,0`，把同一份源数两遍（旧实现的隐蔽 bug）。
|
||||
for ($index = 1; $index -lt $liveItems.Count; $index++) {
|
||||
$extra = Get-FolderSummary -FolderPath $liveItems[$index].RealPath
|
||||
$extra = Get-BakNRetFolderSummary -FolderPath $liveItems[$index].RealPath
|
||||
$summary.FileCount += $extra.FileCount
|
||||
$summary.TotalSize += $extra.TotalSize
|
||||
if ($extra.LatestModifiedTime -and $extra.LatestModifiedTime -gt $summary.LatestModifiedTime) {
|
||||
@@ -677,9 +677,9 @@ foreach ($line in $lines) {
|
||||
$archiveExists = Test-Path -LiteralPath $finalPath
|
||||
$archiveItem = if ($archiveExists) { Get-Item -LiteralPath $finalPath } else { $null }
|
||||
|
||||
Write-Log ("开始备份: {0} -> {1}（{2} 个文件，{3} MB）" -f $displayPath, $record.archive, $summary.FileCount, [math]::Round(($summary.TotalSize / 1MB), 2))
|
||||
Write-BakNRetLog ("开始备份: {0} -> {1}（{2} 个文件，{3} MB）" -f $displayPath, $record.archive, $summary.FileCount, [math]::Round(($summary.TotalSize / 1MB), 2))
|
||||
|
||||
# 空目录时 Get-FolderSummary 拿不到任何条目，回退到源自身的修改时间
|
||||
# 空目录时 Get-BakNRetFolderSummary 拿不到任何条目，回退到源自身的修改时间
|
||||
# （源路径上面已经确认存在，这里的 Get-Item 不会再抛异常）
|
||||
$sourceLatest = $summary.LatestModifiedTime
|
||||
if (-not $sourceLatest) {
|
||||
@@ -687,7 +687,7 @@ foreach ($line in $lines) {
|
||||
}
|
||||
|
||||
if (-not $Force -and $archiveItem -and $sourceLatest -and $sourceLatest -le $archiveItem.LastWriteTime) {
|
||||
Write-Log "跳过: $displayPath，源目录未更新" -Level INFO
|
||||
Write-BakNRetLog "跳过: $displayPath，源目录未更新" -Level INFO
|
||||
$record.archiveBytes = $archiveItem.Length
|
||||
Save-ItemRecord -Record $record -Action 'skip-unchanged' -Reason ('源最新修改时间 {0} 不晚于归档时间 {1}' -f $sourceLatest, $archiveItem.LastWriteTime) | Out-Null
|
||||
$skipped++
|
||||
@@ -700,17 +700,17 @@ foreach ($line in $lines) {
|
||||
$archiveGB = $archiveItem.Length / 1GB
|
||||
$estimatedGB = [math]::Min($estimatedGB, $archiveGB * 1.3)
|
||||
}
|
||||
$freeSpaceGB = Get-BaknretFreeSpaceGB -Path $BackupDir
|
||||
$freeSpaceGB = Get-BakNRetFreeSpaceGB -Path $BackupDir
|
||||
if ($freeSpaceGB -ge 0 -and $estimatedGB -gt 0 -and $freeSpaceGB -lt $estimatedGB) {
|
||||
$reason = ('剩余空间 {0} GB 不足以写入预估 {1} GB 的新归档' -f $freeSpaceGB, [math]::Round($estimatedGB, 2))
|
||||
Write-Log "失败: $displayPath，$reason" -Level ERROR
|
||||
Write-BakNRetLog "失败: $displayPath，$reason" -Level ERROR
|
||||
Save-ItemRecord -Record $record -Action 'failed' -Reason $reason | Out-Null
|
||||
$failed++; $failures += $displayPath
|
||||
continue
|
||||
}
|
||||
|
||||
if ($DryRun) {
|
||||
Write-Log ("[试运行] 将打包 {0} -> {1}" -f $sourcePath, $finalPath) -Level INFO
|
||||
Write-BakNRetLog ("[试运行] 将打包 {0} -> {1}" -f $sourcePath, $finalPath) -Level INFO
|
||||
$record.reason = '试运行，未执行压缩'
|
||||
Save-ItemRecord -Record $record -Action 'planned' -Reason '试运行，未执行压缩' | Out-Null
|
||||
$planned++
|
||||
@@ -733,19 +733,19 @@ foreach ($line in $lines) {
|
||||
@($resolved.Items | ForEach-Object { @($_.Exclude) } | Where-Object { $_ } | Select-Object -Unique)
|
||||
}
|
||||
$allPatterns = @($script:Config.DefaultExcludes) + $patternSource
|
||||
$scopeMap = Split-BaknretPatternScope -Items $liveItems -Patterns $allPatterns
|
||||
$scopeMap = Split-BakNRetPatternScope -Items $liveItems -Patterns $allPatterns
|
||||
|
||||
$excludeLists = @()
|
||||
$excludeError = $null
|
||||
for ($index = 0; $index -lt $liveItems.Count; $index++) {
|
||||
$expanded = Get-BaknretExcludeArgument -Item $liveItems[$index] -Patterns @($scopeMap[$index])
|
||||
$expanded = Get-BakNRetExcludeArgument -Item $liveItems[$index] -Patterns @($scopeMap[$index])
|
||||
if ($expanded.Error) { $excludeError = $expanded.Error }
|
||||
$excludeLists += , @($expanded.Arguments)
|
||||
}
|
||||
$effectiveExcludes = @(Merge-BaknretExcludeArgument -ArgumentLists $excludeLists)
|
||||
$effectiveExcludes = @(Merge-BakNRetExcludeArgument -ArgumentLists $excludeLists)
|
||||
|
||||
if ($excludeError) {
|
||||
Write-Log "失败: $displayPath，$excludeError" -Level ERROR
|
||||
Write-BakNRetLog "失败: $displayPath，$excludeError" -Level ERROR
|
||||
Save-ItemRecord -Record $record -Action 'failed' -Reason $excludeError | Out-Null
|
||||
$failed++; $failures += $displayPath
|
||||
continue
|
||||
@@ -765,7 +765,7 @@ foreach ($line in $lines) {
|
||||
# 挂进暂存目录（junction / 硬链接），再让压缩工具以暂存目录为工作目录打包。
|
||||
$stagingRoot = $null
|
||||
try {
|
||||
$stagingRoot = New-BaknretArchiveStaging -Items $liveItems
|
||||
$stagingRoot = New-BakNRetArchiveStaging -Items $liveItems
|
||||
$result = Invoke-BackupItem -SourceItems $liveItems -StagingRoot $stagingRoot `
|
||||
-FinalPath $finalPath -ExcludePatterns $effectiveExcludes -UseEncryption:$useEncryption `
|
||||
-ProtectPrevious:$protectPrevious -AcceptWarnings:$AcceptWarnings
|
||||
@@ -774,7 +774,7 @@ foreach ($line in $lines) {
|
||||
$result = [pscustomobject]@{ Ok = $false; ExitCode = $null; Warnings = $false; Reason = "准备归档内容失败：$_" }
|
||||
}
|
||||
finally {
|
||||
Remove-BaknretArchiveStaging -Root $stagingRoot
|
||||
Remove-BakNRetArchiveStaging -Root $stagingRoot
|
||||
}
|
||||
|
||||
$record.exitCode = $result.ExitCode
|
||||
@@ -783,7 +783,7 @@ foreach ($line in $lines) {
|
||||
$record.durationSec = [math]::Round(((Get-Date) - $startedAt).TotalSeconds, 1)
|
||||
|
||||
if (-not $result.Ok) {
|
||||
Write-Log "备份失败: $displayPath，$($result.Reason)" -Level ERROR
|
||||
Write-BakNRetLog "备份失败: $displayPath，$($result.Reason)" -Level ERROR
|
||||
Save-ItemRecord -Record $record -Action 'failed' -Reason $result.Reason | Out-Null
|
||||
$failed++; $failures += $displayPath
|
||||
continue
|
||||
@@ -792,11 +792,11 @@ foreach ($line in $lines) {
|
||||
$written = Get-Item -LiteralPath $finalPath
|
||||
$record.archiveBytes = $written.Length
|
||||
if ($result.Warnings) {
|
||||
Write-Log "备份成功（压缩工具报告了警告，可能有文件被占用而没打进归档）: $displayPath" -Level WARN
|
||||
Write-Log ' 该归档在 manifest 里标记为 warnings=true；如果以后现有归档是完整的，会拒绝被它覆盖' -Level WARN
|
||||
Write-BakNRetLog "备份成功（压缩工具报告了警告，可能有文件被占用而没打进归档）: $displayPath" -Level WARN
|
||||
Write-BakNRetLog ' 该归档在 manifest 里标记为 warnings=true；如果以后现有归档是完整的，会拒绝被它覆盖' -Level WARN
|
||||
}
|
||||
else {
|
||||
Write-Log "备份成功: $baseName" -Level INFO
|
||||
Write-BakNRetLog "备份成功: $baseName" -Level INFO
|
||||
}
|
||||
|
||||
# ------------------------------------------------------------------
|
||||
@@ -813,9 +813,9 @@ foreach ($line in $lines) {
|
||||
$sidecarName = "$baseName.acl.json"
|
||||
$sidecarPath = Join-Path $BackupDir $sidecarName
|
||||
try {
|
||||
$capture = Get-BaknretSecurityRecords -Items $liveItems -ScopeMap $scopeMap -Mode $securityMode `
|
||||
$capture = Get-BakNRetSecurityRecords -Items $liveItems -ScopeMap $scopeMap -Mode $securityMode `
|
||||
-IncludeSacl:([bool]$script:Config.Security.IncludeSacl)
|
||||
Save-BaknretSecuritySidecar -Path $sidecarPath -Records $capture.Records -Mode $securityMode `
|
||||
Save-BakNRetSecuritySidecar -Path $sidecarPath -Records $capture.Records -Mode $securityMode `
|
||||
-IncludeSacl:([bool]$script:Config.Security.IncludeSacl) `
|
||||
-Errors $capture.Errors -Scanned $capture.Scanned | Out-Null
|
||||
|
||||
@@ -827,25 +827,25 @@ foreach ($line in $lines) {
|
||||
errors = $capture.Errors
|
||||
capturedAt = (Get-Date).ToString('o')
|
||||
}
|
||||
Write-Log ("安全描述符：{0} 个对象写进 {1}（扫描 {2} 个，读不到 {3} 个）" -f `
|
||||
Write-BakNRetLog ("安全描述符：{0} 个对象写进 {1}（扫描 {2} 个，读不到 {3} 个）" -f `
|
||||
$capture.Kept, $sidecarName, $capture.Scanned, $capture.Errors) -Level INFO
|
||||
|
||||
if ($capture.Errors -gt 0) {
|
||||
$securityErrorCount++
|
||||
$unreadable = @($capture.Records | Where-Object { $_.e } | Select-Object -First 3 -ExpandProperty p)
|
||||
Write-Log (" {0} 个对象的安全描述符读不到（恢复后它们的属主/ACL 会是新建对象的默认值），例如：{1}" -f `
|
||||
Write-BakNRetLog (" {0} 个对象的安全描述符读不到（恢复后它们的属主/ACL 会是新建对象的默认值），例如：{1}" -f `
|
||||
$capture.Errors, ($unreadable -join '、')) -Level WARN
|
||||
}
|
||||
}
|
||||
catch {
|
||||
$securityFailed++
|
||||
Write-Log "安全描述符采集/写盘失败：$displayPath —— $_" -Level WARN
|
||||
Write-BakNRetLog "安全描述符采集/写盘失败：$displayPath —— $_" -Level WARN
|
||||
$record.security = [ordered]@{ file = $sidecarName; error = "$_" }
|
||||
if ([bool]$script:Config.Security.FailOnError) { $securityFatal = $true }
|
||||
}
|
||||
|
||||
if ($securityFatal) {
|
||||
Write-Log "失败: $displayPath，归档已替换，但安全描述符没能存下来（Security.FailOnError = \$true）" -Level ERROR
|
||||
Write-BakNRetLog "失败: $displayPath，归档已替换，但安全描述符没能存下来（Security.FailOnError = \$true）" -Level ERROR
|
||||
Save-ItemRecord -Record $record -Action 'failed' -Reason '归档已替换，但安全描述符没能存下来' | Out-Null
|
||||
$failed++; $failures += $displayPath
|
||||
continue
|
||||
@@ -854,7 +854,7 @@ foreach ($line in $lines) {
|
||||
|
||||
if ($Hash -or $script:Config.ComputeHash) {
|
||||
$record.sha256 = (Get-FileHash -LiteralPath $finalPath -Algorithm SHA256).Hash
|
||||
Write-Log "SHA256: $($record.sha256)" -Level DEBUG
|
||||
Write-BakNRetLog "SHA256: $($record.sha256)" -Level DEBUG
|
||||
}
|
||||
|
||||
if ($Snapshot -or $script:Config.Snapshot.Enabled) {
|
||||
@@ -863,7 +863,7 @@ foreach ($line in $lines) {
|
||||
$targetDir = Split-Path -Parent $target
|
||||
if (-not (Test-Path -LiteralPath $targetDir)) { New-Item -ItemType Directory -Path $targetDir -Force | Out-Null }
|
||||
Copy-Item -LiteralPath $finalPath -Destination $target -Force
|
||||
Write-Log "已留存快照: $target" -Level INFO
|
||||
Write-BakNRetLog "已留存快照: $target" -Level INFO
|
||||
}
|
||||
|
||||
Save-ItemRecord -Record $record -Action 'backed-up' -Reason $null -ArchiveWarnings $result.Warnings | Out-Null
|
||||
@@ -875,17 +875,17 @@ foreach ($line in $lines) {
|
||||
# ============================================================================
|
||||
|
||||
if ($DryRun) {
|
||||
Write-Log '试运行：manifest 与归档都不会被写入' -Level INFO
|
||||
Write-BakNRetLog '试运行：manifest 与归档都不会被写入' -Level INFO
|
||||
}
|
||||
else {
|
||||
# manifest 里写了 archive 的记录，磁盘上就必须真有那个文件
|
||||
$clearedArchiveFields = Sync-BaknretManifestArchive -Manifest $manifest -BackupDir $BackupDir
|
||||
$clearedArchiveFields = Sync-BakNRetManifestArchive -Manifest $manifest -BackupDir $BackupDir
|
||||
if ($clearedArchiveFields.Count -gt 0) {
|
||||
Write-Log ("已清空 {0} 条记录里指向不存在归档的 archive 字段：{1}" -f $clearedArchiveFields.Count, ($clearedArchiveFields -join '、')) -Level WARN
|
||||
Write-BakNRetLog ("已清空 {0} 条记录里指向不存在归档的 archive 字段：{1}" -f $clearedArchiveFields.Count, ($clearedArchiveFields -join '、')) -Level WARN
|
||||
}
|
||||
|
||||
Write-BaknretManifest -Path $manifestPath -Manifest $manifest | Out-Null
|
||||
Write-Log "manifest 已更新：$manifestPath" -Level DEBUG
|
||||
Write-BakNRetManifest -Path $manifestPath -Manifest $manifest | Out-Null
|
||||
Write-BakNRetLog "manifest 已更新：$manifestPath" -Level DEBUG
|
||||
}
|
||||
|
||||
# 孤儿归档审计：磁盘上有、但**当前清单里任何条目都不指向**的归档。
|
||||
@@ -906,37 +906,37 @@ if (-not $DryRun -and $Only.Count -eq 0 -and $Skip.Count -eq 0) {
|
||||
Where-Object { $_.Extension.ToLower() -in @('.7z', '.rar', '.zip', '.tar') -and -not $known.ContainsKey($_.BaseName) })
|
||||
|
||||
if ($orphanArchives.Count -gt 0) {
|
||||
Write-Log ("发现 {0} 个孤儿归档（当前清单里没有任何条目指向，恢复不到，注意别误删）：" -f $orphanArchives.Count) -Level WARN
|
||||
Write-BakNRetLog ("发现 {0} 个孤儿归档（当前清单里没有任何条目指向，恢复不到，注意别误删）：" -f $orphanArchives.Count) -Level WARN
|
||||
foreach ($orphan in $orphanArchives) {
|
||||
$inManifest = $manifest.items.Contains($orphan.BaseName)
|
||||
Write-Log (" - {0}（{1:N1} MB，{2}）{3}" -f $orphan.Name, ($orphan.Length / 1MB), $orphan.LastWriteTime, $(if ($inManifest) { '；manifest 里还留着它的历史记录，但清单里已经没有了' } else { '' })) -Level WARN
|
||||
Write-BakNRetLog (" - {0}（{1:N1} MB，{2}）{3}" -f $orphan.Name, ($orphan.Length / 1MB), $orphan.LastWriteTime, $(if ($inManifest) { '；manifest 里还留着它的历史记录，但清单里已经没有了' } else { '' })) -Level WARN
|
||||
}
|
||||
}
|
||||
else {
|
||||
Write-Log '孤儿归档审计：没有发现（所有归档都有清单条目指向）' -Level DEBUG
|
||||
Write-BakNRetLog '孤儿归档审计：没有发现（所有归档都有清单条目指向）' -Level DEBUG
|
||||
}
|
||||
}
|
||||
|
||||
if ($failures.Count -gt 0) {
|
||||
Write-Log '失败条目：' -Level ERROR
|
||||
foreach ($failure in $failures) { Write-Log " - $failure" -Level ERROR }
|
||||
Write-BakNRetLog '失败条目：' -Level ERROR
|
||||
foreach ($failure in $failures) { Write-BakNRetLog " - $failure" -Level ERROR }
|
||||
}
|
||||
|
||||
if ($securityFailed -gt 0) {
|
||||
Write-Log ("有 {0} 个条目的安全描述符完全没能存下来（manifest 的 security.error 里有原文）" -f $securityFailed) -Level WARN
|
||||
Write-BakNRetLog ("有 {0} 个条目的安全描述符完全没能存下来（manifest 的 security.error 里有原文）" -f $securityFailed) -Level WARN
|
||||
}
|
||||
if ($securityErrorCount -gt 0) {
|
||||
Write-Log ("有 {0} 个条目存在'读不到安全描述符'的对象；恢复后这些对象的属主/ACL 是新建对象的默认值，可查 manifest 的 security.errors" -f $securityErrorCount) -Level WARN
|
||||
Write-BakNRetLog ("有 {0} 个条目存在'读不到安全描述符'的对象；恢复后这些对象的属主/ACL 是新建对象的默认值，可查 manifest 的 security.errors" -f $securityErrorCount) -Level WARN
|
||||
}
|
||||
|
||||
$summaryText = "备份完成。成功: $processed, 跳过: $skipped, 失败: $failed"
|
||||
if ($DryRun) { $summaryText += ", 试运行计划: $planned" }
|
||||
Write-Log $summaryText -Level INFO
|
||||
Write-BakNRetLog $summaryText -Level INFO
|
||||
|
||||
$logPath = Get-BaknretLogPath
|
||||
if ($logPath) { Write-Log "日志已写入：$logPath" -Level INFO }
|
||||
Exit-BaknretRunLock -Lock $runLock
|
||||
Stop-BaknretLog
|
||||
$logPath = Get-BakNRetLogPath
|
||||
if ($logPath) { Write-BakNRetLog "日志已写入：$logPath" -Level INFO }
|
||||
Exit-BakNRetRunLock -Lock $runLock
|
||||
Stop-BakNRetLog
|
||||
|
||||
if ($failed -gt 0) { exit 1 }
|
||||
exit 0
|
||||
Reference in new issue
Block a user