Skip to content

Commit

Permalink
Update cancellation support
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ruben2776
Ruben2776 committed Jan 1, 2025
1 parent c4c4e91 commit 706818c
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 15 deletions.
26 changes: 16 additions & 10 deletions src/PicView.Avalonia/Navigation/ImageIterator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ public int GetIteration(int index, NavigateTo navigateTo, bool skip1 = false, bo
return next;
}

public async Task NextIteration(NavigateTo navigateTo)
public async Task NextIteration(NavigateTo navigateTo, CancellationToken cancellationToken = default)
{
var index = GetIteration(CurrentIndex, navigateTo, SettingsHelper.Settings.ImageScaling.ShowImageSideBySide);
if (index < 0)
Expand All @@ -452,11 +452,11 @@ public async Task NextIteration(NavigateTo navigateTo)

if (!MainKeyboardShortcuts.IsKeyHeldDown)
{
await IterateToIndex(index);
await IterateToIndex(index, cancellationToken).ConfigureAwait(false);
}
else
{
await TimerIteration(index);
await TimerIteration(index).ConfigureAwait(false);
}
}

Expand All @@ -472,16 +472,15 @@ public async Task Next100Iteration(bool forwards)
await IterateToIndex(index).ConfigureAwait(false);
}

public async Task IterateToIndex(int index)
public async Task IterateToIndex(int index, CancellationToken cancellationToken = default)
{
SetTitleHelper.SetLoadingTitle(_vm);

if (index < 0 || index >= ImagePaths.Count)
{
ErrorHandling.ShowStartUpMenu(_vm);
return;
}

using var cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
// UI is more responsive when started in new thread
await Task.Run(async () =>
{
Expand All @@ -500,10 +499,11 @@ await Task.Run(async () =>

while (preloadValue.IsLoading)
{
await Task.Delay(20).ConfigureAwait(false);
await Task.Delay(20, cancellationToken).ConfigureAwait(false);
if (CurrentIndex != index)
{
// Skip loading if user went to next value
await cts.CancelAsync();
return;
}
}
Expand All @@ -517,6 +517,7 @@ await Task.Run(async () =>
if (CurrentIndex != index)
{
// Skip loading if user went to next value
await cts.CancelAsync();
return;
}

Expand All @@ -527,18 +528,21 @@ await Task.Run(async () =>
if (CurrentIndex != index)
{
// Skip loading if user went to next value
await cts.CancelAsync();
return;
}

if (nextPreloadValue is not null)
{
_vm.SecondaryImageSource = nextPreloadValue.ImageModel?.Image;
}
cancellationToken.ThrowIfCancellationRequested();
await UpdateImage.UpdateSource(_vm, index, ImagePaths, IsReversed, preloadValue, nextPreloadValue)
.ConfigureAwait(false);
}
else
{
cancellationToken.ThrowIfCancellationRequested();
await UpdateImage.UpdateSource(_vm, index, ImagePaths, IsReversed, preloadValue)
.ConfigureAwait(false);
}
Expand All @@ -553,7 +557,7 @@ await Dispatcher.UIThread.InvokeAsync(() =>
});
}

await PreLoader.PreLoadAsync(CurrentIndex, ImagePaths.Count, IsReversed, ImagePaths)
await PreLoader.PreLoadAsync(CurrentIndex, ImagePaths.Count, IsReversed, ImagePaths, cancellationToken)
.ConfigureAwait(false);
}

Expand Down Expand Up @@ -581,6 +585,8 @@ await PreLoader.PreLoadAsync(CurrentIndex, ImagePaths.Count, IsReversed, ImagePa

void TryShowPreview(PreLoadValue preloadValue)
{
SetTitleHelper.SetLoadingTitle(_vm);

if (preloadValue is null)
{
return;
Expand All @@ -600,7 +606,7 @@ void TryShowPreview(PreLoadValue preloadValue)
_vm.ImageSource = null;
_vm.SecondaryImageSource = null;
}
});
}, cancellationToken);
}

private static Timer? _timer;
Expand All @@ -627,7 +633,7 @@ internal async Task TimerIteration(int index)

_timer.Interval = TimeSpan.FromSeconds(SettingsHelper.Settings.UIProperties.NavSpeed).TotalMilliseconds;
_timer.Start();
await IterateToIndex(index);
await IterateToIndex(index).ConfigureAwait(false);
}

public void UpdateFileListAndIndex(List<string> fileList, int index)
Expand Down
33 changes: 32 additions & 1 deletion src/PicView.Avalonia/Navigation/NavigationHelper.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ namespace PicView.Avalonia.Navigation;
/// </summary>
public static class NavigationHelper
{
private static CancellationTokenSource? _cancellationTokenSource;

#region Navigation

Expand Down Expand Up @@ -59,7 +60,8 @@ public static async Task Navigate(bool next, MainViewModel vm)
else
{
var navigateTo = next ? NavigateTo.Next : NavigateTo.Previous;
await vm.ImageIterator.NextIteration(navigateTo).ConfigureAwait(false);
_cancellationTokenSource = new CancellationTokenSource();
await vm.ImageIterator.NextIteration(navigateTo, _cancellationTokenSource.Token).ConfigureAwait(false);
}
}

Expand Down Expand Up @@ -147,6 +149,10 @@ public static async Task GoToNextFolder(bool next, MainViewModel vm)
return;
}
SetTitleHelper.SetLoadingTitle(vm);
if (_cancellationTokenSource is not null)
{
await _cancellationTokenSource.CancelAsync();
}
var fileList = await GetNextFolderFileList(next, vm).ConfigureAwait(false);

if (fileList is null)
Expand Down Expand Up @@ -180,6 +186,11 @@ public static async Task LoadPicFromStringAsync(string source, MainViewModel vm)
UIHelper.CloseMenus(vm);
vm.IsLoading = true;
SetTitleHelper.SetLoadingTitle(vm);

if (_cancellationTokenSource is not null)
{
await _cancellationTokenSource.CancelAsync();
}

// Starting in new task makes it more responsive and works better
await Task.Run(async () =>
Expand Down Expand Up @@ -263,6 +274,11 @@ public static async Task LoadPicFromFile(string fileName, MainViewModel vm, File
{
vm.PlatformService.StopTaskbarProgress();
}

if (_cancellationTokenSource is not null)
{
await _cancellationTokenSource.CancelAsync();
}

if (vm.ImageIterator is not null)
{
Expand Down Expand Up @@ -313,6 +329,11 @@ public static async Task LoadPicFromFile(string fileName, MainViewModel vm, File
/// </returns>
public static async Task LoadPicFromArchiveAsync(string path, MainViewModel vm)
{
if (_cancellationTokenSource is not null)
{
await _cancellationTokenSource.CancelAsync();
}

var extraction = await ArchiveExtraction.ExtractArchiveAsync(path, vm.PlatformService.ExtractWithLocalSoftwareAsync).ConfigureAwait(false);
if (!extraction)
{
Expand Down Expand Up @@ -349,6 +370,11 @@ public static async Task LoadPicFromArchiveAsync(string path, MainViewModel vm)
/// <returns>A task representing the asynchronous operation.</returns>
public static async Task LoadPicFromUrlAsync(string url, MainViewModel vm)
{
if (_cancellationTokenSource is not null)
{
await _cancellationTokenSource.CancelAsync();
}

string destination;

try
Expand Down Expand Up @@ -466,6 +492,11 @@ public static async Task LoadPicFromDirectoryAsync(string file, MainViewModel vm
vm.IsLoading = true;
SetTitleHelper.SetLoadingTitle(vm);

if (_cancellationTokenSource is not null)
{
await _cancellationTokenSource.CancelAsync();
}

if (SettingsHelper.Settings.UIProperties.IsTaskbarProgressEnabled)
{
vm.PlatformService.StopTaskbarProgress();
Expand Down
12 changes: 8 additions & 4 deletions src/PicView.Avalonia/Views/ImageViewer.axaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
using PicView.Core.Config;
using PicView.Core.ImageDecoding;
using PicView.Core.ImageTransformations;
using PicView.Core.Navigation;
using Point = Avalonia.Point;

namespace PicView.Avalonia.Views;
Expand Down Expand Up @@ -185,13 +184,18 @@ async Task LoadNextPic()
{
return;
}
var navigateTo = SettingsHelper.Settings.Zoom.HorizontalReverseScroll ? NavigateTo.Previous : NavigateTo.Next;

bool next;
if (reverse)
{
navigateTo = SettingsHelper.Settings.Zoom.HorizontalReverseScroll ? NavigateTo.Next : NavigateTo.Previous;
next = SettingsHelper.Settings.Zoom.HorizontalReverseScroll;
}
else
{
next = !SettingsHelper.Settings.Zoom.HorizontalReverseScroll;
}

await mainViewModel.ImageIterator.NextIteration(navigateTo).ConfigureAwait(false);
await NavigationHelper.Navigate(next, mainViewModel).ConfigureAwait(false);
}
}

Expand Down

0 comments on commit 706818c

Please sign in to comment.