From d01fdc3951f74c137a51822152f14bdb07a21237 Mon Sep 17 00:00:00 2001
From: Howard Wu <HowardWu20@outlook.com>
Date: Mon, 27 Mar 2023 17:53:24 +0800
Subject: [PATCH] Fix resource xml node errors

---
 installer/Install.ps1 |  2 ++
 installer/MakePri.ps1 | 31 +++++++++++++++++--------------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/installer/Install.ps1 b/installer/Install.ps1
index 7128fc4..dca2155 100644
--- a/installer/Install.ps1
+++ b/installer/Install.ps1
@@ -126,6 +126,7 @@ If (($null -Ne $Installed) -And (-Not ($Installed.IsDevelopmentMode))) {
     Write-Warning "There is already one installed WSA. Please uninstall it first.`r`nPress y to uninstall existing WSA or press any key to exit"
     $key = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown')
     If ("y" -Eq $key.Character) {
+        Clear-Host
         Remove-AppxPackage -Package $Installed.PackageFullName
     }
     Else {
@@ -144,6 +145,7 @@ ElseIf ($null -Ne $Installed) {
     Clear-Host
     Write-Error "Failed to update.`r`nPress any key to uninstall existing installation while preserving user data.`r`nTake in mind that this will remove the Android apps' icon from the start menu.`r`nIf you want to cancel, close this window now."
     $null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown')
+    Clear-Host
     Remove-AppxPackage -PreserveApplicationData -Package $Installed.PackageFullName
     Add-AppxPackage -ForceApplicationShutdown -ForceUpdateFromAnyVersion -Register .\AppxManifest.xml
     If ($?) {
diff --git a/installer/MakePri.ps1 b/installer/MakePri.ps1
index d77fa6e..2e8db81 100644
--- a/installer/MakePri.ps1
+++ b/installer/MakePri.ps1
@@ -25,32 +25,35 @@ If ((Test-Path -Path "pri") -Eq $true -And (Test-Path -Path "xml") -Eq $true) {
     If ($ProcNew.ExitCode -Ne 0) {
         Write-Warning "Failed to merge resources from pris`r`nTrying to dump pris to priinfo...."
         New-Item -Path "." -Name "priinfo" -ItemType "directory"
-        $Processes = ForEach ($Item in Get-Item ".\pri\*" -Include "*.pri") {
-            $Name = $Item.Name
-            $RelativePath = $Item | Resolve-Path -Relative
-            Write-Host "Dumping $Name....`r`n"
-            Start-Process -PassThru -WindowStyle Hidden makepri.exe -Args "dump /if $RelativePath /o /es .\pri\resources.pri /of .\priinfo\$Name.xml /dt detailed"
+        Clear-Host
+        $i = 0
+        $PriItem = Get-Item ".\pri\*" -Include "*.pri"
+        Write-Host "Dumping resources...."
+        $Processes = ForEach ($Item in $PriItem) {
+            Start-Process -PassThru -WindowStyle Hidden makepri.exe -Args "dump /if $($Item | Resolve-Path -Relative) /o /es .\pri\resources.pri /of .\priinfo\$($Item.Name).xml /dt detailed"
+            $i = $i + 1
+            $Completed = ($i / $PriItem.count) * 100
+            Write-Progress -Activity "Dumping resources" -Status "Dumping $($Item.Name):" -PercentComplete $Completed
         }
-        Write-Host "Dumping resources....`r`n"
         $Processes | Wait-Process
-        Write-Host "Creating pri from dumps....`r`n"
+        Write-Progress -Activity "Dumping resources" -Status "Ready" -Completed
+        Clear-Host
+        Write-Host "Creating pri from dumps...."
         $ProcNewFromDump = Start-Process -PassThru -WindowStyle Hidden makepri.exe -Args "new /pr .\priinfo /cf .\xml\priconfig.xml /of .\resources.pri /mn $AppxManifestFile /o"    
         $ProcNewFromDump.WaitForExit()
         Remove-Item 'priinfo' -Recurse
         If ($ProcNewFromDump.ExitCode -Ne 0) {
-            Write-Warning "Failed to create resources from priinfos`r`n"
+            Write-Warning "Failed to create resources from priinfos"
             exit 1
         }
     }
 
     $ProjectXml = [xml](Get-Content $AppxManifestFile)
     $ProjectResources = $ProjectXml.Package.Resources;
-    $Item = Get-Item .\xml\* -Exclude "priconfig.xml" -Include "*.xml"
-    $Item | ForEach-Object {
-        $Xml = [xml](Get-Content $_)
-        $Resource = $Xml.Package.Resources.Resource
-        $newNode = $ProjectXml.ImportNode($Resource, $true)
-        $ProjectResources.AppendChild($newNode)
+    $(Get-Item .\xml\* -Exclude "priconfig.xml" -Include "*.xml") | ForEach-Object {
+        $($([xml](Get-Content $_)).Package.Resources.Resource) | ForEach-Object {
+            $ProjectResources.AppendChild($($ProjectXml.ImportNode($_, $true)))
+        }
     }
     $ProjectXml.Save($AppxManifestFile)
     Remove-Item 'pri' -Recurse