Code refactoring

farag2 · Nov 28, 2024 · 318cb69 · 318cb69
1 parent d9ad699
commit 318cb69
Show file tree

Hide file tree

Showing 27 changed files with 2,057 additions and 2,006 deletions.
diff --git a/Download_Latest_Sophia.ps1 b/Download_Latest_Sophia.ps1
@@ -3,10 +3,9 @@
 	Download the latest Sophia Script version, depending on what Windows or PowerShell versions are used to
 
 	.SYNOPSIS
-	Download the latest Sophia Script version, depending on what Windows or PowerShell versions are used to
-	E.g., if you start script on Windows 11 via PowerShell 5.1 you will start downloading Sophia Script for Windows 11 PowerShell 5.1
+	For example, if you start script on Windows 11 via PowerShell 5.1 you will start downloading Sophia Script for Windows 11 PowerShell 5.1
 
-	.EXAMPLE Download and expand Sophia Script archive
+	.EXAMPLE
 	iwr sl.sophia.team -useb | iex
 #>
 
@@ -111,7 +110,6 @@ switch ((Get-CimInstance -ClassName Win32_OperatingSystem).BuildNumber)
 		}
 	}
 }
-Invoke-WebRequest @Parameters
 
 if (-not (Test-Path -Path "$DownloadsFolder\SophiaScriptTemp"))
 {

diff --git a/Download_Sophia.ps1 b/Download_Sophia.ps1
@@ -3,7 +3,7 @@
 	Download and expand latest Sophia Script version, depending on what Windows or PowerShell versions are used to
 
 	.SYNOPSIS
-	E.g., if you start script on Windows 11 via PowerShell 5.1 you will start downloading Sophia Script for Windows 11 PowerShell 5.1
+	For example, if you start script on Windows 11 via PowerShell 5.1 you will start downloading Sophia Script for Windows 11 PowerShell 5.1
 
 	.EXAMPLE
 	iwr script.sophia.team -useb | iex
@@ -32,6 +32,7 @@ $Parameters = @{
 	Uri             = "https://raw.githubusercontent.com/farag2/Sophia-Script-for-Windows/master/sophia_script_versions.json"
 	UseBasicParsing = $true
 }
+$JSONVersions = Invoke-WebRequest @Parameters
 
 switch ((Get-CimInstance -ClassName Win32_OperatingSystem).BuildNumber)
 {
@@ -40,13 +41,14 @@ switch ((Get-CimInstance -ClassName Win32_OperatingSystem).BuildNumber)
 		# Check for Windows 10 LTSC 2019
 		if ((Get-ItemPropertyValue -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -Name ProductName) -match "LTSC 2019")
 		{
-			$LatestRelease = (Invoke-RestMethod @Parameters).Sophia_Script_Windows_10_LTSC2019
+			$LatestRelease = $JSONVersions.Sophia_Script_Windows_10_LTSC2019
 			$Parameters = @{
 				Uri             = "https://github.com/farag2/Sophia-Script-for-Windows/releases/download/$LatestGitHubRelease/Sophia.Script.for.Windows.10.LTSC.2019.v$LatestRelease.zip"
 				OutFile         = "$DownloadsFolder\Sophia.Script.zip"
 				UseBasicParsing = $true
 				Verbose         = $true
 			}
+			Invoke-WebRequest @Parameters
 
 			$Version = "Windows_10_LTSC2019"
 		}
@@ -72,13 +74,15 @@ switch ((Get-CimInstance -ClassName Win32_OperatingSystem).BuildNumber)
 		# Check for Windows 10 LTSC 2021
 		if ((Get-ItemPropertyValue -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -Name ProductName) -match "LTSC 2021")
 		{
-			$LatestRelease = (Invoke-RestMethod @Parameters).Sophia_Script_Windows_10_LTSC2021
+			$LatestRelease = $JSONVersions.Sophia_Script_Windows_10_LTSC2021
 			$Parameters = @{
 				Uri             = "https://github.com/farag2/Sophia-Script-for-Windows/releases/download/$LatestGitHubRelease/Sophia.Script.for.Windows.10.LTSC.2021.v$LatestRelease.zip"
 				OutFile         = "$DownloadsFolder\Sophia.Script.zip"
 				UseBasicParsing = $true
 				Verbose         = $true
 			}
+			Invoke-WebRequest @Parameters
+
 			$Version = "Windows_10_LTSC2021"
 		}
 		else
@@ -102,13 +106,14 @@ switch ((Get-CimInstance -ClassName Win32_OperatingSystem).BuildNumber)
 	{
 		if ($Host.Version.Major -eq 5)
 		{
-			$LatestRelease = (Invoke-RestMethod @Parameters).Sophia_Script_Windows_10_PowerShell_5_1
+			$LatestRelease = $JSONVersions.Sophia_Script_Windows_10_PowerShell_5_1
 			$Parameters = @{
 				Uri             = "https://github.com/farag2/Sophia-Script-for-Windows/releases/download/$LatestGitHubRelease/Sophia.Script.for.Windows.10.v$LatestRelease.zip"
 				OutFile         = "$DownloadsFolder\Sophia.Script.zip"
 				UseBasicParsing = $true
 				Verbose         = $true
 			}
+			Invoke-WebRequest @Parameters
 
 			$Version = "Windows_10_PowerShell_5.1"
 		}
@@ -121,6 +126,7 @@ switch ((Get-CimInstance -ClassName Win32_OperatingSystem).BuildNumber)
 				UseBasicParsing = $true
 				Verbose         = $true
 			}
+			Invoke-WebRequest @Parameters
 
 			$Version = "Windows_10_PowerShell_7"
 		}
@@ -132,44 +138,46 @@ switch ((Get-CimInstance -ClassName Win32_OperatingSystem).BuildNumber)
 		{
 			if ($Host.Version.Major -eq 5)
 			{
-				$LatestRelease = (Invoke-RestMethod @Parameters).Sophia_Script_Windows_11_PowerShell_5_1
+				$LatestRelease = $JSONVersions.Sophia_Script_Windows_11_PowerShell_5_1
 				$Parameters = @{
 					Uri             = "https://github.com/farag2/Sophia-Script-for-Windows/releases/download/$LatestGitHubRelease/Sophia.Script.for.Windows.11.v$LatestRelease.zip"
 					OutFile         = "$DownloadsFolder\Sophia.Script.zip"
 					UseBasicParsing = $true
 					Verbose         = $true
 				}
+				Invoke-WebRequest @Parameters
 
 				$Version = "Windows_11_PowerShell_5.1"
 			}
 			else
 			{
-				$LatestRelease = (Invoke-RestMethod @Parameters).Sophia_Script_Windows_11_PowerShell_7
+				$LatestRelease = $JSONVersions.Sophia_Script_Windows_11_PowerShell_7
 				$Parameters = @{
 					Uri             = "https://github.com/farag2/Sophia-Script-for-Windows/releases/download/$LatestGitHubRelease/Sophia.Script.for.Windows.11.PowerShell.7.v$LatestRelease.zip"
 					OutFile         = "$DownloadsFolder\Sophia.Script.zip"
 					UseBasicParsing = $true
 					Verbose         = $true
 				}
+				Invoke-WebRequest @Parameters
 
 				$Version = "Windows_11_PowerShell_7"
 			}
 		}
 		else
 		{
-			$LatestRelease = (Invoke-RestMethod @Parameters).Sophia_Script_Windows_11_LTSC2024
+			$LatestRelease = $JSONVersions.Sophia_Script_Windows_11_LTSC2024
 			$Parameters = @{
 				Uri             = "https://github.com/farag2/Sophia-Script-for-Windows/releases/download/$LatestGitHubRelease/Sophia.Script.for.Windows.11.LTSC.2024.v$LatestRelease.zip"
 				OutFile         = "$DownloadsFolder\Sophia.Script.zip"
 				UseBasicParsing = $true
 				Verbose         = $true
 			}
+			Invoke-WebRequest @Parameters
 
 			$Version = "Windows_11_LTSC2024"
 		}
 	}
 }
-Invoke-WebRequest @Parameters
 
 if (-not (Test-Path -Path "$DownloadsFolder\Sophia.Script.zip"))
 {

diff --git a/Wrapper/Config/config_Windows_10.json b/Wrapper/Config/config_Windows_10.json
@@ -572,22 +572,6 @@
     "Preset": "Zero",
     "WindowsDefault": "One"
   },
-  {
-    "Region": "UI & Personalization",
-    "Control": "cmb",
-    "Required": "false",
-    "Function": "CopilotButton",
-    "Arg": {
-      "Zero": {
-        "Tag": "Hide"
-      },
-      "One": {
-        "Tag": "Show"
-      }
-    },
-    "Preset": "Zero",
-    "WindowsDefault": "One"
-  },
   {
     "Region": "UI & Personalization",
     "Control": "cmb",
@@ -700,6 +684,25 @@
     "Preset": "Zero",
     "WindowsDefault": "One"
   },
+  {
+    "Region": "UI & Personalization",
+    "Control": "cmb",
+    "Required": "false",
+    "Function": "TaskbarCombine",
+    "Arg": {
+      "Zero": {
+        "Tag": "Always"
+      },
+      "One": {
+        "Tag": "Full"
+      },
+      "Two": {
+        "Tag": "Never"
+      }
+    },
+    "Preset": "Zero",
+    "WindowsDefault": "Zero"
+  },
   {
     "Region": "UI & Personalization",
     "Control": "chk",
@@ -1106,22 +1109,6 @@
     "Preset": "Zero",
     "WindowsDefault": "One"
   },
-  {
-    "Region": "System",
-    "Control": "cmb",
-    "Required": "false",
-    "Function": "MappedDrivesAppElevatedAccess",
-    "Arg": {
-      "Zero": {
-        "Tag": "Enable"
-      },
-      "One": {
-        "Tag": "Disable"
-      }
-    },
-    "Preset": "Zero",
-    "WindowsDefault": "One"
-  },
   {
     "Region": "System",
     "Control": "cmb",
@@ -2228,6 +2215,22 @@
     "Preset": "",
     "WindowsDefault": "One"
   },
+  {
+    "Region": "Context menu",
+    "Control": "cmb",
+    "Required": "false",
+    "Function": "ImagesEditContext",
+    "Arg": {
+      "Zero": {
+        "Tag": "Hide"
+      },
+      "One": {
+        "Tag": "Show"
+      }
+    },
+    "Preset": "Zero",
+    "WindowsDefault": "One"
+  },
   {
     "Region": "Context menu",
     "Control": "cmb",

diff --git a/Wrapper/Config/config_Windows_10_LTSC.json b/Wrapper/Config/config_Windows_10_LTSC.json
@@ -608,6 +608,25 @@
     "LTSC2019": "true",
     "LTSC2021": "true"
   },
+  {
+    "Region": "UI & Personalization",
+    "Control": "cmb",
+    "Required": "false",
+    "Function": "TaskbarCombine",
+    "Arg": {
+      "Zero": {
+        "Tag": "Always"
+      },
+      "One": {
+        "Tag": "Full"
+      },
+      "Two": {
+        "Tag": "Never"
+      }
+    },
+    "Preset": "Zero",
+    "WindowsDefault": "Zero"
+  },
   {
     "Region": "UI & Personalization",
     "Control": "cmb",
@@ -986,24 +1005,6 @@
     "LTSC2019": "true",
     "LTSC2021": "true"
   },
-  {
-    "Region": "System",
-    "Control": "cmb",
-    "Required": "false",
-    "Function": "MappedDrivesAppElevatedAccess",
-    "Arg": {
-      "Zero": {
-        "Tag": "Enable"
-      },
-      "One": {
-        "Tag": "Disable"
-      }
-    },
-    "Preset": "Zero",
-    "WindowsDefault": "One",
-    "LTSC2019": "true",
-    "LTSC2021": "true"
-  },
   {
     "Region": "System",
     "Control": "cmb",

diff --git a/Wrapper/Config/config_Windows_11.json b/Wrapper/Config/config_Windows_11.json
@@ -591,22 +591,6 @@
     "Preset": "Zero",
     "WindowsDefault": "One"
   },
-  {
-    "Region": "UI & Personalization",
-    "Control": "cmb",
-    "Required": "false",
-    "Function": "CopilotButton",
-    "Arg": {
-      "Zero": {
-        "Tag": "Hide"
-      },
-      "One": {
-        "Tag": "Show"
-      }
-    },
-    "Preset": "Zero",
-    "WindowsDefault": "One"
-  },
   {
     "Region": "UI & Personalization",
     "Control": "cmb",
@@ -1029,22 +1013,6 @@
     "Preset": "Zero",
     "WindowsDefault": "One"
   },
-  {
-    "Region": "System",
-    "Control": "cmb",
-    "Required": "false",
-    "Function": "MappedDrivesAppElevatedAccess",
-    "Arg": {
-      "Zero": {
-        "Tag": "Enable"
-      },
-      "One": {
-        "Tag": "Disable"
-      }
-    },
-    "Preset": "Zero",
-    "WindowsDefault": "One"
-  },
   {
     "Region": "System",
     "Control": "cmb",

diff --git a/Wrapper/Config/config_Windows_11_LTSC.json b/Wrapper/Config/config_Windows_11_LTSC.json
@@ -611,23 +611,6 @@
     "WindowsDefault": "One",
     "LTSC2024": "true"
   },
-  {
-    "Region": "UI & Personalization",
-    "Control": "cmb",
-    "Required": "false",
-    "Function": "CopilotButton",
-    "Arg": {
-      "Zero": {
-        "Tag": "Hide"
-      },
-      "One": {
-        "Tag": "Show"
-      }
-    },
-    "Preset": "Zero",
-    "WindowsDefault": "One",
-    "LTSC2024": "true"
-  },
   {
     "Region": "UI & Personalization",
     "Control": "cmb",
@@ -1045,23 +1028,6 @@
     "WindowsDefault": "One",
     "LTSC2024": "true"
   },
-  {
-    "Region": "System",
-    "Control": "cmb",
-    "Required": "false",
-    "Function": "MappedDrivesAppElevatedAccess",
-    "Arg": {
-      "Zero": {
-        "Tag": "Enable"
-      },
-      "One": {
-        "Tag": "Disable"
-      }
-    },
-    "Preset": "Zero",
-    "WindowsDefault": "One",
-    "LTSC2024": "true"
-  },
   {
     "Region": "System",
     "Control": "cmb",