xstefen/winutil
1
0
Fork 0
mirror of https://github.com/ChrisTitusTech/winutil.git synced 2025-01-15 17:30:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

rework how stuff is ran on automation

Browse Source 
- install work
This commit is contained in:
MyDrift 2024-08-25 14:49:32 +02:00
parent ae87100c61
commit b02294daf9
3 changed files with 111 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
functions/private/Set-WinUtilTaskbarItem.ps1
View File

@ -43,6 +43,7 @@ function Set-WinUtilTaskbaritem {
[string]$description
)
try {
if ($value) {
$sync["Form"].taskbarItemInfo.ProgressValue = $value
}
@ -83,4 +84,7 @@ function Set-WinUtilTaskbaritem {
if ($description) {
$sync["Form"].taskbarItemInfo.Description = $description
}
} catch {
#nothing
}
}

4
functions/public/Invoke-WPFRunspace.ps1
View File

@ -25,6 +25,9 @@ function Invoke-WPFRunspace {
$DebugPreference
)
if ($PARAM_RUN) {
& $ScriptBlock @ArgumentList @DebugPreference
} else {
# Create a PowerShell instance
$script:powershell = [powershell]::Create()
@ -46,3 +49,4 @@ function Invoke-WPFRunspace {
[System.GC]::Collect()
}
}
}

98
scripts/main.ps1
View File

@ -146,12 +146,60 @@ Invoke-WPFRunspace -ScriptBlock {
} | Out-Null
#===========================================================================
# Setup and Show the Form
# Print Logo into Console
#===========================================================================
# Print the logo
Invoke-WPFFormVariables
#===========================================================================
# Run Automation
#===========================================================================
if ($PARAM_CONFIG) {
if ($PARAM_RUN) {
$installConfig = Get-Content $PARAM_CONFIG -Raw | ConvertFrom-Json
if ($installConfig.WPFInstall) {
write-host "Installing Programs"
# Create a new array to hold the combined install configurations
$combinedInstallConfig = @()
# Iterate over each WPFInstall entry
for ($i = 0; $i -lt $installConfig.WPFInstall.Count; $i++) {
$wpfInstallEntry = $installConfig.WPFInstall[$i]
$installEntry = $installConfig.Install[$i]
# Create a new object with the combined values
$combinedEntry = @{
Name = $wpfInstallEntry
Winget = $installEntry.winget
Choco = $installEntry.choco
}
# Add the combined entry to the array
$combinedInstallConfig += $combinedEntry
}
# Invoke the WPFInstall function with the combined configuration
Invoke-WPFInstall -InstallConfig $combinedInstallConfig
}
if ($installConfig.WPFTweaks) {
write-host "Running Tweaks"
Invoke-WPFtweaksbutton -TweaksConfig $installConfig.WPFTweaks
}
if ($installConfig.WPFFeature) {
write-host "Installing Features"
Invoke-WPFFeatureInstall -FeatureConfig $installConfig.WPFFeature
}
} else {
Invoke-WPFImpex -type "import" -Config $PARAM_CONFIG
}
}
#===========================================================================
# Setup and Show the Form
#===========================================================================
# Progress bar in taskbaritem > Set-WinUtilProgressbar
$sync["Form"].TaskbarItemInfo = New-Object System.Windows.Shell.TaskbarItemInfo
Set-WinUtilTaskbaritem -state "None"
@ -318,49 +366,6 @@ Add-Type @"
Invoke-WPFTab "WPFTab1BT"
$sync["Form"].Focus()
# maybe this is not the best place to load and execute config file?
# maybe community can help?
if ($PARAM_CONFIG) {
if ($PARAM_RUN) {
$installConfig = Get-Content $PARAM_CONFIG -Raw | ConvertFrom-Json
if ($installConfig.WPFTweaks) {
write-host "Running Tweaks"
Invoke-WPFtweaksbutton -TweaksConfig $installConfig.WPFTweaks
}
if ($installConfig.WPFFeature) {
write-host "Installing Features"
Invoke-WPFFeatureInstall -FeatureConfig $installConfig.WPFFeature
}
if ($installConfig.WPFInstall) {
write-host "Installing Programs"
# Create a new array to hold the combined install configurations
$combinedInstallConfig = @()
# Iterate over each WPFInstall entry
for ($i = 0; $i -lt $installConfig.WPFInstall.Count; $i++) {
$wpfInstallEntry = $installConfig.WPFInstall[$i]
$installEntry = $installConfig.Install[$i]
# Create a new object with the combined values
$combinedEntry = @{
Name = $wpfInstallEntry
Winget = $installEntry.winget
Choco = $installEntry.choco
}
# Add the combined entry to the array
$combinedInstallConfig += $combinedEntry
}
# Invoke the WPFInstall function with the combined configuration
Invoke-WPFInstall -InstallConfig $combinedInstallConfig
}
} else {
Invoke-WPFImpex -type "import" -Config $PARAM_CONFIG
}
}
})
# Load Checkboxes and Labels outside of the Filter function only once on startup for performance reasons
@ -535,5 +540,8 @@ $sync["SponsorMenuItem"].Add_Click({
$Height = $sync.configs.themes.$ctttheme.CustomDialogHeight
Show-CustomDialog -Message $authorInfo -Width $Width -Height $Height -FontSize $FontSize -HeaderFontSize $HeaderFontSize -IconSize $IconSize -EnableScroll $true
})
if (!$PARAM_RUN) {
$sync["Form"].ShowDialog() | out-null
Stop-Transcript
}