Skip to content

Improve Verbose message if content length is unknown in WebCmdlets #19252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daxian-dbw merged 7 commits into from
Mar 2, 2023
Merged

Improve Verbose message if content length is unknown in WebCmdlets #19252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
92f8af2
conditional comment
CarloToso Mar 1, 2023
d4df9ea
change comment
CarloToso Mar 1, 2023
c5dcd26
follow suggestion
CarloToso Mar 1, 2023
7d28c6d
add space
CarloToso Mar 1, 2023
209c372
Update src/Microsoft.PowerShell.Commands.Utility/commands/utility/Web…
CarloToso Mar 1, 2023
c153040
update name
CarloToso Mar 1, 2023
14fd163
Update src/Microsoft.PowerShell.Commands.Utility/resources/WebCmdletS…
CarloToso Mar 1, 2023
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
11 changes: 5 additions & 6 deletions ...owerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,12 +552,11 @@ protected override void ProcessRecord()
using HttpResponseMessage response = GetResponse(client, request, handleRedirect);

string contentType = ContentHelper.GetContentType(response);
string respVerboseMsg = string.Format(
CultureInfo.CurrentCulture,
WebCmdletStrings.WebResponseVerboseMsg,
response.Content.Headers.ContentLength,
contentType);

long? contentLength = response.Content.Headers.ContentLength;
string respVerboseMsg = contentLength is null
? string.Format(CultureInfo.CurrentCulture, WebCmdletStrings.WebResponseNoSizeVerboseMsg, contentType)
: string.Format(CultureInfo.CurrentCulture, WebCmdletStrings.WebResponseVerboseMsg, contentLength, contentType);

WriteVerbose(respVerboseMsg);

bool _isSuccess = response.IsSuccessStatusCode;
Expand Down
3 changes: 3 additions & 0 deletions src/Microsoft.PowerShell.Commands.Utility/resources/WebCmdletStrings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,9 @@
<data name="WebResponseVerboseMsg" xml:space="preserve">
<value>received {0}-byte response of content type {1}</value>
</data>
<data name="WebResponseNoSizeVerboseMsg" xml:space="preserve">
<value>received response of content type {0} of unknown size</value>
</data>
<data name="RetryVerboseMsg" xml:space="preserve">
<value>Retrying after interval of {0} seconds. Status code for previous attempt: {1}</value>
</data>
Expand Down