xstefen/winutil
1
0
Fork 0
mirror of https://github.com/ChrisTitusTech/winutil.git synced 2024-11-14 14:45:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix Excluding Logic for Preprocessor (#2813)

Browse Source 
This commit should fix issue #2795 reported by @CodingWonders
This commit is contained in:
Mr.k 2024-10-01 23:21:49 +03:00 committed by GitHub
parent 869071783c
commit 806cbd021a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
tools/Invoke-Preprocessing.ps1
View File

@ -72,80 +72,45 @@ function Invoke-Preprocessing {
throw "[Invoke-Preprocessing] Invalid Paramter Value for 'WorkingDir', passed value: '$WorkingDir'. Either the path is a File or Non-Existing/Invlid, please double check your code." throw "[Invoke-Preprocessing] Invalid Paramter Value for 'WorkingDir', passed value: '$WorkingDir'. Either the path is a File or Non-Existing/Invlid, please double check your code."
} }
$count = $ExcludedFiles.Count $InternalExcludedFiles = [System.Collections.Generic.List[string]]::new($ExcludedFiles.Count)
ForEach ($excludedFile in $ExcludedFiles) {
# Make sure there's a * at the end of folders in ExcludedFiles list $InternalExcludedFiles.Add($excludedFile) | Out-Null
for ($i = 0; $i -lt $count; $i++) {
$excludedFile = $ExcludedFiles[$i]
$isFolder = ($excludedFile) -match '\\$'
if ($isFolder) { $ExcludedFiles[$i] = $excludedFile + '*' }
} }
# Validate the ExcludedFiles List before continuing on, # Validate the ExcludedItems List before continuing on,
# that's if there's a list in the first place, and '-SkipExcludedFilesValidation' was not provided. # that's if there's a list in the first place, and '-SkipInternalExcludedFilesValidation' was not provided.
if (-not $SkipExcludedFilesValidation) { if ($ExcludedFiles.Count -gt 0) {
for ($i = 0; $i -lt $count; $i++) { ForEach ($excludedFile in $ExcludedFiles) {
$excludedFile = $ExcludedFiles[$i]
$filePath = "$(($WorkingDir -replace ('\\$', '')) + '\' + ($excludedFile -replace ('\.\\', '')))" $filePath = "$(($WorkingDir -replace ('\\$', '')) + '\' + ($excludedFile -replace ('\.\\', '')))"
$files = Get-ChildItem -Recurse -Path "$filePath" -File -Force
# Handle paths with wildcards in a different implementation if ($files.Count -gt 0) {
$matches = ($filePath) -match '^.*?\*' ForEach ($file in $files) {
$InternalExcludedFiles.Add("$($file.FullName)") | Out-Null
if ($matches) {
if (-NOT (Get-ChildItem -Recurse -Path "$filePath" -File -Force)) {
$failedFilesList += "'$filePath', "
}
} else {
if (-NOT (Test-Path -Path "$filePath")) {
$failedFilesList += "'$filePath', "
}
} }
} else { $failedFilesList += "'$filePath', " }
} }
$failedFilesList = $failedFilesList -replace (',\s*$', '') $failedFilesList = $failedFilesList -replace (',\s*$', '')
if (-NOT $failedFilesList -eq "") { if ((-not $failedFilesList -eq "") -and (-not $SkipExcludedFilesValidation)) {
throw "[Invoke-Preprocessing] One or more File Paths and/or File Patterns were not found, you can use '-SkipExcludedFilesValidation' switch to skip this check, the failed to validate are: $failedFilesList" throw "[Invoke-Preprocessing] One or more File Paths and/or File Patterns were not found, you can use '-SkipExcludedFilesValidation' switch to skip this check, the failed to validate are: $failedFilesList"
} }
} }
# Get Files List # Get Files List
[System.Collections.ArrayList]$files = Get-ChildItem $WorkingDir -Recurse -Exclude $ExcludedFiles -File -Force [System.Collections.ArrayList]$files = Get-ChildItem -LiteralPath $WorkingDir -Recurse -Exclude $InternalExcludedFiles -File -Force
$numOfFiles = $files.Count
# Only keep the 'FullName' Property for every entry in the list # Only keep the 'FullName' Property for every entry in the list
for ($i = 0; $i -lt $numOfFiles; $i++) { for ($i = 0; $i -lt $files.Count; $i++) {
$file = $files[$i] $file = $files[$i]
$files[$i] = $file.FullName $files[$i] = $file.FullName
} }
# If a file(s) are found in Exclude List, # If a file(s) are found in Exclude List,
# Remove the file from files list. # Remove the file from files list.
for ($j = 0; $j -lt $excludedFiles.Count; $j++) { ForEach ($excludedFile in $InternalExcludedFiles) {
# Prepare some variables $index = $files.IndexOf("$excludedFile")
$excluded = $excludedFiles[$j]
$pathToFind = ($excluded) -replace ('^\.\\', '')
$pathToFind = $WorkingDir + '\' + $pathToFind
$index = -1 # reset index on every iteration
# Handle paths with wildcards in a different implementation
$matches = ($pathToFind) -match '^.*?\*'
if ($matches) {
$filesToCheck = Get-ChildItem -Recurse -Path "$pathToFind" -File -Force
if ($filesToCheck) {
for ($k = 0; $k -lt $filesToCheck.Count; $k++) {
$fileToCheck = $filesToCheck[$k]
$index = $files.IndexOf("$fileToCheck")
if ($index -ge 0) { $files.RemoveAt($index) } if ($index -ge 0) { $files.RemoveAt($index) }
} }
}
} else {
$index = $files.IndexOf("$pathToFind")
if ($index -ge 0) { $files.RemoveAt($index) }
}
}
# Make sure 'numOfFiles' is synced with the actual Number of Files found in '$files'
# This's done because previous may or may not edit the files list, so we should update it
$numOfFiles = $files.Count $numOfFiles = $files.Count
if ($numOfFiles -eq 0) { if ($numOfFiles -eq 0) {