NebulaTeam/NebulaLauncher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- tweak: loading popup thinks

Browse Source 
* - tweak: change loading handle logic

* - tweak: beautify loading thinks

* - fix: speed thinks while downloading
This commit is contained in:
Cinkafox
2025-12-06 23:25:25 +03:00
committed by GitHub
parent d7f775e80c
commit 0c6bbaadac
39 changed files with 710 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Nebula.Launcher/Services/DecompilerService.cs
View File

@@ -6,6 +6,7 @@ using System.IO;
using System.IO.Compression;
using System.Linq;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Nebula.Launcher.ViewModels.Popup;
using Nebula.Shared;
@@ -25,7 +26,6 @@ public sealed partial class DecompilerService
[GenerateProperty] private ViewHelperService ViewHelperService {get;}
[GenerateProperty] private ContentService ContentService {get;}
[GenerateProperty] private FileService FileService {get;}
[GenerateProperty] private CancellationService CancellationService {get;}
[GenerateProperty] private EngineService EngineService {get;}
[GenerateProperty] private DebugService DebugService {get;}
@@ -44,16 +44,14 @@ public sealed partial class DecompilerService
Process.Start(startInfo);
}
public async void OpenServerDecompiler(RobustUrl url)
public async void OpenServerDecompiler(RobustUrl url, CancellationToken cancellationToken)
{
var myTempDir = FileService.EnsureTempDir(out var tmpDir);
ILoadingHandler loadingHandler = ViewHelperService.GetViewModel<LoadingContextViewModel>();
using var loadingHandler = ViewHelperService.GetViewModel<LoadingContextViewModel>();
var buildInfo =
await ContentService.GetBuildInfo(url, CancellationService.Token);
var engine = await EngineService.EnsureEngine(buildInfo.BuildInfo.Build.EngineVersion);
await ContentService.GetBuildInfo(url, cancellationToken);
var engine = await EngineService.EnsureEngine(buildInfo.BuildInfo.Build.EngineVersion, loadingHandler, cancellationToken);
if (engine is null)
throw new Exception("Engine version not found: " + buildInfo.BuildInfo.Build.EngineVersion);
@@ -64,8 +62,9 @@ public sealed partial class DecompilerService
await stream.DisposeAsync();
}
var hashApi = await ContentService.EnsureItems(buildInfo.RobustManifestInfo, loadingHandler, CancellationService.Token);
var hashApi = await ContentService.EnsureItems(buildInfo.RobustManifestInfo, loadingHandler, cancellationToken);
foreach (var (file, hash) in hashApi.Manifest)
{
if(!file.Contains(".dll") || !hashApi.TryOpen(hash, out var stream)) continue;
@@ -73,8 +72,6 @@ public sealed partial class DecompilerService
await stream.DisposeAsync();
}
((IDisposable)loadingHandler).Dispose();
_logger.Log("File extracted. " + tmpDir);
OpenDecompiler(string.Join(' ', myTempDir.AllFiles.Select(f=>Path.Join(tmpDir, f))) + " --newinstance");
@@ -94,7 +91,7 @@ public sealed partial class DecompilerService
private async Task Download(){
using var loading = ViewHelperService.GetViewModel<LoadingContextViewModel>();
loading.LoadingName = "Download ILSpy";
loading.SetJobsCount(1);
loading.CreateLoadingContext().SetJobsCount(1);
PopupMessageService.Popup(loading);
using var response = await _httpClient.GetAsync(ConfigurationService.GetConfigValue(LauncherConVar.ILSpyUrl));
using var zipArchive = new ZipArchive(await response.Content.ReadAsStreamAsync());

4
Nebula.Launcher/Services/LocalisationService.cs → Nebula.Launcher/Services/LocalizationService.cs
View File

@@ -11,7 +11,7 @@ using Nebula.Shared.Services;
namespace Nebula.Launcher.Services;
[ConstructGenerator, ServiceRegister]
public partial class LocalisationService
public partial class LocalizationService
{
[GenerateProperty] private ConfigurationService ConfigurationService { get; }
[GenerateProperty] private DebugService DebugService { get; }
@@ -74,6 +74,6 @@ public class LocaledText : MarkupExtension
public override object ProvideValue(IServiceProvider serviceProvider)
{
return LocalisationService.GetString(Key, Options);
return LocalizationService.GetString(Key, Options);
}
}