Sitelet https://github.com/microsoft/unitysetup.powershell/pull/242/files
Skip to content

Release 5.5.151 #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Josh Wittner (jwittner) merged 4 commits into from
Dec 28, 2022
Merged

Release 5.5.151 #242

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7c8ee2a
Catch json parse error, generalize to hashtable to bypass key overlap…
jwittner Aug 4, 2022
0614dc7
Merge pull request #238 from jwittner/fix/moduleJsonVersionSearch
jwittner Aug 4, 2022
e101fff
Update filters for asset gathering
jwittner Oct 20, 2022
d2cbd09
Merge pull request #240 from jwittner/fix/metaFileIntegrityAssetFilters
jwittner Oct 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 38 additions & 20 deletions UnitySetup/UnitySetup.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1245,16 +1245,20 @@ function Get-UnitySetupInstanceVersion {

# Try to look in the modules.json file for installer paths that contain version info
if ( Test-Path "$path\modules.json" -PathType Leaf ) {
try {
Write-Verbose "Searching $path\modules.json for module versions"
$table = (Get-Content "$path\modules.json" -Raw) | ConvertFrom-Json -AsHashtable

Write-Verbose "Searching $path\modules.json for module versions"
$modules = (Get-Content "$path\modules.json" -Raw) | ConvertFrom-Json

foreach ( $module in $modules ) {
Write-Verbose "`tTesting DownloadUrl $($module.DownloadUrl)"
if ( $module.DownloadUrl -notmatch "(\d+)\.(\d+)\.(\d+)([fpab])(\d+)" ) { continue; }
foreach ( $url in $table.downloadUrl ) {
Write-Debug "`tTesting DownloadUrl $url"
if ( $url -notmatch "(\d+)\.(\d+)\.(\d+)([fpab])(\d+)" ) { continue; }

Write-Verbose "`tFound version!"
return [UnityVersion]$Matches[0]
Write-Verbose "`tFound version!"
return [UnityVersion]$Matches[0]
}
}
catch {
Write-Verbose "Error parsing $path\modules.json:`n`t$_"
}
}

Expand Down Expand Up @@ -1464,6 +1468,9 @@ function Test-UnityProjectInstanceMetaFileIntegrity {
}
}

# Derived from https://docs.unity3d.com/Manual/SpecialFolders.html
$unityAssetExcludes = @('.*', '*~', 'cvs', '*.tmp')

foreach ( $p in $Project) {

$testResult = $true
Expand All @@ -1472,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";
Expand All @@ -1503,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";
Expand All @@ -1537,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
Expand All @@ -1553,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);
Expand All @@ -1582,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 {
Expand Down