Skip to content
This repository was archived by the owner on Jan 19, 2021. It is now read-only.

Suppress duplicate warning messages #1560

Merged
erwinvanhunen merged 1 commit into from
May 10, 2018
Merged

Suppress duplicate warning messages #1560

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 38 additions & 31 deletions Commands/Provisioning/ApplyProvisioningTemplate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
using System.Linq;
using OfficeDevPnP.Core.Framework.Provisioning.Providers;
using SharePointPnP.PowerShell.Commands.Components;
using System.Collections.Generic;

namespace SharePointPnP.PowerShell.Commands.Provisioning
{
Expand Down Expand Up @@ -119,7 +120,7 @@ protected override void ExecuteCmdlet()
{
Path = System.IO.Path.Combine(SessionState.Path.CurrentFileSystemLocation.Path, Path);
}
if(!System.IO.File.Exists(Path))
if (!System.IO.File.Exists(Path))
{
throw new FileNotFoundException($"File not found");
}
Expand Down Expand Up @@ -278,30 +279,45 @@ protected override void ExecuteCmdlet()
WriteProgress(progressRecord);
};

var warningsShown = new List<string>();

applyingInformation.MessagesDelegate = (message, type) =>
{
switch (type)
{
case ProvisioningMessageType.Warning:
{
WriteWarning(message);
break;
}
{
if (!warningsShown.Contains(message))
{
WriteWarning(message);
warningsShown.Add(message);
}
break;
}
case ProvisioningMessageType.Progress:
{
var activity = message;
if (message.IndexOf("|") > -1)
{
var messageSplitted = message.Split('|');
if (messageSplitted.Length == 4)
var activity = message;
if (message.IndexOf("|") > -1)
{
var current = double.Parse(messageSplitted[2]);
var total = double.Parse(messageSplitted[3]);
subProgressRecord.RecordType = ProgressRecordType.Processing;
subProgressRecord.Activity = messageSplitted[0];
subProgressRecord.StatusDescription = messageSplitted[1];
subProgressRecord.PercentComplete = Convert.ToInt32((100/total)*current);
WriteProgress(subProgressRecord);
var messageSplitted = message.Split('|');
if (messageSplitted.Length == 4)
{
var current = double.Parse(messageSplitted[2]);
var total = double.Parse(messageSplitted[3]);
subProgressRecord.RecordType = ProgressRecordType.Processing;
subProgressRecord.Activity = messageSplitted[0];
subProgressRecord.StatusDescription = messageSplitted[1];
subProgressRecord.PercentComplete = Convert.ToInt32((100 / total) * current);
WriteProgress(subProgressRecord);
}
else
{
subProgressRecord.Activity = "Processing";
subProgressRecord.RecordType = ProgressRecordType.Processing;
subProgressRecord.StatusDescription = activity;
subProgressRecord.PercentComplete = 0;
WriteProgress(subProgressRecord);
}
}
else
{
Expand All @@ -311,23 +327,14 @@ protected override void ExecuteCmdlet()
subProgressRecord.PercentComplete = 0;
WriteProgress(subProgressRecord);
}
break;
}
else
{
subProgressRecord.Activity = "Processing";
subProgressRecord.RecordType = ProgressRecordType.Processing;
subProgressRecord.StatusDescription = activity;
subProgressRecord.PercentComplete = 0;
WriteProgress(subProgressRecord);
}
break;
}
case ProvisioningMessageType.Completed:
{
{

WriteProgress(new ProgressRecord(1, message, " ") {RecordType = ProgressRecordType.Completed});
break;
}
WriteProgress(new ProgressRecord(1, message, " ") { RecordType = ProgressRecordType.Completed });
break;
}
}
};

Expand Down