Merge pull request #240 from jwittner/fix/metaFileIntegrityAssetFilters

Update filters for asset gathering

Author: jwittner

UnitySetup/UnitySetup.psm1

@@ -1468,6 +1468,9 @@ function Test-UnityProjectInstanceMetaFileIntegrity {
             }
         }
 
+        # Derived from https://docs.unity3d.com/Manual/SpecialFolders.html
+        $unityAssetExcludes = @('.*', '*~', 'cvs', '*.tmp')
+
         foreach ( $p in $Project) {
 
             $testResult = $true
@@ -1476,17 +1479,20 @@ function Test-UnityProjectInstanceMetaFileIntegrity {
             $assetDir = Join-Path $p.Path "Assets"
 
             # get all the directories under assets
-            [System.IO.DirectoryInfo[]]$dirs = Get-ChildItem -Path "$assetDir/*" -Recurse -Directory -Exclude '.*'
+            [System.IO.DirectoryInfo[]]$dirs = 
+                Get-ChildItem -Path "$assetDir/*" -Recurse -Directory -Exclude $unityAssetExcludes
 
             Write-Verbose "Testing asset directories for missing meta files..."
             [float]$progressCounter = 0
             foreach ($dir in $dirs) {
 
+                ++$progressCounter
                 $progress = @{
                     'Activity'        = "Testing directories for missing meta files"
-                    'Status'          = $dir
-                    'PercentComplete' = (((++$progressCounter) / $dirs.Length) * 100)
+                    'Status'          = "$progressCounter / $($dirs.Length) - $dir"
+                    'PercentComplete' = (($progressCounter / $dirs.Length) * 100)
                 }
+                Write-Debug $progress.Status
                 Write-Progress @progress
 
                 $testPath = "$($dir.FullName).meta";
@@ -1507,20 +1513,24 @@ function Test-UnityProjectInstanceMetaFileIntegrity {
             if (-not $testResult) { $false; continue; }
 
             # get all the non-meta files under assets
-            [System.IO.FileInfo[]]$files = Get-ChildItem -Path "$assetDir/*" -Exclude '.*', '*.meta' -File
+            $unityAssetFileExcludes = $unityAssetExcludes + '*.meta'
+            [System.IO.FileInfo[]]$files = Get-ChildItem -Path "$assetDir/*" -Exclude $unityAssetFileExcludes -File
             foreach ($dir in $dirs) {
-                $files += Get-ChildItem -Path "$($dir.FullName)/*" -Exclude '.*', '*.meta' -File
+                $files += Get-ChildItem -Path "$($dir.FullName)/*" -Exclude $unityAssetFileExcludes -File
             }
 
             Write-Verbose "Testing asset files for missing meta files..."
             $progressCounter = 0
             foreach ( $file in $files ) {
 
+                ++$progressCounter
                 $progress = @{
                     'Activity'        = "Testing files for missing meta files"
-                    'Status'          = $file
-                    'PercentComplete' = (((++$progressCounter) / $files.Length) * 100)
+                    'Status'          = "$progressCounter / $($files.Length) - $file"
+                    'PercentComplete' = (($progressCounter / $files.Length) * 100)
+                
                 }
+                Write-Debug $progress.Status
                 Write-Progress @progress
 
                 $testPath = "$($file.FullName).meta";
@@ -1541,7 +1551,7 @@ function Test-UnityProjectInstanceMetaFileIntegrity {
             if (-not $testResult) { $false; continue; }
 
             $metaFileSearchArgs = @{
-                'Exclude' = '.*'
+                'Exclude' = $unityAssetExcludes
                 'Include' = '*.meta'
                 'File'    = $true
                 'Force'   = $true # Ensure we include hidden meta files
@@ -1557,11 +1567,13 @@ function Test-UnityProjectInstanceMetaFileIntegrity {
             $progressCounter = 0
             foreach ($metaFile in $metaFiles) {
 
+                ++$progressCounter
                 $progress = @{
                     'Activity'        = "Testing meta files for missing assets"
-                    'Status'          = $metaFile
-                    'PercentComplete' = (((++$progressCounter) / $metaFiles.Length) * 100)
+                    'Status'          = "$progressCounter / $($metaFiles.Length) - $metaFile"
+                    'PercentComplete' = (($progressCounter / $metaFiles.Length) * 100)
                 }
+                Write-Debug $progress.Status
                 Write-Progress @progress
 
                 $testPath = $metaFile.FullName.SubString(0, $metaFile.FullName.Length - $metaFile.Extension.Length);
@@ -1586,11 +1598,13 @@ function Test-UnityProjectInstanceMetaFileIntegrity {
             $progressCounter = 0
             foreach ($metaFile in $metaFiles) {
 
+                ++$progressCounter
                 $progress = @{
                     'Activity'        = "Testing meta files for guid collisions"
-                    'Status'          = $metaFile
-                    'PercentComplete' = (((++$progressCounter) / $metaFiles.Length) * 100)
+                    'Status'          = "$progressCounter / $($metaFiles.Length) - $metaFile"
+                    'PercentComplete' = (($progressCounter / $metaFiles.Length) * 100)
                 }
+                Write-Debug $progress.Status
                 Write-Progress @progress
 
                 try {