Preparing Backgroundog

Taiizor · Sep 21, 2023 · 4634e13 · 4634e13
1 parent 26b9127
commit 4634e13
Show file tree

Hide file tree

Showing 22 changed files with 106 additions and 36 deletions.
diff --git a/src/Live/Sucrose.Live.Aurora/Sucrose.Live.Aurora.csproj b/src/Live/Sucrose.Live.Aurora/Sucrose.Live.Aurora.csproj
@@ -88,6 +88,7 @@
     </ItemGroup>
 
     <Import Project="..\..\Shared\Sucrose.Shared.Zip\Sucrose.Shared.Zip.projitems" Label="Shared" />
+    <Import Project="..\..\Shared\Sucrose.Shared.Live\Sucrose.Shared.Live.projitems" Label="Shared" />
     <Import Project="..\..\Shared\Sucrose.Shared.Space\Sucrose.Shared.Space.projitems" Label="Shared" />
     <Import Project="..\..\Shared\Sucrose.Shared.Theme\Sucrose.Shared.Theme.projitems" Label="Shared" />
     <Import Project="..\..\Shared\Sucrose.Shared.Watchdog\Sucrose.Shared.Watchdog.projitems" Label="Shared" />

diff --git a/src/Live/Sucrose.Live.CefSharp/Sucrose.Live.CefSharp.csproj b/src/Live/Sucrose.Live.CefSharp/Sucrose.Live.CefSharp.csproj
@@ -93,6 +93,7 @@
     </ItemGroup>
 
     <Import Project="..\..\Shared\Sucrose.Shared.Zip\Sucrose.Shared.Zip.projitems" Label="Shared" />
+    <Import Project="..\..\Shared\Sucrose.Shared.Live\Sucrose.Shared.Live.projitems" Label="Shared" />
     <Import Project="..\..\Shared\Sucrose.Shared.Space\Sucrose.Shared.Space.projitems" Label="Shared" />
     <Import Project="..\..\Shared\Sucrose.Shared.Theme\Sucrose.Shared.Theme.projitems" Label="Shared" />
     <Import Project="..\..\Shared\Sucrose.Shared.Watchdog\Sucrose.Shared.Watchdog.projitems" Label="Shared" />

diff --git a/src/Live/Sucrose.Live.MpvPlayer/Sucrose.Live.MpvPlayer.csproj b/src/Live/Sucrose.Live.MpvPlayer/Sucrose.Live.MpvPlayer.csproj
@@ -94,6 +94,7 @@
     </ItemGroup>
 
     <Import Project="..\..\Shared\Sucrose.Shared.Zip\Sucrose.Shared.Zip.projitems" Label="Shared" />
+    <Import Project="..\..\Shared\Sucrose.Shared.Live\Sucrose.Shared.Live.projitems" Label="Shared" />
     <Import Project="..\..\Shared\Sucrose.Shared.Space\Sucrose.Shared.Space.projitems" Label="Shared" />
     <Import Project="..\..\Shared\Sucrose.Shared.Theme\Sucrose.Shared.Theme.projitems" Label="Shared" />
     <Import Project="..\..\Shared\Sucrose.Shared.Watchdog\Sucrose.Shared.Watchdog.projitems" Label="Shared" />

diff --git a/src/Live/Sucrose.Live.Nebula/Sucrose.Live.Nebula.csproj b/src/Live/Sucrose.Live.Nebula/Sucrose.Live.Nebula.csproj
@@ -88,6 +88,7 @@
     </ItemGroup>
 
     <Import Project="..\..\Shared\Sucrose.Shared.Zip\Sucrose.Shared.Zip.projitems" Label="Shared" />
+    <Import Project="..\..\Shared\Sucrose.Shared.Live\Sucrose.Shared.Live.projitems" Label="Shared" />
     <Import Project="..\..\Shared\Sucrose.Shared.Space\Sucrose.Shared.Space.projitems" Label="Shared" />
     <Import Project="..\..\Shared\Sucrose.Shared.Theme\Sucrose.Shared.Theme.projitems" Label="Shared" />
     <Import Project="..\..\Shared\Sucrose.Shared.Watchdog\Sucrose.Shared.Watchdog.projitems" Label="Shared" />

diff --git a/src/Live/Sucrose.Live.Vexana/Sucrose.Live.Vexana.csproj b/src/Live/Sucrose.Live.Vexana/Sucrose.Live.Vexana.csproj
@@ -88,6 +88,7 @@
     </ItemGroup>
 
     <Import Project="..\..\Shared\Sucrose.Shared.Zip\Sucrose.Shared.Zip.projitems" Label="Shared" />
+    <Import Project="..\..\Shared\Sucrose.Shared.Live\Sucrose.Shared.Live.projitems" Label="Shared" />
     <Import Project="..\..\Shared\Sucrose.Shared.Space\Sucrose.Shared.Space.projitems" Label="Shared" />
     <Import Project="..\..\Shared\Sucrose.Shared.Theme\Sucrose.Shared.Theme.projitems" Label="Shared" />
     <Import Project="..\..\Shared\Sucrose.Shared.Watchdog\Sucrose.Shared.Watchdog.projitems" Label="Shared" />

diff --git a/src/Live/Sucrose.Live.WebView/Sucrose.Live.WebView.csproj b/src/Live/Sucrose.Live.WebView/Sucrose.Live.WebView.csproj
@@ -89,6 +89,7 @@
     </ItemGroup>
 
     <Import Project="..\..\Shared\Sucrose.Shared.Zip\Sucrose.Shared.Zip.projitems" Label="Shared" />
+    <Import Project="..\..\Shared\Sucrose.Shared.Live\Sucrose.Shared.Live.projitems" Label="Shared" />
     <Import Project="..\..\Shared\Sucrose.Shared.Space\Sucrose.Shared.Space.projitems" Label="Shared" />
     <Import Project="..\..\Shared\Sucrose.Shared.Theme\Sucrose.Shared.Theme.projitems" Label="Shared" />
     <Import Project="..\..\Shared\Sucrose.Shared.Watchdog\Sucrose.Shared.Watchdog.projitems" Label="Shared" />

diff --git a/src/Project/Sucrose.Backgroundog/Helper/Attempt.cs b/src/Project/Sucrose.Backgroundog/Helper/Attempt.cs
@@ -1,9 +1,5 @@
-using System.Diagnostics;
-using SBEL = Sucrose.Backgroundog.Extension.Lifecycle;
-using SBMI = Sucrose.Backgroundog.Manage.Internal;
-using SMR = Sucrose.Memory.Readonly;
+using SBMI = Sucrose.Backgroundog.Manage.Internal;
 using SSSHL = Sucrose.Shared.Space.Helper.Live;
-using SSSHM = Sucrose.Shared.Space.Helper.Management;
 
 namespace Sucrose.Backgroundog.Helper
 {
@@ -24,11 +20,6 @@ public static async Task Start()
                 await Task.Delay(TimeSpan.FromSeconds(IntervalSeconds));
             }
 
-            Process.GetProcesses()
-                .Where(Process => (Process.ProcessName.Contains(SMR.WebViewProcessName) || Process.ProcessName.Contains(SMR.CefSharpProcessName)) && SSSHM.GetCommandLine(Process).Contains(SMR.AppName))
-                .ToList()
-                .ForEach(Process => SBEL.Resume(Process));
-
             SBMI.Exit = false;
             SBMI.Initialize.Stop();
 

diff --git a/src/Project/Sucrose.Backgroundog/Helper/Condition.cs b/src/Project/Sucrose.Backgroundog/Helper/Condition.cs
@@ -1,7 +1,6 @@
 using Skylark.Enum;
 using Skylark.Standard.Extension.Storage;
 using System.Diagnostics;
-using SBEL = Sucrose.Backgroundog.Extension.Lifecycle;
 using SBMI = Sucrose.Backgroundog.Manage.Internal;
 using SBMM = Sucrose.Backgroundog.Manage.Manager;
 using SMMM = Sucrose.Manager.Manage.Manager;
@@ -10,9 +9,11 @@
 using SSDENPT = Sucrose.Shared.Dependency.Enum.NetworkPerformanceType;
 using SSDEPT = Sucrose.Shared.Dependency.Enum.PerformanceType;
 using SSLHR = Sucrose.Shared.Live.Helper.Run;
+using SSSEL = Sucrose.Shared.Space.Extension.Lifecycle;
 using SSSHL = Sucrose.Shared.Space.Helper.Live;
 using SSSHM = Sucrose.Shared.Space.Helper.Management;
 using SSSHP = Sucrose.Shared.Space.Helper.Processor;
+using SSWW = Sucrose.Shared.Watchdog.Watch;
 
 namespace Sucrose.Backgroundog.Helper
 {
@@ -72,14 +73,23 @@ private static void Lifecycle()
 
                 if (SBMI.Live != null && !SBMI.Live.HasExited)
                 {
-                    SBEL.Resume(SBMI.Live);
+                    SSSEL.Resume(SBMI.Live);
 
                     if (SMR.WebViewLive.Contains(SBMI.Live.ProcessName) || SMR.CefSharpLive.Contains(SBMI.Live.ProcessName))
                     {
-                        Process.GetProcesses()
-                            .Where(Process => (Process.ProcessName.Contains(SMR.WebViewProcessName) || Process.ProcessName.Contains(SMR.CefSharpProcessName)) && SSSHM.GetCommandLine(Process).Contains(SMR.AppName))
-                            .ToList()
-                            .ForEach(Process => SBEL.Resume(Process));
+                        try
+                        {
+                            Process[] Processes = Process.GetProcesses();
+
+                            Processes
+                                .Where(Process => (Process.ProcessName.Contains(SMR.WebViewProcessName) || Process.ProcessName.Contains(SMR.CefSharpProcessName)) && SSSHM.GetCommandLine(Process).Contains(SMR.AppName))
+                                .ToList()
+                                .ForEach(Process => SSSEL.Resume(Process));
+                        }
+                        catch (Exception Exception)
+                        {
+                            SSWW.Watch_CatchException(Exception);
+                        }
                     }
                 }
 
@@ -89,7 +99,7 @@ private static void Lifecycle()
 
                     if (SBMI.App != null && !SBMI.App.HasExited)
                     {
-                        SBEL.Resume(SBMI.App);
+                        SSSEL.Resume(SBMI.App);
                     }
                 }
             }

diff --git a/src/Project/Sucrose.Backgroundog/Helper/Performance.cs b/src/Project/Sucrose.Backgroundog/Helper/Performance.cs
@@ -1,7 +1,6 @@
 using Skylark.Enum;
 using Skylark.Standard.Extension.Storage;
 using System.Diagnostics;
-using SBEL = Sucrose.Backgroundog.Extension.Lifecycle;
 using SBMI = Sucrose.Backgroundog.Manage.Internal;
 using SBMM = Sucrose.Backgroundog.Manage.Manager;
 using SMMM = Sucrose.Manager.Manage.Manager;
@@ -10,9 +9,11 @@
 using SSDENPT = Sucrose.Shared.Dependency.Enum.NetworkPerformanceType;
 using SSDEPT = Sucrose.Shared.Dependency.Enum.PerformanceType;
 using SSLHK = Sucrose.Shared.Live.Helper.Kill;
+using SSSEL = Sucrose.Shared.Space.Extension.Lifecycle;
 using SSSHL = Sucrose.Shared.Space.Helper.Live;
 using SSSHM = Sucrose.Shared.Space.Helper.Management;
 using SSSHP = Sucrose.Shared.Space.Helper.Processor;
+using SSWW = Sucrose.Shared.Watchdog.Watch;
 
 namespace Sucrose.Backgroundog.Helper
 {
@@ -62,14 +63,23 @@ private static void Lifecycle()
 
                 if (SBMI.Live != null && !SBMI.Live.HasExited)
                 {
-                    SBEL.Suspend(SBMI.Live);
+                    SSSEL.Suspend(SBMI.Live);
 
                     if (SMR.WebViewLive.Contains(SBMI.Live.ProcessName) || SMR.CefSharpLive.Contains(SBMI.Live.ProcessName))
                     {
-                        Process.GetProcesses()
-                            .Where(Process => (Process.ProcessName.Contains(SMR.WebViewProcessName) || Process.ProcessName.Contains(SMR.CefSharpProcessName)) && SSSHM.GetCommandLine(Process).Contains(SMR.AppName))
-                            .ToList()
-                            .ForEach(Process => SBEL.Suspend(Process));
+                        try
+                        {
+                            Process[] Processes = Process.GetProcesses();
+
+                            Processes
+                                .Where(Process => (Process.ProcessName.Contains(SMR.WebViewProcessName) || Process.ProcessName.Contains(SMR.CefSharpProcessName)) && SSSHM.GetCommandLine(Process).Contains(SMR.AppName))
+                                .ToList()
+                                .ForEach(Process => SSSEL.Suspend(Process));
+                        }
+                        catch (Exception Exception)
+                        {
+                            SSWW.Watch_CatchException(Exception);
+                        }
                     }
                 }
 
@@ -79,7 +89,7 @@ private static void Lifecycle()
 
                     if (SBMI.App != null && !SBMI.App.HasExited)
                     {
-                        SBEL.Suspend(SBMI.App);
+                        SSSEL.Suspend(SBMI.App);
                     }
                 }
             }

diff --git a/src/Project/Sucrose.Backgroundog/Manage/Internal.cs b/src/Project/Sucrose.Backgroundog/Manage/Internal.cs
@@ -61,8 +61,6 @@ internal static class Internal
 
         public static PerformanceCounter DownloadCounter = null;
 
-        public static readonly int THREAD_SUSPEND_RESUME = 0x0002;
-
         public static NowPlayingSessionManager SessionManager = null;
 
         public static SBSDCS CpuData = new()

diff --git a/src/Project/Sucrose.Commandog/Sucrose.Commandog.csproj b/src/Project/Sucrose.Commandog/Sucrose.Commandog.csproj
@@ -72,10 +72,16 @@
         <PackageReference Include="Skylark.Wing" Version="3.1.1.3" />
     </ItemGroup>
 
+    <ItemGroup Condition="$(TargetFramework.StartsWith('net48'))">
+        <Reference Include="System.Web" />
+    </ItemGroup>
+
     <ItemGroup>
         <ProjectReference Include="..\..\Library\Sucrose.Manager\Sucrose.Manager.csproj" />
     </ItemGroup>
 
+    <Import Project="..\..\Shared\Sucrose.Shared.Live\Sucrose.Shared.Live.projitems" Label="Shared" />
+    <Import Project="..\..\Shared\Sucrose.Shared.Theme\Sucrose.Shared.Theme.projitems" Label="Shared" />
     <Import Project="..\..\Shared\Sucrose.Shared.Space\Sucrose.Shared.Space.projitems" Label="Shared" />
     <Import Project="..\..\Shared\Sucrose.Shared.Watchdog\Sucrose.Shared.Watchdog.projitems" Label="Shared" />
     <Import Project="..\..\Shared\Sucrose.Shared.Dependency\Sucrose.Shared.Dependency.projitems" Label="Shared" />

diff --git a/src/Project/Sucrose.WPF.CS/Sucrose.WPF.CS.csproj b/src/Project/Sucrose.WPF.CS/Sucrose.WPF.CS.csproj
@@ -97,6 +97,7 @@
     </ItemGroup>
 
     <Import Project="..\..\Shared\Sucrose.Shared.Zip\Sucrose.Shared.Zip.projitems" Label="Shared" />
+    <Import Project="..\..\Shared\Sucrose.Shared.Live\Sucrose.Shared.Live.projitems" Label="Shared" />
     <Import Project="..\..\Shared\Sucrose.Shared.Space\Sucrose.Shared.Space.projitems" Label="Shared" />
     <Import Project="..\..\Shared\Sucrose.Shared.Theme\Sucrose.Shared.Theme.projitems" Label="Shared" />
     <Import Project="..\..\Shared\Sucrose.Shared.Server\Sucrose.Shared.Server.projitems" Label="Shared" />

diff --git a/src/Shared/Sucrose.Shared.Launcher/Command/Close.cs b/src/Shared/Sucrose.Shared.Launcher/Command/Close.cs
@@ -21,6 +21,10 @@ public static void Command()
                 {
                     SSLHK.Stop();
                 }
+                else
+                {
+                    SSLHK.StopSubprocess();
+                }
 
                 if (SSSHP.Work(SMR.Portal))
                 {

diff --git a/src/Shared/Sucrose.Shared.Live/Helper/Kill.cs b/src/Shared/Sucrose.Shared.Live/Helper/Kill.cs
@@ -1,7 +1,11 @@
-using SMC = Sucrose.Memory.Constant;
+using System.Diagnostics;
+using SMC = Sucrose.Memory.Constant;
 using SMMI = Sucrose.Manager.Manage.Internal;
 using SMMM = Sucrose.Manager.Manage.Manager;
+using SMR = Sucrose.Memory.Readonly;
+using SSSEL = Sucrose.Shared.Space.Extension.Lifecycle;
 using SSSHL = Sucrose.Shared.Space.Helper.Live;
+using SSSHM = Sucrose.Shared.Space.Helper.Management;
 using SSSHP = Sucrose.Shared.Space.Helper.Processor;
 using SWUD = Skylark.Wing.Utility.Desktop;
 
@@ -13,6 +17,8 @@ public static void Stop()
         {
             SSSHL.Kill();
 
+            StopSubprocess();
+
             if (!string.IsNullOrEmpty(SMMM.App))
             {
                 SSSHP.Kill(SMMM.App);
@@ -22,5 +28,23 @@ public static void Stop()
 
             SMMI.AuroraSettingManager.SetSetting(SMC.App, string.Empty);
         }
+
+        public static void StopSubprocess()
+        {
+            try
+            {
+                Process[] Processes = Process.GetProcesses();
+
+                Processes
+                    .Where(Process => (Process.ProcessName.Contains(SMR.WebViewProcessName) || Process.ProcessName.Contains(SMR.CefSharpProcessName)) && SSSHM.GetCommandLine(Process).Contains(SMR.AppName))
+                    .ToList()
+                    .ForEach(Process =>
+                    {
+                        SSSEL.Resume(Process);
+                        Process.Kill();
+                    });
+            }
+            catch { }
+        }
     }
 }
diff --git a/src/Shared/Sucrose.Shared.Live/Helper/Run.cs b/src/Shared/Sucrose.Shared.Live/Helper/Run.cs
@@ -4,6 +4,7 @@
 using SMR = Sucrose.Memory.Readonly;
 using SSDECT = Sucrose.Shared.Dependency.Enum.CommandsType;
 using SSDEWT = Sucrose.Shared.Dependency.Enum.WallpaperType;
+using SSLHK = Sucrose.Shared.Live.Helper.Kill;
 using SSLMM = Sucrose.Shared.Live.Manage.Manager;
 using SSSHP = Sucrose.Shared.Space.Helper.Processor;
 using SSSMI = Sucrose.Shared.Space.Manage.Internal;
@@ -23,6 +24,8 @@ public static void Start()
 
                 if (Info.AppVersion.CompareTo(SHV.Entry()) <= 0)
                 {
+                    SSLHK.StopSubprocess();
+
                     if (SMMM.PerformanceCounter)
                     {
                         SSSHP.Run(SSSMI.Commandog, $"{SMR.StartCommand}{SSDECT.Backgroundog}{SMR.ValueSeparator}{SSSMI.Backgroundog}");

diff --git a/...crose.Backgroundog/Extension/Lifecycle.cs → ...crose.Shared.Space/Extension/Lifecycle.cs b/...crose.Backgroundog/Extension/Lifecycle.cs → ...crose.Shared.Space/Extension/Lifecycle.cs
@@ -1,8 +1,8 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
-using SBMI = Sucrose.Backgroundog.Manage.Internal;
+using SSSMI = Sucrose.Shared.Space.Manage.Internal;
 
-namespace Sucrose.Backgroundog.Extension
+namespace Sucrose.Shared.Space.Extension
 {
     internal static class Lifecycle
     {
@@ -48,7 +48,7 @@ public static void ResumeThread(Process Process)
         {
             foreach (ProcessThread Thread in Process.Threads)
             {
-                IntPtr Threading = OpenThread(SBMI.THREAD_SUSPEND_RESUME, false, Thread.Id);
+                IntPtr Threading = OpenThread(SSSMI.THREAD_SUSPEND_RESUME, false, Thread.Id);
 
                 ResumeThread(Threading);
             }
@@ -58,7 +58,7 @@ public static void SuspendThread(Process Process)
         {
             foreach (ProcessThread Thread in Process.Threads)
             {
-                IntPtr Threading = OpenThread(SBMI.THREAD_SUSPEND_RESUME, false, Thread.Id);
+                IntPtr Threading = OpenThread(SSSMI.THREAD_SUSPEND_RESUME, false, Thread.Id);
 
                 SuspendThread(Threading);
             }

diff --git a/src/Shared/Sucrose.Shared.Space/Helper/Import.cs b/src/Shared/Sucrose.Shared.Space/Helper/Import.cs
@@ -1,6 +1,6 @@
 using System.IO;
 using SMR = Sucrose.Memory.Readonly;
-using SSSHL = Sucrose.Shared.Space.Helper.Live;
+using SSLHK = Sucrose.Shared.Live.Helper.Kill;
 using SSSHP = Sucrose.Shared.Space.Helper.Processor;
 
 namespace Sucrose.Shared.Space.Helper
@@ -11,7 +11,7 @@ public static void Start(string Destination, string Application)
         {
             try
             {
-                SSSHL.Kill();
+                SSLHK.Stop();
                 SSSHP.Kill(Application);
 
                 foreach (string Setting in Settings(Destination))

diff --git a/src/Shared/Sucrose.Shared.Space/Helper/Temporary.cs b/src/Shared/Sucrose.Shared.Space/Helper/Temporary.cs
@@ -1,5 +1,5 @@
 using System.IO;
-using SSSHL = Sucrose.Shared.Space.Helper.Live;
+using SSLHK = Sucrose.Shared.Live.Helper.Kill;
 using SSSHP = Sucrose.Shared.Space.Helper.Processor;
 
 namespace Sucrose.Shared.Space.Helper
@@ -10,7 +10,7 @@ public static void Delete(string Path, string Application)
         {
             try
             {
-                SSSHL.Kill();
+                SSLHK.Stop();
                 SSSHP.Kill(Application);
 
                 Directory.Delete(Path, true);
@@ -21,7 +21,7 @@ public static void Delete(string Path, string Application)
             {
                 try
                 {
-                    SSSHL.Kill();
+                    SSLHK.Stop();
                     SSSHP.Kill(Application);
 
                     File.Delete(Path);

diff --git a/src/Shared/Sucrose.Shared.Space/Manage/Internal.cs b/src/Shared/Sucrose.Shared.Space/Manage/Internal.cs
@@ -26,6 +26,8 @@ internal static class Internal
 
         public static SSDEAET ApplicationEngine = SSDEAET.Aurora;
 
+        public static int THREAD_SUSPEND_RESUME => 0x0002;
+
         public static string This => Path.GetDirectoryName(App);
 
         public static string Folder => Path.Combine(This, @"..\");

diff --git a/src/Shared/Sucrose.Shared.Space/Sucrose.Shared.Space.projitems b/src/Shared/Sucrose.Shared.Space/Sucrose.Shared.Space.projitems
@@ -9,6 +9,7 @@
     <Import_RootNamespace>Sucrose.Shared.Space</Import_RootNamespace>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)Extension\Lifecycle.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Helper\Copy.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Helper\Graphic.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Helper\Management.cs" />
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,6 +21,10 @@ public static void Command() @@
                     {
                         SSLHK.Stop();
                     }
+                    else
+                    {
+                        SSLHK.StopSubprocess();
+                    }
                     if (SSSHP.Work(SMR.Portal))
                     {
@@ Expand Down @@