Skip to content

Commit 68e66be

Browse files
Fixed bug report and update check logic, refined UI progress visibility
1 parent 2002cfd commit 68e66be

3 files changed

Lines changed: 12 additions & 7 deletions

File tree

BatchConvertToCHD/MainWindow.xaml.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -687,6 +687,9 @@ private void SetControlsState(bool enabled)
687687
ExtractHdRadioButton.IsEnabled = enabled;
688688
StartExtractionButton.IsEnabled = enabled;
689689
MainTabControl.IsEnabled = enabled;
690+
691+
// Toggle progress area visibility
692+
ProgressAreaGrid.Visibility = enabled ? Visibility.Collapsed : Visibility.Visible;
690693
ProgressText.Visibility = enabled ? Visibility.Collapsed : Visibility.Visible;
691694
ProgressBar.Visibility = enabled ? Visibility.Collapsed : Visibility.Visible;
692695
ProgressBar.IsIndeterminate = !enabled; // Start moving immediately

BatchConvertToCHD/Services/BugReportService.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,7 @@ private static string GetEnvironmentDetailsReport()
117117
sb.AppendLine(CultureInfo.InvariantCulture, $"Application Version: {Assembly.GetExecutingAssembly().GetName().Version}");
118118
sb.AppendLine(CultureInfo.InvariantCulture, $"Base Directory: {AppDomain.CurrentDomain.BaseDirectory}");
119119
sb.AppendLine(CultureInfo.InvariantCulture, $"Temp Path: {Path.GetTempPath()}");
120-
sb.AppendLine(CultureInfo.InvariantCulture, $"User: {Environment.UserName}");
121-
sb.AppendLine(CultureInfo.InvariantCulture, $"CHDMAN Available: {File.Exists(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "chdman.exe"))}");
120+
sb.AppendLine(CultureInfo.InvariantCulture, $"CHDMAN Available: {File.Exists(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, AppConfig.ChdmanExeName))}");
122121
sb.AppendLine(CultureInfo.InvariantCulture, $"MAXCSO Available: {File.Exists(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "maxcso.exe"))}");
123122
return sb.ToString();
124123
}

BatchConvertToCHD/Services/UpdateService.cs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,16 @@ public async Task CheckForNewVersionAsync(Action<string> onLog, Action<string> o
2121
{
2222
try
2323
{
24-
HttpClient.DefaultRequestHeaders.UserAgent.Clear();
25-
HttpClient.DefaultRequestHeaders.Add("User-Agent", _applicationName);
26-
2724
onLog("Checking for updates on GitHub...");
28-
var response = await HttpClient.GetStringAsync(GitHubApiLatestReleaseUrl);
2925

30-
var latestRelease = JsonSerializer.Deserialize<GitHubRelease>(response, JsonSerializerOptions);
26+
using var request = new HttpRequestMessage(HttpMethod.Get, GitHubApiLatestReleaseUrl);
27+
request.Headers.UserAgent.ParseAdd(_applicationName);
28+
29+
var response = await HttpClient.SendAsync(request);
30+
response.EnsureSuccessStatusCode();
31+
32+
var responseBody = await response.Content.ReadAsStringAsync();
33+
var latestRelease = JsonSerializer.Deserialize<GitHubRelease>(responseBody, JsonSerializerOptions);
3134
if (latestRelease == null || latestRelease.Draft || latestRelease.Prerelease || string.IsNullOrWhiteSpace(latestRelease.TagName))
3235
{
3336
onLog("Latest release is invalid, draft, or prerelease. Skipping.");

0 commit comments

Comments
 (0)