fixes/reload button fix

This commit is contained in:
Cameron
2024-04-29 08:14:04 -04:00
parent 8ea493f2c8
commit 87d9e7abb6
3 changed files with 95 additions and 7 deletions
+2 -5
View File
@@ -1,15 +1,13 @@
using Markdowser.ViewModels;
using System.Collections.Generic;
namespace Markdowser.Utilities
{
namespace Markdowser.Utilities
{
public class CacheService
{
private Dictionary<string, ContentViewModelBase> cache = new Dictionary<string, ContentViewModelBase>();
public ContentViewModelBase Get(string url)
public ContentViewModelBase? Get(string url)
{
if (cache.ContainsKey(url))
{
@@ -26,5 +24,4 @@ namespace Markdowser.Utilities
cache[url] = content;
}
}
}
}
}
@@ -6,7 +6,6 @@ using Markdowser.Models;
using Markdowser.Processing;
using Markdowser.Processing.Processors;
using Markdowser.Utilities;
using Markdowser.Utilities.Markdowser.Utilities;
using Markdowser.ViewModels.Content;
using ReactiveUI;
@@ -103,6 +102,8 @@ public partial class MainWindowViewModel : ViewModelBase
public bool ForwardEnabled => GlobalState.ForwardHistory.Count > 0;
public bool ProgressIndeterminate => Progress == 0;
public ICommand Browse => ReactiveCommand.Create(FetchUrl);
public ICommand Reload => ReactiveCommand.Create(FetchUrlIgnoringCache);
public ICommand Back => ReactiveCommand.Create(() =>
{
@@ -315,4 +316,93 @@ private void FetchUrl()
}
});
}
private void FetchUrlIgnoringCache()
{
if (IsBusy)
{
WindowNotificationManager.Show(new Notification("Busy", "The browser is currently busy.", NotificationType.Warning));
return;
}
if (string.IsNullOrWhiteSpace(Url))
{
Content = DefaultContent;
Debug.WriteLine("URL is empty.");
CurrentTab.Header = "New Tab";
return;
}
if (!IsValidHttpUri(Url, out _))
{
if (Url.StartsWith("//"))
{
Url = $"https:{Url}";
}
else
{
// Search with duckduckgo
try
{
Url = string.Format(Settings.Current.SearchEngineUrl, Uri.EscapeDataString(Url));
}
catch (FormatException ex)
{
WindowNotificationManager.Show(new Notification("Invalid Search Engine URL", $"{ex.Message}", NotificationType.Error));
}
}
}
IsBusy = true;
Progress = 0;
_ = Task.Run(async () =>
{
Debug.WriteLine("Fetching URL...");
try
{
HttpResponseMessage httpResponseMessage = await httpClient.GetAsync(Url);
string? newUrl = httpResponseMessage.RequestMessage?.RequestUri?.ToString();
if (newUrl is not null && newUrl != Url)
{
string oldUrl = Url;
Dispatcher.UIThread.Post(() => WindowNotificationManager.Show(new Notification("Redirected", $"Redirected from\n{oldUrl}\nto\n{newUrl}", NotificationType.Warning)));
Url = newUrl;
}
if (!httpResponseMessage.IsSuccessStatusCode)
{
IsBusy = false;
StringBuilder errorMessage = new();
_ = errorMessage.AppendLine($"# {(int)httpResponseMessage.StatusCode} {httpResponseMessage.StatusCode}");
_ = errorMessage.AppendLine($"Failed to fetch URL: {httpResponseMessage.ReasonPhrase}");
Content = new MarkdownContentViewModel("Error", errorMessage.ToString());
return;
}
Content = await contentProcessorManager.ProcessContent(httpResponseMessage, new Progress<ProcessingProgress>(p => Progress = p.Percentage));
cacheService.Set(Url, Content);
Dispatcher.UIThread.Post(() => CurrentTab.Header = Content.Title);
}
catch (HttpRequestException e)
{
// Handle exception
}
catch (Exception e)
{
// Handle exception
}
finally
{
IsBusy = false;
}
});
}
}
+2 -1
View File
@@ -32,7 +32,7 @@
<Window.KeyBindings>
<KeyBinding Gesture="Ctrl+R" Command="{Binding Browse}" />
<KeyBinding Gesture="F5" Command="{Binding Browse}" />
<KeyBinding Gesture="F5" Command="{Binding Reload}" />
<KeyBinding Gesture="Alt+Home" Command="{StaticResource HomeCommand}" />
<KeyBinding Gesture="Alt+H" Command="{StaticResource HomeCommand}" />
<KeyBinding Gesture="Alt+Left" Command="{Binding Back}" />
@@ -85,6 +85,7 @@
<Button Grid.Column="1" i:Attached.Icon="fa-solid fa-caret-right" IsEnabled="{Binding ForwardEnabled}" Command="{Binding Forward}" />
<Button Grid.Column="2" i:Attached.Icon="fa-solid fa-rotate-right" Command="{Binding Browse}" />
<Button Grid.Column="3" i:Attached.Icon="fa-solid fa-house" Command="{StaticResource HomeCommand}" />
<Button Grid.Column="4" i:Attached.Icon="fa-solid fa-sync" Command="{Binding Reload}" />
<Grid Grid.Column="4">
<TextBox IsVisible="{Binding !IsBusy}" Watermark="Search or type a URL" Text="{Binding Url}" BorderThickness="0">