diff --git a/Restore.ps1 b/Restore.ps1 index 660cd90..924e020 100644 --- a/Restore.ps1 +++ b/Restore.ps1 @@ -500,20 +500,6 @@ if (-not (Test-Path -LiteralPath $BackupListPath)) { exit 0 } -function Test-EntrySelected { - param([string]$DisplayPath, [string]$BaseName) - if ($Only.Count -gt 0) { - $matched = $false - foreach ($pattern in $Only) { - if ($DisplayPath -like $pattern -or $BaseName -like $pattern) { $matched = $true; break } - } - if (-not $matched) { return $false } - } - foreach ($pattern in $Skip) { - if ($DisplayPath -like $pattern -or $BaseName -like $pattern) { return $false } - } - return $true -} # ============================================================================ # 主流程 @@ -542,7 +528,7 @@ foreach ($line in $lines) { $baseName = $resolved.BaseName if (-not $baseName) { $stats.skipped++; continue } - if (-not (Test-EntrySelected -DisplayPath $displayPath -BaseName $baseName)) { continue } + if (-not (Test-BakNRetItemSelected -DisplayPath $displayPath -BaseName $baseName -Only $Only -Skip $Skip)) { continue } if ($resolved.Direction -eq 'backup') { # 仅备份的条目照样要登记归档名:审计要能看出"这个归档是有主的",