diff --git a/Mlaumcherb.Client.Avalonia/Config.cs b/Mlaumcherb.Client.Avalonia/Config.cs index 7f5b03d..0c6f36b 100644 --- a/Mlaumcherb.Client.Avalonia/Config.cs +++ b/Mlaumcherb.Client.Avalonia/Config.cs @@ -27,9 +27,9 @@ public record Config new() { name = "Mojang", url = "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json" }, ]; - public UpdateHelper.GiteaConfig gitea { get; set; } = new UpdateHelper.GiteaConfig + public UpdateHelper.GiteaConfig gitea { get; set; } = new() { - serverUrl = "https://timerix.ddns.net:3322", + serverUrl = "https://timerix.ddns.net/git/", user = "Timerix", repo = "mlaumcherb", }; diff --git a/Mlaumcherb.Client.Avalonia/LauncherLogger.cs b/Mlaumcherb.Client.Avalonia/LauncherLogger.cs index ba8ca55..40594a4 100644 --- a/Mlaumcherb.Client.Avalonia/LauncherLogger.cs +++ b/Mlaumcherb.Client.Avalonia/LauncherLogger.cs @@ -5,7 +5,7 @@ public class LauncherLogger : ILogger private CompositeLogger _compositeLogger; private FileLogger _fileLogger; public static readonly IOPath LogsDirectory = "launcher_logs"; - public IOPath LogfileName => _fileLogger.LogfileName; + public IOPath LogFilePath => _fileLogger.LogfileName; public LauncherLogger() { diff --git a/Mlaumcherb.Client.Avalonia/зримое/MainWindow.axaml.cs b/Mlaumcherb.Client.Avalonia/зримое/MainWindow.axaml.cs index c2b6cdb..3520aa9 100644 --- a/Mlaumcherb.Client.Avalonia/зримое/MainWindow.axaml.cs +++ b/Mlaumcherb.Client.Avalonia/зримое/MainWindow.axaml.cs @@ -183,7 +183,11 @@ public partial class MainWindow : Window { try { - Launcher.LaunchDirectoryInfoAsync(new DirectoryInfo(Directory.GetCurrent().ToString())) + + string workingDir = Directory.GetCurrent().ToString(); + LauncherApp.Logger.LogDebug(nameof(MainWindow), + $"opening working directory: {workingDir}"); + Launcher.LaunchDirectoryInfoAsync(new DirectoryInfo(workingDir)) .ConfigureAwait(false); } catch (Exception ex) @@ -196,7 +200,10 @@ public partial class MainWindow : Window { try { - Launcher.LaunchFileInfoAsync(new FileInfo(LauncherApp.Logger.LogfileName.ToString())) + string logFilePath = LauncherApp.Logger.LogFilePath.ToString(); + LauncherApp.Logger.LogDebug(nameof(MainWindow), + $"opening log file: {logFilePath}"); + Launcher.LaunchFileInfoAsync(new FileInfo(logFilePath)) .ConfigureAwait(false); } catch (Exception ex) @@ -209,7 +216,10 @@ public partial class MainWindow : Window { try { - Launcher.LaunchUriAsync(new Uri("https://timerix.ddns.net:3322/Timerix/mlaumcherb")) + var sourcesUri = new Uri(LauncherApp.Config.gitea.GetRepoUrl()); + LauncherApp.Logger.LogDebug(nameof(MainWindow), + $"opening in web browser: {sourcesUri}"); + Launcher.LaunchUriAsync(sourcesUri) .ConfigureAwait(false); } catch (Exception ex) diff --git a/Mlaumcherb.Client.Avalonia/сеть/Update/Gitea.cs b/Mlaumcherb.Client.Avalonia/сеть/Update/Gitea.cs index f5f4d40..7819e1e 100644 --- a/Mlaumcherb.Client.Avalonia/сеть/Update/Gitea.cs +++ b/Mlaumcherb.Client.Avalonia/сеть/Update/Gitea.cs @@ -32,7 +32,7 @@ public class GiteaClient(string ServerUrl) { public async Task GetLatestRelease(string user, string repo) { - string url = $"{ServerUrl}//api/v1/repos/{user}/{repo}/releases/latest"; + string url = $"{ServerUrl}/api/v1/repos/{user}/{repo}/releases/latest"; return await NetworkHelper.DownloadStringAndDeserialize(url); } } \ No newline at end of file diff --git a/Mlaumcherb.Client.Avalonia/сеть/Update/UpdateHelper.cs b/Mlaumcherb.Client.Avalonia/сеть/Update/UpdateHelper.cs index 6278a98..196d8d7 100644 --- a/Mlaumcherb.Client.Avalonia/сеть/Update/UpdateHelper.cs +++ b/Mlaumcherb.Client.Avalonia/сеть/Update/UpdateHelper.cs @@ -10,15 +10,17 @@ public class UpdateHelper private readonly IOPath executablePathOld; private readonly IOPath executablePathNew; + private readonly GiteaConfig _giteaConfig; public class GiteaConfig { [JsonRequired] public required string serverUrl { get; set; } [JsonRequired] public required string user { get; set; } [JsonRequired] public required string repo { get; set; } + + public string GetRepoUrl() => $"{serverUrl}/{user}/{repo}"; } - private GiteaConfig _giteaConfig; public UpdateHelper(GiteaConfig giteaConfig) {