Improve parser and "material icon" for future.

MudBlazor · May 28, 2024 · b18a875 · b18a875
1 parent 60d6627
commit b18a875
Show file tree

Hide file tree

Showing 6 changed files with 102 additions and 10 deletions.
diff --git a/src/MaterialSymbolsParser/Model/IconType.cs b/src/MaterialSymbolsParser/Model/IconType.cs
@@ -0,0 +1,7 @@
+namespace MaterialSymbolsParser.Model;
+
+public enum IconType
+{
+    MaterialSymbols = 0,
+    MaterialIcons = 1
+}
diff --git a/src/MaterialSymbolsParser/Program.cs b/src/MaterialSymbolsParser/Program.cs
@@ -1,4 +1,5 @@
-using MaterialSymbolsParser.Service;
+using MaterialSymbolsParser.Model;
+using MaterialSymbolsParser.Service;
 
 namespace MaterialSymbolsParser;
 
@@ -9,8 +10,8 @@ public static async Task Main(string[] args)
         var codeGenerator = new CodeGenerationService();
         using var client = new IconHttpClientService();
         var metadata = await client.ParseIconsAsync().ConfigureAwait(false);
-        var filteredIcons = Utility.IconFilter.FilterNonMaterialSymbols(metadata!);
-        var groupedIcons = Utility.IconFilter.GroupIconsByFamilies(filteredIcons);
+        var filteredIcons = Utility.IconFilter.FilterByFamily(metadata, IconType.MaterialSymbols);
+        var groupedIcons = Utility.IconFilter.GroupIconsByFamilies(filteredIcons, IconType.MaterialSymbols);
 
         codeGenerator.GenerateCsFilesUsingRoslyn(groupedIcons, folder: "../../../../MudBlazor.Icons.MaterialSymbols");
     }

diff --git a/src/MaterialSymbolsParser/Service/CodeGenerationService.cs b/src/MaterialSymbolsParser/Service/CodeGenerationService.cs
@@ -42,7 +42,7 @@ private static CompilationUnitSyntax GenerateUsingsAndNamespace(KeyValuePair<str
         return SyntaxFactory.CompilationUnit()
             .WithUsings(usings)
             .WithMembers(SyntaxFactory.SingletonList<MemberDeclarationSyntax>(namespaceDeclaration))
-            .WithLeadingTrivia(commentTrivia); ;
+            .WithLeadingTrivia(commentTrivia);
     }
 
     private static SyntaxTriviaList AddComment()

diff --git a/src/MaterialSymbolsParser/Service/IconHttpClientService.cs b/src/MaterialSymbolsParser/Service/IconHttpClientService.cs
@@ -23,7 +23,7 @@ public IconHttpClientService()
 
     }
 
-    public async Task<Metadata?> ParseIconsAsync()
+    public async Task<Metadata> ParseIconsAsync()
     {
         var json = await _httpClient.GetStringAsync(new Uri("metadata/icons?incomplete=1&key=material_symbols", UriKind.Relative)).ConfigureAwait(false);
         using var reader = new StringReader(json);
@@ -32,6 +32,10 @@ public IconHttpClientService()
         var validJson = await reader.ReadToEndAsync().ConfigureAwait(false);
 
         var metadata = JsonSerializer.Deserialize<Metadata>(validJson, _jsonSerializerOptions);
+        if (metadata is null)
+        {
+            throw new InvalidOperationException("Response is null");
+        }
 
         return metadata;
     }

diff --git a/src/MaterialSymbolsParser/Utility/FamilyMap.cs b/src/MaterialSymbolsParser/Utility/FamilyMap.cs
@@ -1,20 +1,84 @@
-namespace MaterialSymbolsParser.Utility;
+using MaterialSymbolsParser.Model;
+
+namespace MaterialSymbolsParser.Utility;
 
 public static class FamilyMap
 {
     public const string MaterialSymbolsPrefix = "Material Symbols";
+    public const string MaterialIconsPrefix = "Material Icons";
     public const string Outlined = "Outlined";
     public const string Rounded = "Rounded";
     public const string Sharp = "Sharp";
+    public const string TwoTone = "Two Tone";
+    public const string Filled = "Filled";
     public const string MaterialSymbolsOutlined = $"{MaterialSymbolsPrefix} {Outlined}";
     public const string MaterialSymbolsRounded = $"{MaterialSymbolsPrefix} {Rounded}";
     public const string MaterialSymbolsSharp = $"{MaterialSymbolsPrefix} {Sharp}";
+
+    public const string MaterialIconsOutlined = $"{MaterialIconsPrefix} {Outlined}";
+    public const string MaterialIconsFilled = $"{MaterialIconsPrefix}"; // this is not a typo, filled is indeed only using "Material Icons" without "Filled"
+    public const string MaterialIconsRounded = $"{MaterialIconsPrefix} {Rounded}";
+    public const string MaterialIconsSharp = $"{MaterialIconsPrefix} {Sharp}";
+    public const string MaterialIconsTwoTone = $"{MaterialIconsPrefix} {TwoTone}";
+
     public static readonly IReadOnlyList<string> MaterialSymbolsFamilies = new List<string>
     {
         MaterialSymbolsOutlined,
         MaterialSymbolsRounded,
         MaterialSymbolsSharp,
     };
+    public static readonly IReadOnlyList<string> MaterialIconsFamilies = new List<string>
+    {
+        MaterialIconsOutlined,
+        MaterialIconsFilled,
+        MaterialIconsRounded,
+        MaterialIconsSharp,
+        MaterialIconsTwoTone
+    };
+
+    public static IReadOnlyList<string> GetFamiliesByIconType(IconType iconType)
+    {
+        return iconType switch
+        {
+            IconType.MaterialSymbols => MaterialSymbolsFamilies,
+            IconType.MaterialIcons => MaterialIconsFamilies,
+            _ => throw new InvalidOperationException($"Mapping for icon type {iconType} not found!")
+        };
+    }
+
+    public static IconType FromFamilyToIconType(string family)
+    {
+        switch (family)
+        {
+            // Material Symbols
+            case MaterialSymbolsOutlined:
+            case MaterialSymbolsRounded:
+            case MaterialSymbolsSharp:
+                return IconType.MaterialSymbols;
+
+            // Material Icons
+            case MaterialIconsOutlined:
+            case MaterialIconsFilled:
+            case MaterialIconsRounded:
+            case MaterialIconsSharp:
+            case MaterialIconsTwoTone:
+                return IconType.MaterialIcons;
+            default:
+                throw new InvalidOperationException($"Mapping for family name {family} not found!");
+        }
+    }
+
+    public static bool IsSelectedFamilyByIconType(IconType iconType, string family)
+    {
+        return iconType switch
+        {
+            IconType.MaterialSymbols => IsMaterialSymbolFamily(family),
+            IconType.MaterialIcons => IsMaterialIconFamily(family),
+            _ => throw new InvalidOperationException($"Mapping for icon type {iconType} and family {family} not found!")
+        };
+    }
+
+    public static bool IsMaterialIconFamily(string family) => family.StartsWith(MaterialIconsPrefix, StringComparison.OrdinalIgnoreCase);
 
     public static bool IsMaterialSymbolFamily(string family) => family.StartsWith(MaterialSymbolsPrefix, StringComparison.OrdinalIgnoreCase);
 
@@ -23,9 +87,17 @@ public static string FamilyNameToCsharpClassName(string familyName)
         ArgumentNullException.ThrowIfNull(familyName);
         return familyName switch
         {
+            // Material Symbols
             MaterialSymbolsOutlined => Outlined,
             MaterialSymbolsRounded => Rounded,
             MaterialSymbolsSharp => Sharp,
+
+            // Material Icons
+            MaterialIconsOutlined => Outlined,
+            MaterialIconsFilled => Filled,
+            MaterialIconsRounded => Rounded,
+            MaterialIconsSharp => Sharp,
+            MaterialIconsTwoTone => TwoTone,
             _ => throw new InvalidOperationException($"Mapping for family name {familyName} not found!")
         };
     }
@@ -35,9 +107,17 @@ public static string FamilyNameToHtmlClassName(string familyName)
         ArgumentNullException.ThrowIfNull(familyName);
         return familyName switch
         {
+            // Material Symbols
             MaterialSymbolsOutlined => "material-symbols-outlined",
             MaterialSymbolsRounded => "material-symbols-rounded",
             MaterialSymbolsSharp => "material-symbols-sharp",
+
+            // Material Icons
+            MaterialIconsOutlined => "material-icons-outlined",
+            MaterialIconsFilled => "material-icons",
+            MaterialIconsRounded => "material-icons-round",
+            MaterialIconsSharp => "material-icons-sharp",
+            MaterialIconsTwoTone => "material-icons-two-tone",
             _ => throw new InvalidOperationException($"Mapping for family name {familyName} not found!")
         };
     }

diff --git a/src/MaterialSymbolsParser/Utility/IconFilter.cs b/src/MaterialSymbolsParser/Utility/IconFilter.cs
@@ -4,11 +4,11 @@ namespace MaterialSymbolsParser.Utility;
 
 public static class IconFilter
 {
-    public static Dictionary<string, IReadOnlyCollection<Icon>> GroupIconsByFamilies(IReadOnlyCollection<Icon> icons)
+    public static Dictionary<string, IReadOnlyCollection<Icon>> GroupIconsByFamilies(IReadOnlyCollection<Icon> icons, IconType iconType)
     {
         var groupedIcons = new Dictionary<string, IReadOnlyCollection<Icon>>();
 
-        foreach (var family in FamilyMap.MaterialSymbolsFamilies)
+        foreach (var family in FamilyMap.GetFamiliesByIconType(iconType))
         {
             groupedIcons[family] = icons
                 .Where(icon => !icon.UnsupportedFamilies.Contains(family))
@@ -18,10 +18,10 @@ public static Dictionary<string, IReadOnlyCollection<Icon>> GroupIconsByFamilies
         return groupedIcons;
     }
 
-    public static IReadOnlyCollection<Icon> FilterNonMaterialSymbols(Metadata metadata)
+    public static IReadOnlyCollection<Icon> FilterByFamily(Metadata metadata, IconType iconType)
     {
         return metadata.Icons
-            .Where(icon => !icon.UnsupportedFamilies.Any(FamilyMap.IsMaterialSymbolFamily))
+            .Where(icon => !icon.UnsupportedFamilies.Any(family => FamilyMap.IsSelectedFamilyByIconType(iconType, family)))
             .ToList();
     }
 }