Portable Tool for an Ideal Windows Setup
C# activatorbloatware-removalcsharpdebloatdebloaterdisable-servicesmonitoring-systemportableprivacy-toolsregistry-tweakssystem-tuningsystem-utilitytelemetrytweakerwindows-10windows-11windows-debloatwindows-defenderwindows-optimizationwindows-tweaks
fix potential incorrect command construction; ref mvvm.
Greedeksfa46b3798d8c
diff --git a/.Source/GTweak/Core/BasePageVM.cs b/.Source/GTweak/Core/BasePageVM.csdeleted file mode 100644index e73d15a1..00000000--- a/.Source/GTweak/Core/BasePageVM.cs+++ /dev/null@@ -1,54 +0,0 @@-using System.Collections.Generic;-using System.Collections.ObjectModel;-using System.Linq;-using System.Threading.Tasks;--namespace GTweak.Core-{- internal interface IToggleModel- {- string Name { get; set; }- bool State { get; set; }- }-- internal interface ISliderModel : IToggleModel- {- double Value { get; set; }- }-- internal abstract class BasePageVM<TModel, TTweaksClass> : ViewModelBase- where TModel : IToggleModel, new()- where TTweaksClass : new()- {- public ObservableCollection<TModel> Toggles { get; private set; }-- public TModel this[string name] => Toggles.FirstOrDefault(d => d.Name == name);-- protected abstract Dictionary<string, object> GetControlStates();-- protected abstract void Analyze(TTweaksClass tweaks);-- protected BasePageVM()- {- var tweaks = new TTweaksClass();- Parallel.Invoke(() => Analyze(tweaks));-- Toggles = new ObservableCollection<TModel>(- GetControlStates().Select(kvp =>- {- var model = new TModel { Name = kvp.Key };-- if (kvp.Value is bool b)- model.State = b;-- if (kvp.Value is double d && model is ISliderModel sliderModel)- sliderModel.Value = d;-- return model;- }));-- OnPropertyChanged(nameof(Toggles));- }-- }-}diff --git a/.Source/GTweak/Core/Model/ConfidentialityModel.cs b/.Source/GTweak/Core/Model/ConfidentialityModel.csindex e149d5bb..77add990 100644--- a/.Source/GTweak/Core/Model/ConfidentialityModel.cs+++ b/.Source/GTweak/Core/Model/ConfidentialityModel.cs@@ -1,6 +1,6 @@namespace GTweak.Core.Model{- internal sealed class ConfidentialityModel : IToggleModel+ internal sealed class ConfidentialityModel : IBasePageItem{public string Name { get; set; }public bool State { get; set; }diff --git a/.Source/GTweak/Core/Model/InterfaceModel.cs b/.Source/GTweak/Core/Model/InterfaceModel.csindex 79aa14a1..c9f2d018 100644--- a/.Source/GTweak/Core/Model/InterfaceModel.cs+++ b/.Source/GTweak/Core/Model/InterfaceModel.cs@@ -1,6 +1,6 @@namespace GTweak.Core.Model{- internal sealed class InterfaceModel : IToggleModel+ internal sealed class InterfaceModel : IBasePageItem{public string Name { get; set; }public bool State { get; set; }diff --git a/.Source/GTweak/Core/Model/ServicesModel.cs b/.Source/GTweak/Core/Model/ServicesModel.csindex 0eef9eda..7eb5854c 100644--- a/.Source/GTweak/Core/Model/ServicesModel.cs+++ b/.Source/GTweak/Core/Model/ServicesModel.cs@@ -1,6 +1,6 @@namespace GTweak.Core.Model{- internal class ServicesModel : IToggleModel+ internal sealed class ServicesModel : IBasePageItem{public string Name { get; set; }public bool State { get; set; }diff --git a/.Source/GTweak/Core/Model/SystemModel.cs b/.Source/GTweak/Core/Model/SystemModel.csindex 124fee93..6205fc75 100644--- a/.Source/GTweak/Core/Model/SystemModel.cs+++ b/.Source/GTweak/Core/Model/SystemModel.cs@@ -1,6 +1,6 @@namespace GTweak.Core.Model{- internal class SystemModel : ISliderModel+ internal sealed class SystemModel : ITypedPageItem<double>{public string Name { get; set; }public bool State { get; set; }diff --git a/.Source/GTweak/Core/ViewModel/ConfidentialityVM.cs b/.Source/GTweak/Core/ViewModel/ConfidentialityVM.csindex 4a6ec466..25e16dd3 100644--- a/.Source/GTweak/Core/ViewModel/ConfidentialityVM.cs+++ b/.Source/GTweak/Core/ViewModel/ConfidentialityVM.cs@@ -4,7 +4,7 @@ using System.Collections.Generic;namespace GTweak.Core.ViewModel{- internal class ConfidentialityVM : BasePageVM<ConfidentialityModel, ConfidentialityTweaks>+ internal class ConfidentialityVM : ViewModelPageBase<ConfidentialityModel, ConfidentialityTweaks>{protected override Dictionary<string, object> GetControlStates() => ConfidentialityTweaks.ControlStates;diff --git a/.Source/GTweak/Core/ViewModel/InterfaceVM.cs b/.Source/GTweak/Core/ViewModel/InterfaceVM.csindex 16874f81..86dbc01a 100644--- a/.Source/GTweak/Core/ViewModel/InterfaceVM.cs+++ b/.Source/GTweak/Core/ViewModel/InterfaceVM.cs@@ -5,7 +5,7 @@ using System.Collections.Generic;namespace GTweak.Core.ViewModel{- internal class InterfaceVM : BasePageVM<InterfaceModel, InterfaceTweaks>+ internal class InterfaceVM : ViewModelPageBase<InterfaceModel, InterfaceTweaks>{public bool IsBlockForWin10 => SystemDiagnostics.IsWindowsVersion[11];public bool IsBlockWithoutLicense => WindowsLicense.IsWindowsActivated;diff --git a/.Source/GTweak/Core/ViewModel/ServicesVM.cs b/.Source/GTweak/Core/ViewModel/ServicesVM.csindex 73dda165..b4c9fbbb 100644--- a/.Source/GTweak/Core/ViewModel/ServicesVM.cs+++ b/.Source/GTweak/Core/ViewModel/ServicesVM.cs@@ -4,7 +4,7 @@ using System.Collections.Generic;namespace GTweak.Core.ViewModel{- internal class ServicesVM : BasePageVM<ServicesModel, ServicesTweaks>+ internal class ServicesVM : ViewModelPageBase<ServicesModel, ServicesTweaks>{protected override Dictionary<string, object> GetControlStates() => ServicesTweaks.ControlStates;diff --git a/.Source/GTweak/Core/ViewModel/SystemVM.cs b/.Source/GTweak/Core/ViewModel/SystemVM.csindex 97d3dc4f..0971aff9 100644--- a/.Source/GTweak/Core/ViewModel/SystemVM.cs+++ b/.Source/GTweak/Core/ViewModel/SystemVM.cs@@ -4,7 +4,7 @@ using System.Collections.Generic;namespace GTweak.Core.ViewModel{- internal sealed class SystemVM : BasePageVM<SystemModel, SystemTweaks>+ internal sealed class SystemVM : ViewModelPageBase<SystemModel, SystemTweaks>{protected override Dictionary<string, object> GetControlStates() => SystemTweaks.ControlStates;diff --git a/.Source/GTweak/Core/ViewModelPageBase.cs b/.Source/GTweak/Core/ViewModelPageBase.csnew file mode 100644index 00000000..2d868c8f--- /dev/null+++ b/.Source/GTweak/Core/ViewModelPageBase.cs@@ -0,0 +1,60 @@+using System.Collections.Generic;+using System.Collections.ObjectModel;+using System.Linq;+using System.Threading.Tasks;++namespace GTweak.Core+{+ internal interface IBasePageItem+ {+ public string Name { get; set; }+ public bool State { get; set; }+ }++ internal interface ITypedPageItem<T> : IBasePageItem+ {+ T Value { get; set; }+ }++ internal abstract class ViewModelPageBase<TModel, TTweaksClass> : ViewModelBase+ where TModel : IBasePageItem, new()+ where TTweaksClass : new()+ {+ public ObservableCollection<TModel> Toggles { get; private set; }++ public TModel this[string name] => Toggles.FirstOrDefault(d => d.Name == name);++ protected abstract Dictionary<string, object> GetControlStates();++ protected abstract void Analyze(TTweaksClass tweaks);++ protected ViewModelPageBase()+ {+ TTweaksClass tweaks = new TTweaksClass();+ Parallel.Invoke(() => Analyze(tweaks));++ Toggles = new ObservableCollection<TModel>(+ GetControlStates().Select(kvp =>+ {+ TModel model = new TModel { Name = kvp.Key };++ switch (kvp.Value)+ {+ case bool b:+ model.State = b;+ break;+ case double d when model is ITypedPageItem<double> doubleItem:+ doubleItem.Value = d;+ break;+ case string s when model is ITypedPageItem<string> stringItem:+ stringItem.Value = s;+ break;+ }++ return model;+ }));++ OnPropertyChanged(nameof(Toggles));+ }+ }+}diff --git a/.Source/GTweak/GTweak.csproj b/.Source/GTweak/GTweak.csprojindex 6f9c9b7e..fcd63ac5 100644--- a/.Source/GTweak/GTweak.csproj+++ b/.Source/GTweak/GTweak.csproj@@ -248,7 +248,7 @@<Compile Include="Assets\UserControl\ProggressRing.xaml.cs"><DependentUpon>ProggressRing.xaml</DependentUpon></Compile>- <Compile Include="Core\BasePageVM.cs" />+ <Compile Include="Core\ViewModelPageBase.cs" /><Compile Include="Core\Model\InterfaceModel.cs" /><Compile Include="Core\Model\ConfidentialityModel.cs" /><Compile Include="Core\Model\MainModel.cs" />diff --git a/.Source/GTweak/Utilities/Managers/TaskSchedulerManager.cs b/.Source/GTweak/Utilities/Managers/TaskSchedulerManager.csindex f7d5c66c..be49b0ab 100644--- a/.Source/GTweak/Utilities/Managers/TaskSchedulerManager.cs+++ b/.Source/GTweak/Utilities/Managers/TaskSchedulerManager.cs@@ -5,7 +5,6 @@ using System;using System.Collections.Generic;using System.IO;using System.Linq;-using System.Text;using System.Threading.Tasks;namespace GTweak.Utilities.Managers@@ -56,23 +55,17 @@ namespace GTweak.Utilities.Managersinternal static void SetTaskStateOwner(bool state, params string[] tasklist){- Task.Run(delegate+ Task.Run(() =>{string[] existingTasks = GetExistingTasks(tasklist);-if (existingTasks.Length != 0){- StringBuilder sb = new StringBuilder();- foreach (string task in existingTasks)- sb.Append($"schtasks /change {(state ? "/enable" : "/disable")} /tn \"{task}\" & ");- string tasksCommand = sb.ToString().TrimEnd(' ', '&');-- CommandExecutor.RunCommandAsTrustedInstaller($"/c {tasksCommand}");+ IEnumerable<string> commands = existingTasks.Select(task => $"schtasks /change {(state ? "/enable" : "/disable")} /tn \"{task.Replace("\"", "\\\"")}\"");+ CommandExecutor.RunCommandAsTrustedInstaller($"/c {string.Join(" & ", commands)}");}});}-internal static void RemoveTasks(params string[] tasklist){Task.Run(delegate