Commit 58e2393

committed

fix: should use new CancellationTokenSource for executing command each time (#1012)

Signed-off-by: leo <longshuang@msn.cn>

1 parent d0a32eb commit 58e2393Copy full SHA for 58e2393

File tree

3 files changed

+24

-11

lines changed

src/ViewModels

3 files changed

+24

-11

lines changed

`‎src/ViewModels/Clone.cs`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.ComponentModel.DataAnnotations;`
`3`	`3`	`using System.IO;`
	`4`	`+using System.Threading;`
`4`	`5`	`using System.Threading.Tasks;`
`5`	`6`
`6`	`7`	`using Avalonia.Threading;`
`@@ -101,10 +102,11 @@ public override Task<bool> Sure()`
`101`	`102`	`{`
`102`	`103`	`ProgressDescription = "Clone ...";`
`103`	`104`
	`105`	`+ _cancellation = new CancellationTokenSource();`
`104`	`106`	`return Task.Run(() =>`
`105`	`107`	`{`
`106`	`108`	`var cmd = new Commands.Clone(_pageId, _parentFolder, _remote, _local, _useSSH ? _sshKey : "", _extraArgs, SetProgressDescription);`
`107`		`- cmd.CancellationToken = CancelInProgressTokenSource.Token;`
	`109`	`+ cmd.CancellationToken = _cancellation.Token;`
`108`	`110`	`if (!cmd.Exec())`
`109`	`111`	`return false;`
`110`	`112`
`@@ -169,12 +171,18 @@ public override Task<bool> Sure()`
`169`	`171`	`});`
`170`	`172`	`}`
`171`	`173`
	`174`	`+ public override void DoCancelInProgress()`
	`175`	`+ {`
	`176`	`+ _cancellation?.Cancel();`
	`177`	`+ }`
	`178`	`+`
`172`	`179`	`private string _pageId = string.Empty;`
`173`	`180`	`private string _remote = string.Empty;`
`174`	`181`	`private bool _useSSH = false;`
`175`	`182`	`private string _sshKey = string.Empty;`
`176`	`183`	`private string _parentFolder = Preferences.Instance.GitDefaultCloneDir;`
`177`	`184`	`private string _local = string.Empty;`
`178`	`185`	`private string _extraArgs = string.Empty;`
	`186`	`+ private CancellationTokenSource _cancellation = null;`
`179`	`187`	`}`
`180`	`188`	`}`

`‎src/ViewModels/Fetch.cs`

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System.Collections.Generic;`
	`2`	`+using System.Threading;`
`2`	`3`	`using System.Threading.Tasks;`
`3`	`4`
`4`	`5`	`namespace SourceGit.ViewModels`
`@@ -63,6 +64,7 @@ public Fetch(Repository repo, Models.Remote preferedRemote = null)`
`63`	`64`	`public override Task<bool> Sure()`
`64`	`65`	`{`
`65`	`66`	`_repo.SetWatcherEnabled(false);`
	`67`	`+ _cancellation = new CancellationTokenSource();`
`66`	`68`
`67`	`69`	`var notags = _repo.Settings.FetchWithoutTags;`
`68`	`70`	`var force = _repo.Settings.EnableForceOnFetch;`
`@@ -74,15 +76,15 @@ public override Task<bool> Sure()`
`74`	`76`	`{`
`75`	`77`	`SetProgressDescription($"Fetching remote: {remote.Name}");`
`76`	`78`	`var cmd = new Commands.Fetch(_repo.FullPath, remote.Name, notags, force, SetProgressDescription);`
`77`		`- cmd.CancellationToken = CancelInProgressTokenSource.Token;`
	`79`	`+ cmd.CancellationToken = _cancellation.Token;`
`78`	`80`	`cmd.Exec();`
`79`	`81`	`}`
`80`	`82`	`}`
`81`	`83`	`else`
`82`	`84`	`{`
`83`	`85`	`SetProgressDescription($"Fetching remote: {SelectedRemote.Name}");`
`84`	`86`	`var cmd = new Commands.Fetch(_repo.FullPath, SelectedRemote.Name, notags, force, SetProgressDescription);`
`85`		`- cmd.CancellationToken = CancelInProgressTokenSource.Token;`
	`87`	`+ cmd.CancellationToken = _cancellation.Token;`
`86`	`88`	`cmd.Exec();`
`87`	`89`	`}`
`88`	`90`
`@@ -96,7 +98,13 @@ public override Task<bool> Sure()`
`96`	`98`	`});`
`97`	`99`	`}`
`98`	`100`
	`101`	`+ public override void DoCancelInProgress()`
	`102`	`+ {`
	`103`	`+ _cancellation?.Cancel();`
	`104`	`+ }`
	`105`	`+`
`99`	`106`	`private readonly Repository _repo = null;`
`100`	`107`	`private bool _fetchAllRemotes;`
	`108`	`+ private CancellationTokenSource _cancellation = null;`
`101`	`109`	`}`
`102`	`110`	`}`

`‎src/ViewModels/Popup.cs`

Lines changed: 5 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Diagnostics.CodeAnalysis;`
`3`		`-using System.Threading;`
`4`	`3`	`using System.Threading.Tasks;`
`5`	`4`
`6`	`5`	`using Avalonia.Threading;`
`@@ -35,12 +34,6 @@ public bool CanCancelInProgress`
`35`	`34`	`set;`
`36`	`35`	`} = false;`
`37`	`36`
`38`		`- public CancellationTokenSource CancelInProgressTokenSource`
`39`		`- {`
`40`		`- get;`
`41`		`- set;`
`42`		`- } = new CancellationTokenSource();`
`43`		`-`
`44`	`37`	`[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode")]`
`45`	`38`	`public bool Check()`
`46`	`39`	`{`
`@@ -53,7 +46,7 @@ public bool Check()`
`53`	`46`	`public void CancelInProgress()`
`54`	`47`	`{`
`55`	`48`	`if (CanCancelInProgress)`
`56`		`- CancelInProgressTokenSource.Cancel();`
	`49`	`+ DoCancelInProgress();`
`57`	`50`	`}`
`58`	`51`
`59`	`52`	`public virtual bool CanStartDirectly()`
`@@ -66,6 +59,10 @@ public virtual Task<bool> Sure()`
`66`	`59`	`return null;`
`67`	`60`	`}`
`68`	`61`
	`62`	`+ public virtual void DoCancelInProgress()`
	`63`	`+ {`
	`64`	`+ }`
	`65`	`+`
`69`	`66`	`protected void CallUIThread(Action action)`
`70`	`67`	`{`
`71`	`68`	`Dispatcher.UIThread.Invoke(action);`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 58e2393

File tree

3 files changed

3 files changed

`‎src/ViewModels/Clone.cs`

`‎src/ViewModels/Fetch.cs`

`‎src/ViewModels/Popup.cs`

0 commit comments