mirrors/Sheas-Cealer
1
0
Fork 0
mirror of https://github.com/SpaceTimee/Sheas-Cealer.git synced 2025-07-13 04:42:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

1.1.3 -> 1.1.4 第64次更新

Browse Source
This commit is contained in:
Space Time 2024-12-15 19:24:01 +08:00
parent 029bd787dc
commit 8637b18fd2
8 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Proces/BrowserProc.cs
View File

@ -1,6 +1,6 @@
using System;
using System.Windows;
using SheasCore;
using Sheas_Core;
namespace Sheas_Cealer.Proces;

2
Proces/MihomoProc.cs
View File

@ -1,5 +1,5 @@
using Sheas_Cealer.Consts;
using SheasCore;
using Sheas_Core;
namespace Sheas_Cealer.Proces;

4
Proces/NginxProc.cs
View File

@ -1,7 +1,7 @@
using System;
using Sheas_Cealer.Consts;
using Sheas_Cealer.Utils;
using SheasCore;
using Sheas_Core;
namespace Sheas_Cealer.Proces;
@ -9,5 +9,5 @@ internal class NginxProc : Proc
{
internal NginxProc() : base(MainConst.NginxPath) { }
public override void Process_Exited(object sender, EventArgs e) => NginxStoppedCleaner.Clean();
public override void Process_Exited(object sender, EventArgs e) => NginxCleaner.Clean();
}

10
Props/AssemblyInfo.cs
View File

@ -1,10 +0,0 @@
using System.Windows;
[assembly: ThemeInfo(
ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
//(used if a resource is not found in the page,
// or application resource dictionaries)
ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
//(used if a resource is not found in the page,
// app, or any theme specific resource dictionaries)
)]

2
Sheas-Cealer.csproj
View File

@ -75,7 +75,7 @@
<HintPath>..\Ona-Core\bin\Release\net8.0-windows10.0.26100.0\Ona-Core.dll</HintPath>
</Reference>
<Reference Include="Sheas-Core">
<HintPath>..\Sheas-Core\bin\Release\Sheas-Core.dll</HintPath>
<HintPath>..\Sheas-Core\bin\Release\net8.0-windows10.0.26100.0\Sheas-Core.dll</HintPath>
</Reference>
</ItemGroup>

2
Utils/NginxStoppedCleaner.cs → Utils/NginxCleaner.cs
View File

@ -5,7 +5,7 @@ using Sheas_Cealer.Consts;
namespace Sheas_Cealer.Utils
{
internal static class NginxStoppedCleaner
internal static class NginxCleaner
{
private static readonly object IsCleaningLock = new();

2
Wins/AboutWin.xaml.cs
View File

@ -6,7 +6,7 @@ using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
using OnaCore;
using Ona_Core;
using Sheas_Cealer.Consts;
using Sheas_Cealer.Preses;
using Sheas_Cealer.Utils;

12
Wins/MainWin.xaml.cs
View File

@ -20,7 +20,7 @@ using System.Windows.Threading;
using MaterialDesignThemes.Wpf;
using Microsoft.Win32;
using NginxConfigParser;
using OnaCore;
using Ona_Core;
using Sheas_Cealer.Consts;
using Sheas_Cealer.Preses;
using Sheas_Cealer.Proces;
@ -83,7 +83,7 @@ public partial class MainWin : Window
MihomoConfWatcher_Changed(null!, null!);
if (!MainPres.IsNginxRunning)
NginxStoppedCleaner.Clean();
NginxCleaner.Clean();
UpdateUpstreamHostButton_Click(null!, null!);
});
@ -172,7 +172,7 @@ public partial class MainWin : Window
await Task.Run(() =>
{
new BrowserProc(MainPres.BrowserPath, sender == null).ShellRun(Path.GetDirectoryName(MainPres.BrowserPath), ($"{CealArgs} {MainPres.ExtraArgs.Trim()}"));
new BrowserProc(MainPres.BrowserPath, sender == null).Run(Path.GetDirectoryName(MainPres.BrowserPath), ($"{CealArgs} {MainPres.ExtraArgs.Trim()}"));
});
}
private void NginxButton_Click(object sender, RoutedEventArgs e)
@ -266,7 +266,7 @@ public partial class MainWin : Window
await Task.Run(() =>
{
new NginxProc().ShellRun(Path.GetDirectoryName(MainConst.NginxPath), @$"-c ""{Path.GetRelativePath(Path.GetDirectoryName(MainConst.NginxPath)!, MainConst.NginxConfPath)}""");
new NginxProc().Run(Path.GetDirectoryName(MainConst.NginxPath), @$"-c ""{Path.GetRelativePath(Path.GetDirectoryName(MainConst.NginxPath)!, MainConst.NginxConfPath)}""");
});
while (true)
@ -304,7 +304,7 @@ public partial class MainWin : Window
await nginxProcess.WaitForExitAsync();
}
NginxStoppedCleaner.Clean();
NginxCleaner.Clean();
}
}
private void MihomoButton_Click(object sender, RoutedEventArgs e)
@ -338,7 +338,7 @@ public partial class MainWin : Window
await Task.Run(() =>
{
new MihomoProc().ShellRun(Path.GetDirectoryName(MainConst.MihomoPath), @$"-d ""{Path.GetDirectoryName(MainConst.MihomoConfPath)}""");
new MihomoProc().Run(Path.GetDirectoryName(MainConst.MihomoPath), @$"-d ""{Path.GetDirectoryName(MainConst.MihomoConfPath)}""");
});
while (true)