Merging functionality into DurationToStringConverter

Author: StanleyGoldman

src/GitHub.InlineReviews/Views/CommentView.xaml

@@ -57,7 +57,7 @@
                                         Account="{Binding Author}"/>
 
                 <TextBlock Foreground="{DynamicResource GitHubVsToolWindowText}" FontWeight="Bold" Text="{Binding Author.Login}" Margin="4 0"/>
-                <ui:GitHubActionLink Content="{Binding UpdatedAt, Converter={ui:PositiveDurationToStringConverter}}"
+                <ui:GitHubActionLink Content="{Binding UpdatedAt, Converter={ui:DurationToStringConverter}}"
                                      Command="{Binding OpenOnGitHub}"
                                      Foreground="{DynamicResource GitHubVsToolWindowText}"
                                      Opacity="0.75" />

src/GitHub.UI/Converters/DurationToStringConverter.cs

@@ -3,7 +3,7 @@
 
 namespace GitHub.UI
 {
-    public class PositiveDurationToStringConverter : ValueConverterMarkupExtension<PositiveDurationToStringConverter>
+    public class DurationToStringConverter : ValueConverterMarkupExtension<DurationToStringConverter>
     {
         public override object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
@@ -22,7 +22,25 @@ public override object Convert(object value, Type targetType, object parameter,
                 return Resources.JustNow;
             }
 
-            return DurationToStringConverter.FormatDuration(duration, culture);
+            const int year = 365;
+            const int month = 30;
+            const int day = 24;
+            const int hour = 60;
+            const int minute = 60;
+
+            if (duration.TotalDays >= year)
+                return string.Format(culture, (int)(duration.TotalDays / year) > 1 ? Resources.years : Resources.year, (int)(duration.TotalDays / year));
+            else if (duration.TotalDays >= 360)
+                return string.Format(culture, Resources.months, 11);
+            else if (duration.TotalDays >= month)
+                return string.Format(culture, (int)(duration.TotalDays / (month)) > 1 ? Resources.months : Resources.month, (int)(duration.TotalDays / (month)));
+            else if (duration.TotalHours >= day)
+                return string.Format(culture, (int)(duration.TotalHours / day) > 1 ? Resources.days : Resources.day, (int)(duration.TotalHours / day));
+            else if (duration.TotalMinutes >= hour)
+                return string.Format(culture, (int)(duration.TotalMinutes / hour) > 1 ? Resources.hours : Resources.hour, (int)(duration.TotalMinutes / hour));
+            else if (duration.TotalSeconds >= minute)
+                return string.Format(culture, (int)(duration.TotalSeconds / minute) > 1 ? Resources.minutes : Resources.minute, (int)(duration.TotalSeconds / minute));
+            return string.Format(culture, duration.TotalSeconds > 1 || duration.Ticks == 0 ? Resources.seconds : Resources.second, duration.TotalSeconds);
         }
     }
 }

src/GitHub.UI/Converters/PositiveDurationToStringConverter.cs

@@ -120,7 +120,6 @@
       <DependentUpon>AutomationIDs.resx</DependentUpon>
     </Compile>
     <Compile Include="Controls\GitHubProgressBar.cs" />
-    <Compile Include="Converters\DurationToStringConverter.cs" />
     <Compile Include="Converters\HasItemsVisibilityConverter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="..\common\SolutionInfo.cs">

src/GitHub.UI/GitHub.UI.csproj

@@ -9,37 +9,6 @@
 
 public class Converters
 {
-    [TestCase(-1, 0, 0, 0, "-1 second ago")]
-    [TestCase(0, 0, 0, 0, "0 seconds ago")]
-    [TestCase(1, 0, 0, 0, "1 second ago")]
-    [TestCase(2, 0, 0, 0, "2 seconds ago")]
-    [TestCase(59, 0, 0, 0, "59 seconds ago")]
-    [TestCase(0, 1, 0, 0, "1 minute ago")]
-    [TestCase(0, 2, 0, 0, "2 minutes ago")]
-    [TestCase(0, 59, 0, 0, "59 minutes ago")]
-    [TestCase(0, 60, 0, 0, "1 hour ago")]
-    [TestCase(0, 0, 1, 0, "1 hour ago")]
-    [TestCase(0, 0, 2, 0, "2 hours ago")]
-    [TestCase(0, 0, 23, 0, "23 hours ago")]
-    [TestCase(0, 0, 24, 0, "1 day ago")]
-    [TestCase(0, 0, 0, 1, "1 day ago")]
-    [TestCase(0, 0, 0, 2, "2 days ago")]
-    [TestCase(0, 0, 0, 29, "29 days ago")]
-    [TestCase(0, 0, 0, 30, "1 month ago")]
-    [TestCase(0, 0, 0, 59, "1 month ago")]
-    [TestCase(0, 0, 0, 60, "2 months ago")]
-    [TestCase(0, 0, 0, 364, "11 months ago")]
-    [TestCase(0, 0, 0, 365, "1 year ago")]
-    [TestCase(0, 0, 0, 365*2-1, "1 year ago")]
-    [TestCase(0, 0, 0, 365*2, "2 years ago")]
-    public void DurationToStringConversion(int sec, int min, int hou, int day, string expected)
-    {
-        var ts = new TimeSpan(day, hou, min, sec);
-        var conv = new DurationToStringConverter();
-        var ret = (string)conv.Convert(ts, typeof(string), null, CultureInfo.CurrentCulture);
-        Assert.That(ret, Is.EqualTo(expected));
-    }
-
     [TestCase(0, 0, -23, 0, "just now")]
     [TestCase(-2, 0, 0, 0, "just now")]
     [TestCase(-1, 0, 0, 0, "just now")]
@@ -63,12 +32,12 @@ public void DurationToStringConversion(int sec, int min, int hou, int day, strin
     [TestCase(0, 0, 0, 60, "2 months ago")]
     [TestCase(0, 0, 0, 364, "11 months ago")]
     [TestCase(0, 0, 0, 365, "1 year ago")]
-    [TestCase(0, 0, 0, 365 * 2 - 1, "1 year ago")]
-    [TestCase(0, 0, 0, 365 * 2, "2 years ago")]
-    public void PositiveDurationToStringConversion(int sec, int min, int hou, int day, string expected)
+    [TestCase(0, 0, 0, 365*2-1, "1 year ago")]
+    [TestCase(0, 0, 0, 365*2, "2 years ago")]
+    public void DurationToStringConversion(int sec, int min, int hou, int day, string expected)
     {
         var ts = new TimeSpan(day, hou, min, sec);
-        var conv = new PositiveDurationToStringConverter();
+        var conv = new DurationToStringConverter();
         var ret = (string)conv.Convert(ts, typeof(string), null, CultureInfo.CurrentCulture);
         Assert.That(ret, Is.EqualTo(expected));
     }