Fixed ScheduledTaskHelper 🐛

Sophia-Community · Mar 25, 2022 · 3194c16 · 3194c16
1 parent 88cf1ed
commit 3194c16
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 18 deletions.
diff --git a/SophiApp/SophiApp/Controls/SearchBar.xaml b/SophiApp/SophiApp/Controls/SearchBar.xaml
@@ -58,6 +58,9 @@
                                         CommandParameter="{Binding Path=Text, ElementName=TextBoxSearch}"
                                         Key="Return" />
                         </TextBox.InputBindings>
+                        <TextBox.ContextMenu>
+                            <ContextMenu Visibility="Collapsed" />
+                        </TextBox.ContextMenu>
                     </TextBox>
                 </Grid>
             </Border>

diff --git a/SophiApp/SophiApp/Controls/TitleLeft.xaml b/SophiApp/SophiApp/Controls/TitleLeft.xaml
@@ -49,4 +49,4 @@
             </ControlTemplate.Triggers>
         </ControlTemplate>
     </UserControl.Template>
-</UserControl>
+</UserControl>
diff --git a/SophiApp/SophiApp/Customisations/CustomisationOs.cs b/SophiApp/SophiApp/Customisations/CustomisationOs.cs
@@ -1040,7 +1040,7 @@ public static void _700(bool IsChecked)
 
             RegHelper.DeleteKey(RegistryHive.CurrentUser, ACTION_CENTER_APPX_PATH, SHOW_IN_ACTION_CENTER);
             ScheduledTaskHelper.TryDeleteTask(appCleanupTask, appNotificationTask, scriptCleanupTask, scriptNotificationTask);
-            ScheduledTaskHelper.TryDeleteFolder(SOPHIA_APP_SCHEDULED_PATH);
+            ScheduledTaskHelper.TryDeleteFolder(SOPHIA_APP_SCHEDULED_PATH, SOPHIA_SCRIPT_SCHEDULED_PATH);
             RegHelper.DeleteSubKeyTree(RegistryHive.ClassesRoot, _700_WINDOWS_CLEANUP);
         }
 
@@ -1062,7 +1062,7 @@ public static void _701(bool ISChecked)
             }
 
             ScheduledTaskHelper.TryDeleteTask(appSoftwareDistributionTask, scriptSoftwareDistributionTask);
-            ScheduledTaskHelper.TryDeleteFolder(SOPHIA_APP_SCHEDULED_PATH);
+            ScheduledTaskHelper.TryDeleteFolder(SOPHIA_APP_SCHEDULED_PATH, SOPHIA_SCRIPT_SCHEDULED_PATH);
         }
 
         public static void _702(bool IsChecked)
@@ -1082,7 +1082,7 @@ public static void _702(bool IsChecked)
             }
 
             ScheduledTaskHelper.TryDeleteTask(appClearTempTask, scriptClearTempTask);
-            ScheduledTaskHelper.TryDeleteFolder(SOPHIA_APP_SCHEDULED_PATH);
+            ScheduledTaskHelper.TryDeleteFolder(SOPHIA_APP_SCHEDULED_PATH, SOPHIA_SCRIPT_SCHEDULED_PATH);
         }
 
         public static void _800(bool IsChecked) => PowerShellHelper.InvokeScript($"{_800_SET_NETWORK_PROTECTION_PS} {(IsChecked ? ENABLED : DISABLED)}");

diff --git a/SophiApp/SophiApp/Helpers/DebugHelper.cs b/SophiApp/SophiApp/Helpers/DebugHelper.cs
@@ -3,6 +3,7 @@
 using SophiApp.Interfaces;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Windows.Foundation;
 
 namespace SophiApp.Helpers
@@ -40,7 +41,11 @@ internal class DebugHelper
         };
 
         private static List<string> InitLog = new List<string>();
+
         private static List<string> StatusLog = new List<string>();
+
+        private static List<string> TraceLog = new List<string>();
+
         private static string DateTime { get => System.DateTime.Now.ToString("dd.MM.yyyy HH:mm:ss"); }
 
         private static void WriteInfoLog(string record)
@@ -99,7 +104,12 @@ internal static void HasUpdateRelease(ReleaseDto release) => WriteInfoLog(new Li
 
         internal static void RiskAgreed() => WriteStatusLog("USER AGREED TO ASSUME THE RISK AND LIABILITY FOR ANY POSSIBLE DAMAGE");
 
-        internal static void Save(string path) => FileHelper.WriteAllLines(path, InfoLog.Split(string.Empty).Merge(ErrorsLog).Split(string.Empty).Merge(InitLog).Split(string.Empty).Merge(StatusLog));
+        internal static void Save(string path)
+        {
+            TraceLog = Environment.StackTrace.Split('\n').ToList();
+            var debugData = InfoLog.Split(string.Empty).Merge(ErrorsLog).Split(string.Empty).Merge(InitLog).Split(string.Empty).Merge(StatusLog).Split(string.Empty).Merge(TraceLog);
+            FileHelper.WriteAllLines(path, debugData);
+        }
 
         internal static void SelectedLocalization(string localization) => WriteStatusLog($"Localization selected: {localization}");
 
@@ -115,6 +125,8 @@ internal static void HasUpdateRelease(ReleaseDto release) => WriteInfoLog(new Li
 
         internal static void StartStartupConditions() => WriteStatusLog("The OS conditions checkings started");
 
+        internal static void StartupConditionsInvoked(string name) => WriteStatusLog($"{name} is: True");
+
         internal static void StopApplyingSettings(double totalSeconds) => WriteStatusLog($"Applying setting(s) took {totalSeconds:N0} second(s)");
 
         internal static void StopInitTextedElements(double totalSeconds) => WriteStatusLog($"It took {totalSeconds:N0} second(s) to initialize elements");

diff --git a/SophiApp/SophiApp/Helpers/ScheduledTaskHelper.cs b/SophiApp/SophiApp/Helpers/ScheduledTaskHelper.cs
@@ -56,6 +56,20 @@ internal static void TryChangeTaskState(string taskPath, string taskName, bool e
                 task.Enabled = enable;
         }
 
+        internal static void TryDeleteFolder(params string[] folders)
+        {
+            foreach (var folder in folders)
+            {
+                try
+                {
+                    TryDeleteFolder(folder);
+                }
+                catch (Exception)
+                {
+                }
+            }
+        }
+
         internal static void TryDeleteFolder(string folder)
         {
             try

diff --git a/SophiApp/SophiApp/Helpers/StartupConditionsHelper.cs b/SophiApp/SophiApp/Helpers/StartupConditionsHelper.cs
@@ -47,6 +47,8 @@ await Task.Run(() =>
                             ConditionHasProblem?.Invoke(null, condition);
                             break;
                         }
+
+                        DebugHelper.StartupConditionsInvoked(condition.GetType().Name);
                     }
                     catch (Exception e)
                     {

diff --git a/SophiApp/SophiApp/ViewModels/Methods.cs b/SophiApp/SophiApp/ViewModels/Methods.cs
@@ -240,8 +240,8 @@ private void InitializeProperties()
         }
 
         private async Task InitializeTextedElements(string tag) => await Task.Run(() => TextedElements.Where(element => element.Tag == tag)
-                                                                                                                                              .ToList()
-                                                                                                                                              .ForEach(element => element.Initialize()));
+                                                                                                                                                .ToList()
+                                                                                                                                                .ForEach(element => element.Initialize()));
 
         private async Task InitializeTextedElementsAsync()
         {

diff --git a/SophiApp/SophiApp/Views/ViewSettings.xaml b/SophiApp/SophiApp/Views/ViewSettings.xaml
@@ -123,11 +123,6 @@
                                 Header="{DynamicResource Localization.Settings.Advanced}"
                                 IsChecked="{Binding AdvancedSettingsVisibility}" />
 
-                            <TextBlock
-                                Margin="{StaticResource BlockIndent}"
-                                Style="{DynamicResource SubHeaderText}"
-                                Text="{DynamicResource Localization.Settings.Debug}" />
-
                             <controls:SettingSwitch
                                 Width="290"
                                 Margin="{StaticResource BlockIndent}"
@@ -137,12 +132,6 @@
                                 IsChecked="{Binding DebugMode}"
                                 Visibility="{Binding DebugMode, Converter={StaticResource BoolToVisibilityConverter}}" />
 
-                            <controls:CommandButton
-                                Margin="{StaticResource BlockIndent}"
-                                HorizontalAlignment="Left"
-                                Command="{Binding SaveDebugLogCommand}"
-                                Text="{DynamicResource Localization.Settings.Debug.Save}" />
-
                             <TextBlock
                                 Margin="{StaticResource BlockIndent}"
                                 Style="{DynamicResource SubHeaderText}"