From 16983fbd21533bf010a8001e694fe4456c922446 Mon Sep 17 00:00:00 2001
From: Markus Fleschutz <markus.fleschutz@atcsim.de>
Date: Thu, 25 Jan 2024 15:44:54 +0100
Subject: [PATCH] Updated check-xml-file.ps1 and check-xml-files.ps1
---
scripts/check-xml-file.ps1 | 1 +
scripts/check-xml-files.ps1 | 14 +++++++-------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/scripts/check-xml-file.ps1 b/scripts/check-xml-file.ps1
index 97bdd0d6..7ca94cfc 100755
--- a/scripts/check-xml-file.ps1
+++ b/scripts/check-xml-file.ps1
@@ -27,6 +27,7 @@ try {
$ReaderSettings.ValidationType = [System.Xml.ValidationType]::Schema
$ReaderSettings.ValidationFlags = [System.Xml.Schema.XmlSchemaValidationFlags]::ProcessInlineSchema -bor [System.Xml.Schema.XmlSchemaValidationFlags]::ProcessSchemaLocation
$ReaderSettings.add_ValidationEventHandler({ $script:ErrorCount++ })
+ $ReaderSettings.DtdProcessing = [System.Xml.DtdProcessing]::Parse
$Reader = [System.Xml.XmlReader]::Create($XmlFile.FullName, $ReaderSettings)
while ($Reader.Read()) { }
$Reader.Close()
diff --git a/scripts/check-xml-files.ps1 b/scripts/check-xml-files.ps1
index 770e38d0..d78df8b9 100755
--- a/scripts/check-xml-files.ps1
+++ b/scripts/check-xml-files.ps1
@@ -2,13 +2,13 @@
.SYNOPSIS
Checks all XML files in a directory tree
.DESCRIPTION
- This PowerShell script verifies each XML file (with suffix .xml) in the given directory tree for validity.
+ This PowerShell script verifies any XML file (with suffix .xml) in the given directory tree for validity.
.PARAMETER path
Specifies the path to the directory tree (current working dir by default)
.EXAMPLE
PS> ./check-xml-files.ps1 C:\Windows
...
- ✔️ Checked 3387 XML files within 📂C:\Windows in 174 sec
+ ✔️ Checked 3387 XML files (2462 invalid, 925 valid) within 📂C:\Windows in 116 sec
.LINK
https://github.com/fleschutz/PowerShell
.NOTES
@@ -19,19 +19,19 @@ param([string]$path = "$PWD")
try {
$stopWatch = [system.diagnostics.stopwatch]::startNew()
-
$path = Resolve-Path "$path"
- [int]$numXmlFiles = 0
+ Write-Progress "Scanning any XML file within $path..."
+ [int]$valid = [int]$invalid = 0
- Write-Progress "Scanning all XML files within $path..."
Get-ChildItem -path "$path" -attributes !Directory -recurse -force | Where-Object { $_.Name -like "*.xml" } | Foreach-Object {
& $PSScriptRoot/check-xml-file.ps1 "$($_.FullName)"
- $numXmlFiles++
+ if ($lastExitCode -eq 0) { $valid++ } else { $invalid++ }
}
Write-Progress -completed "Done."
+ [int]$total = $valid + $invalid
[int]$elapsed = $stopWatch.Elapsed.TotalSeconds
- "✔️ Checked $numXmlFiles XML files within 📂$path in $elapsed sec"
+ "✔️ Checked $total XML files ($invalid invalid, $valid valid) within 📂$path in $elapsed sec"
exit 0 # success
} catch {
"⚠️ Error in line $($_.InvocationInfo.ScriptLineNumber): $($Error[0])"