Skip to content

Commit cf69b73

Browse files
committed
Adjust cancelation token
1 parent 97ea598 commit cf69b73

7 files changed

Lines changed: 19 additions & 6 deletions

File tree

src/NovaPointLibrary/Solutions/Automation/CheckInFileAuto.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@ private async Task ProcessItems(string siteUrl, List oList, ProgressTracker pare
115115
var spoItem = new SPOListItemCSOM(_logger, _appInfo);
116116
await foreach (ListItem oItem in spoItem.GetAsync(siteUrl, oList, _param.ItemsParam))
117117
{
118+
_appInfo.IsCancelled();
119+
118120
if (oItem.FileSystemObjectType.ToString() == "Folder") { continue; }
119121

120122
if (oItem.File.CheckOutType == CheckOutType.None) { continue; }

src/NovaPointLibrary/Solutions/Automation/RemoveFileVersionAuto.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@ private async Task ProcessItems(string siteUrl, List oList, ProgressTracker pare
9999
var spoItem = new SPOListItemCSOM(_logger, _appInfo);
100100
await foreach (ListItem oItem in spoItem.GetAsync(siteUrl, oList, _param.ItemsParam))
101101
{
102+
_appInfo.IsCancelled();
103+
102104
if (oItem.FileSystemObjectType.ToString() == "Folder") { continue; }
103105

104106
try
@@ -175,8 +177,6 @@ private async Task RemoveFileVersions(string siteUrl, List oList, ListItem oItem
175177
fileVersionCollection.DeleteByID(fileVersionToDelete.ID);
176178
}
177179
clientContext.ExecuteQueryRetry();
178-
179-
180180
}
181181
}
182182
catch (Exception ex)

src/NovaPointLibrary/Solutions/Automation/SetSiteCollectionAdminAuto.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ private async Task RunScriptAsync()
7272
progress = new(_logger, collSiteCollections.Count);
7373
foreach (var oSiteCollection in collSiteCollections)
7474
{
75+
_appInfo.IsCancelled();
76+
7577
await SetAdmin(oSiteCollection.Url);
7678

7779
progress.ProgressUpdateReport();

src/NovaPointLibrary/Solutions/Report/PermissionsReport.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ private async Task RunScriptAsync()
7070
SPOSitePermissionsCSOM sitePermissions = new(_logger, _appInfo, _param.PermissionsParam);
7171
await foreach (var siteResults in new SPOTenantSiteUrlsWithAccessCSOM(_logger, _appInfo, _param.SiteAccParam).GetAsyncNEW())
7272
{
73+
_appInfo.IsCancelled();
7374

7475
if (!String.IsNullOrWhiteSpace(siteResults.ErrorMessage))
7576
{
@@ -84,6 +85,8 @@ private async Task RunScriptAsync()
8485

8586
await foreach (var oUser in new SPOSiteUserCSOM(_logger, _appInfo).GetAsync(siteResults.SiteUrl, _param.UserParam, _userRetrievalExpressions))
8687
{
88+
_appInfo.IsCancelled();
89+
8790
sb.Append($"{oUser.Title}: {oUser.UserPrincipalName} ");
8891
}
8992

@@ -99,6 +102,8 @@ private async Task RunScriptAsync()
99102
{
100103
await foreach(var record in sitePermissions.GetAsync(siteResults.SiteUrl, siteResults.Progress))
101104
{
105+
_appInfo.IsCancelled();
106+
102107
FilterRecord(record);
103108
}
104109
}

src/NovaPointLibrary/Solutions/Report/SiteReport.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,8 @@ private async Task RunScriptAsync()
114114
{
115115
await foreach (var admins in _sitePermissions.GetAsync(oSiteCollection.Url, progress))
116116
{
117+
_appInfo.IsCancelled();
118+
117119
recordSiteCollection.AddAdmins(admins);
118120
_logger.RecordCSV(recordSiteCollection);
119121
}
@@ -179,6 +181,8 @@ private async Task GetSubsitesAsync(string siteUrl, ProgressTracker parentProgre
179181
ProgressTracker progress = new(parentProgress, collSubsites.Count);
180182
foreach (var oSubsite in collSubsites)
181183
{
184+
_appInfo.IsCancelled();
185+
182186
SiteReportRecord siteRecord = new(oSubsite);
183187

184188
_logger.RecordCSV(siteRecord);

src/NovaPointWPF/Pages/Solutions/Automation/RemoveFileVersionAutoForm.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
xmlns:local="clr-namespace:NovaPointWPF.Pages.Solutions.Automation"
77
xmlns:designmaterial="clr-namespace:NovaPointWPF.UserControls"
88
mc:Ignorable="d"
9-
d:DesignHeight="1200" d:DesignWidth="600"
9+
d:DesignHeight="1000" d:DesignWidth="600"
1010
Title="RemoveFileVersionAutoForm">
1111

1212
<Grid Background="Transparent">

src/NovaPointWPF/Pages/Solutions/Automation/SetVersioningLimitAutoForm.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,23 @@
3131

3232
<Label
3333
Style="{DynamicResource SolutionFormLabel}"
34-
Content="Library major versioning limit"/>
34+
Content="Document Library major versioning limit"/>
3535

3636
<TextBox
3737
Style="{DynamicResource SolutionFormTextBox}"
3838
Text="{Binding LibraryMajorVersionLimit, Mode=TwoWay, NotifyOnSourceUpdated=True, NotifyOnTargetUpdated=True}"/>
3939

4040
<Label
4141
Style="{DynamicResource SolutionFormLabel}"
42-
Content="Library minor versioning limit"/>
42+
Content="Document Library minor versioning limit"/>
4343

4444
<TextBox
4545
Style="{DynamicResource SolutionFormTextBox}"
4646
Text="{Binding LibraryMinorVersionLimit, Mode=TwoWay, NotifyOnSourceUpdated=True, NotifyOnTargetUpdated=True}"/>
4747

4848
<Label
4949
Style="{DynamicResource SolutionFormLabel}"
50-
Content="List major versioning limit"/>
50+
Content="Item List major versioning limit"/>
5151

5252
<TextBox
5353
Style="{DynamicResource SolutionFormTextBox}"

0 commit comments

Comments
 (0)