Skip to content

Correct %c, %l, %k, %s, %j format in Get-Date -UFormat #4805

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 9 commits into from
Mar 16, 2018
Merged

Correct %c, %l, %k, %s, %j format in Get-Date -UFormat #4805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
00f63e9
Correct %j format in Get-Date -UFormat
iSazonov Sep 11, 2017
b9b284a
Correct %s format in Get-Date -UFormat
iSazonov Sep 12, 2017
3ed038e
Correct %k format in Get-Date -UFormat
iSazonov Sep 12, 2017
fa289ee
Correct %l format in Get-Date -UFormat
iSazonov Sep 12, 2017
84e88ad
Correct %c format in Get-Date -UFormat
iSazonov Sep 12, 2017
19747bf
Fix %c format
iSazonov Sep 26, 2017
d4fdd39
Merge branch 'master' into get-date-j
iSazonov Mar 14, 2018
c6e46b0
Fix %c
iSazonov Mar 15, 2018
604316e
Fix test for %c
iSazonov Mar 16, 2018
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
15 changes: 7 additions & 8 deletions src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetDateCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,12 +314,13 @@ protected override void ProcessRecord()
}
} // EndProcessing

private static readonly DateTime epoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);

/// <summary>
/// This is more an implementation of the UNIX strftime
/// </summary>
private string UFormatDateString(DateTime dateTime)
{
DateTime epoch = DateTime.Parse("January 1, 1970", System.Globalization.CultureInfo.InvariantCulture);
int offset = 0;
StringBuilder sb = new StringBuilder();

Expand Down Expand Up @@ -360,9 +361,7 @@ private string UFormatDateString(DateTime dateTime)
break;

case 'c':
sb.Append("{0:ddd} {0:MMM} ");
sb.Append(StringUtil.Format("{0,2} ", dateTime.Day));
sb.Append("{0:HH}:{0:mm}:{0:ss} {0:yyyy}");
sb.Append("{0:ddd} {0:dd} {0:MMM} {0:yyyy} {0:HH}:{0:mm}:{0:ss}");
break;

case 'D':
Expand All @@ -386,15 +385,15 @@ private string UFormatDateString(DateTime dateTime)
break;

case 'j':
sb.Append(dateTime.DayOfYear);
sb.Append(StringUtil.Format("{0:000}", dateTime.DayOfYear));
break;

case 'k':
sb.Append("{0:HH}");
sb.Append(StringUtil.Format("{0,2:0}", dateTime.Hour));
break;

case 'l':
sb.Append("{0:hh}");
sb.Append(StringUtil.Format("{0,2:0}", dateTime.Hour%12));
break;

case 'M':
Expand Down Expand Up @@ -426,7 +425,7 @@ private string UFormatDateString(DateTime dateTime)
break;

case 's':
sb.Append(dateTime.Subtract(epoch).TotalSeconds);
sb.Append(StringUtil.Format("{0:0}", dateTime.Subtract(epoch).TotalSeconds));
break;

case 'T':
Expand Down
8 changes: 4 additions & 4 deletions test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Date.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ Describe "Get-Date DRT Unit Tests" -Tags "CI" {
Get-date -Date 0030-01-01T00:00:00 -uformat %y/%m/%d-%H | Should be "30/01/01-00"
}

It "using -uformat 'aAbBcCdDehHIjmMpr' produces the correct output" {
Get-date -Date 1/1/0030 -uformat %a%A%b%B%c%C%d%D%e%h%H%I%j%m%M%p%r | Should be "TueTuesdayJanJanuaryTue Jan 1 00:00:00 003000101/01/30 1Jan001210100AM12:00:00 AM"
It "using -uformat 'aAbBcCdDehHIkljmMpr' produces the correct output" {
Get-date -Date 1/1/0030 -uformat %a%A%b%B%c%C%d%D%e%h%H%I%k%l%j%m%M%p%r | Should be "TueTuesdayJanJanuaryTue 01 Jan 0030 00:00:0000101/01/30 1Jan0012 0 00010100AM12:00:00 AM"
}

It "using -uformat 'StTuUVwWxXyYZ' produces the correct output" {
Get-date -Date 1/1/0030 -uformat %S%T%u%U%V%w%W%x%X%y%Y%% | Should be "0000:00:002012001/01/3000:00:00300030%"
It "using -uformat 'sStTuUVwWxXyYZ' produces the correct output" {
Get-date -Date 1/1/0030 -uformat %s%S%T%u%U%V%w%W%x%X%y%Y%% | Should be "-612204480000000:00:002012001/01/3000:00:00300030%"
}

It "Passing '<name>' to -uformat produces a descriptive error" -TestCases @(
Expand Down