fix: Load .kicad_sym files of version 9 correctly

Author: just-seba

release-notes/3.0.2.md

@@ -0,0 +1,5 @@
+# Version 3.0.2
+
+## Bug fixes
+
+- Load `.kicad_sym` files of version 9 correctly.

src/KiCadDbLib/Services/KiCad/LibraryReader/KiCad6LibraryReader.cs

@@ -19,26 +19,21 @@ public KiCad6LibraryReader(ISettingsProvider settingsProvider)
 
         public async Task<string[]> GetFootprintsAsync()
         {
-            var settings = await _settingsProvider.GetWorkspaceSettings()
-                .ConfigureAwait(false);
+            var settings = await _settingsProvider.GetWorkspaceSettings().ConfigureAwait(false);
 
             var kicadFootprints = GetFootprintInfosFromDirectory(settings.FootprintsPath);
 
-            return kicadFootprints
-                .Select(x => x.ToString())
-                .ToArray();
+            return kicadFootprints.Select(x => x.ToString()).ToArray();
         }
 
         public async Task<string[]> GetSymbolsAsync()
         {
-            var settings = await _settingsProvider.GetWorkspaceSettings()
-                .ConfigureAwait(false);
+            var settings = await _settingsProvider.GetWorkspaceSettings().ConfigureAwait(false);
 
             var kicadSymbols = await GetSymbolInfosFromDirectoryAsync(settings.SymbolsPath)
                 .ConfigureAwait(false);
 
-            return kicadSymbols
-                 .ToArray();
+            return kicadSymbols.ToArray();
         }
 
         private static IEnumerable<LibraryItemInfo> GetFootprintInfosFromDirectory(string directory)
@@ -48,45 +43,53 @@ private static IEnumerable<LibraryItemInfo> GetFootprintInfosFromDirectory(strin
                 throw new DirectoryNotFoundException($"Directory \"{directory}\" not found.");
             }
 
-            return Directory.EnumerateDirectories(directory, $"*{FileExtensions.Pretty}")
+            return Directory
+                .EnumerateDirectories(directory, $"*{FileExtensions.Pretty}")
                 .SelectMany(GetFootprintInfos);
         }
 
         private static LibraryItemInfo[] GetFootprintInfos(string footprintDirectory)
         {
-            var library = new DirectoryInfo(footprintDirectory).Name[..^FileExtensions.Pretty.Length];
-
-            return Directory.EnumerateFiles(footprintDirectory, $"*{FileExtensions.KicadMod}")
-               .Select(Path.GetFileNameWithoutExtension)
-               .Select(footprint => new LibraryItemInfo(library, footprint!))
-               .ToArray();
+            var library = new DirectoryInfo(footprintDirectory).Name[
+                ..^FileExtensions.Pretty.Length
+            ];
+
+            return Directory
+                .EnumerateFiles(footprintDirectory, $"*{FileExtensions.KicadMod}")
+                .Select(Path.GetFileNameWithoutExtension)
+                .Select(footprint => new LibraryItemInfo(library, footprint!))
+                .ToArray();
         }
 
-        private static async Task<IEnumerable<string>> GetSymbolInfosFromDirectoryAsync(string directory)
+        private static async Task<IEnumerable<string>> GetSymbolInfosFromDirectoryAsync(
+            string directory
+        )
         {
             if (!Directory.Exists(directory))
             {
                 throw new DirectoryNotFoundException($"Directory \"{directory}\" not found.");
             }
 
-            return await Directory.EnumerateFiles(directory, $"*{FileExtensions.KicadSym}")
+            return await Directory
+                .EnumerateFiles(directory, $"*{FileExtensions.KicadSym}")
                 .ToAsyncEnumerable()
                 .SelectMany(GetSymbolInfosAsync)
                 .Select(item => item.ToString())
                 .ToArrayAsync()
                 .ConfigureAwait(false);
         }
 
-        private static async IAsyncEnumerable<LibraryItemInfo> GetSymbolInfosAsync(string libraryFile)
+        private static async IAsyncEnumerable<LibraryItemInfo> GetSymbolInfosAsync(
+            string libraryFile
+        )
         {
             var sw = Stopwatch.StartNew();
             var libraryName = Path.GetFileNameWithoutExtension(libraryFile);
-            var regex = new Regex("\\(symbol \"(.+?)\" (?!.*?extends)");
+            var regex = new Regex("\\(symbol\\s+?\"(.+?)\"\\s+?(?!.*?extends)");
             var lines = await File.ReadAllTextAsync(libraryFile, Encoding.UTF8)
                 .ConfigureAwait(false);
 
-            var symbols = regex.Matches(lines)
-                .Select(match => match.Groups[1].Value);
+            var symbols = regex.Matches(lines).Select(match => match.Groups[1].Value);
 
             foreach (var symbol in symbols)
             {
@@ -97,4 +100,4 @@ private static async IAsyncEnumerable<LibraryItemInfo> GetSymbolInfosAsync(strin
             Debug.WriteLine($"Get Symbols from {libraryFile}: {sw.ElapsedMilliseconds}ms");
         }
     }
-}
+}

src/test/KiCad.UnitTest/KiCad6LibraryReaderTest.cs

@@ -38,6 +38,8 @@ public async Task Reader_Should_Read_Symbols()
         symbols.Should().Contain("Device:L");
 
         symbols.Should().NotContain("Device:C_0_0");
-        symbols.Should().NotContain("Device:Filter_EMI_C", because: "it only extends Device:C_Feedthrough");
+        symbols
+            .Should()
+            .NotContain("Device:Filter_EMI_C", because: "it only extends Device:C_Feedthrough");
     }
-}
+}