Add and use Humanizer package

Author: Odotocodot

Flow.Launcher.Plugin.OneNote/Flow.Launcher.Plugin.OneNote.csproj

@@ -26,6 +26,7 @@
 
   <ItemGroup>
     <PackageReference Include="Flow.Launcher.Plugin" Version="4.1.0" />
+    <PackageReference Include="Humanizer.Core" Version="2.14.1" />
     <PackageReference Include="ModernWpfUI" Version="0.9.6" />
     <PackageReference Include="Odotocodot.OneNote.Linq" Version="1.0.0" />
     <PackageReference Include="System.Drawing.Common" Version="7.0.0" />

Flow.Launcher.Plugin.OneNote/Icons/IconProvider.cs

@@ -178,43 +178,6 @@ public void ClearCachedIcons()
             OnPropertyChanged(nameof(CachedIconCount));
         }
 
-
-        public string GetCachedIconsMemorySize()
-        {
-            var i = GeneratedImagesDirectoryInfo.EnumerateFiles()
-                .Select(file => file.Length)
-                .Aggregate(0L, (a, b) => a + b);
-            
-            // Returns the human-readable file size for an arbitrary, 64-bit file size 
-            // The default format is "0.### XB", e.g. "4.2 KB" or "1.434 GB"
-            // Get absolute value
-            long absolute_i = Math.Abs(i);
-            // Determine the suffix and readable value
-            string suffix;
-            double readable;
-            switch (absolute_i)
-            {
-                case >= 0x40000000: // Gigabyte 
-                    suffix = "GB";
-                    readable = i >> 20;
-                    break;
-                case >= 0x100000: // Megabyte 
-                    suffix = "MB";
-                    readable = i >> 10;
-                    break;
-                case >= 0x400:
-                    suffix = "KB"; // Kilobyte 
-                    readable = i;
-                    break;
-                default:
-                    return i.ToString("0 B"); // Byte
-            }
-            // Divide by 1024 to get fractional value
-            readable /= 1024;
-            // Return formatted number with suffix
-            return readable.ToString("0.## ") + suffix;
-        }
-
         public void Dispose()
         {
             settings.PropertyChanged -= OnIconThemeChanged;

Flow.Launcher.Plugin.OneNote/ResultCreator.cs

@@ -1,7 +1,7 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using Flow.Launcher.Plugin.OneNote.Icons;
+using Humanizer;
 using Odotocodot.OneNote.Linq;
 
 namespace Flow.Launcher.Plugin.OneNote
@@ -23,7 +23,8 @@ public ResultCreator(PluginInitContext context, Settings settings, IconProvider
             this.context = context;
         }
 
-        private static string GetNicePath(IOneNoteItem item, string separator = PathSeparator) => item.RelativePath.Replace(OneNoteApplication.RelativePathSeparator.ToString(), separator);
+        private static string GetNicePath(IOneNoteItem item, string separator = PathSeparator) =>
+            item.RelativePath.Replace(OneNoteApplication.RelativePathSeparator.ToString(), separator);
 
         private string GetTitle(IOneNoteItem item, List<int> highlightData)
         {
@@ -43,37 +44,6 @@ private string GetTitle(IOneNoteItem item, List<int> highlightData)
             return title;
 
         }
-        //TODO replace with humanizer
-        private static string GetLastEdited(TimeSpan diff)
-        {
-            string lastEdited = "Last edited ";
-            if (PluralCheck(diff.TotalDays, "day", ref lastEdited)
-                || PluralCheck(diff.TotalHours, "hour", ref lastEdited)
-                || PluralCheck(diff.TotalMinutes, "min", ref lastEdited)
-                || PluralCheck(diff.TotalSeconds, "sec", ref lastEdited))
-            {
-                return lastEdited;
-            }
-            else
-            {
-                return lastEdited += "Now.";
-            }
-
-            static bool PluralCheck(double totalTime, string timeType, ref string lastEdited)
-            {
-                var roundedTime = (int)Math.Round(totalTime);
-                if (roundedTime > 0)
-                {
-                    string plural = roundedTime == 1 ? string.Empty : "s";
-                    lastEdited += $"{roundedTime} {timeType}{plural} ago.";
-                    return true;
-                }
-                else
-                {
-                    return false;
-                }
-            }
-        }
 
         private string GetAutoCompleteText(IOneNoteItem item) 
             => $"{ActionKeyword} {settings.Keywords.NotebookExplorer}{GetNicePath(item, Keywords.NotebookExplorerSeparator)}{Keywords.NotebookExplorerSeparator}";
@@ -246,7 +216,7 @@ public Result CreatePageResult(OneNotePage page, string query)
         public Result CreateRecentPageResult(OneNotePage page)
         {
             var result = CreateOneNoteItemResult(page, false, null);
-            result.SubTitle = $"{GetLastEdited(DateTime.Now - page.LastModified)}\t{result.SubTitle}";
+            result.SubTitle = $"{page.LastModified.Humanize()}\t{result.SubTitle}";
             result.IcoPath = iconProvider.Recent;
             return result;
         }

Flow.Launcher.Plugin.OneNote/UI/ViewModels/KeywordViewModel.cs

@@ -1,10 +1,10 @@
 using System.Reflection;
 using System.Linq;
-using System.Text.RegularExpressions;
+using Humanizer;
 
 namespace Flow.Launcher.Plugin.OneNote.UI.ViewModels
 {
-    public partial class KeywordViewModel : BaseModel
+    public class KeywordViewModel : BaseModel
     {
         private object Instance { get; init; }
         private PropertyInfo PropertyInfo { get; init; }
@@ -19,8 +19,7 @@ public string Keyword
                 OnPropertyChanged();
             }
         }
-
-
+        
         public static KeywordViewModel[] GetKeywordViewModels(Keywords keywords)
         {
             return keywords.GetType()
@@ -29,12 +28,9 @@ public static KeywordViewModel[] GetKeywordViewModels(Keywords keywords)
                            {
                                Instance = keywords,
                                PropertyInfo = p,
-                               Name = NicfyPropertyName().Replace(p.Name, " $1"),
+                               Name = p.Name.Humanize(LetterCasing.Title)
                            })
                            .ToArray();
         }
-
-        [GeneratedRegex("(\\B[A-Z])")]
-        private static partial Regex NicfyPropertyName();
     }
 }

Flow.Launcher.Plugin.OneNote/UI/ViewModels/SettingsViewModel.cs

@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using System.Windows.Input;
 using Flow.Launcher.Plugin.OneNote.Icons;
+using Humanizer;
 using Modern = ModernWpf.Controls;
 
 namespace Flow.Launcher.Plugin.OneNote.UI.ViewModels
@@ -45,7 +46,11 @@ public SettingsViewModel(PluginInitContext context, Settings settings, IconProvi
         public Settings Settings { get; }
         public KeywordViewModel[] Keywords { get; }
         public IconThemeViewModel[] IconThemes { get; }
-        public string CachedIconsFileSize => iconProvider.GetCachedIconsMemorySize();
+        public string CachedIconsFileSize => iconProvider.GeneratedImagesDirectoryInfo.EnumerateFiles()
+			.Select(file => file.Length)
+	        .Aggregate(0L, (a, b) => a + b)
+			.Bytes()
+			.Humanize();
 
         public KeywordViewModel SelectedKeyword
         {
@@ -60,7 +65,7 @@ private async Task ClearCachedIcons()
 	        {
 		        Title = "Clear Cached Icons",
 		        Content = $"Delete cached notebook and sections icons.\n" +
-		                  $"This will delete {iconProvider.CachedIconCount} icon{(iconProvider.CachedIconCount != 1 ? "s" : string.Empty)}.",
+		                  $"This will delete {"icon".ToQuantity(iconProvider.CachedIconCount)}.",
 		        PrimaryButtonText = "Yes",
 		        CloseButtonText = "Cancel",
 		        DefaultButton = Modern.ContentDialogButton.Close,