Make TitleLine "by" prefix optional

menees · Feb 11, 2024 · 1cb1637 · 1cb1637
1 parent 7396e2e
commit 1cb1637
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -27,7 +27,7 @@
 		<IsPublishable>false</IsPublishable>
 
 		<!-- Make the assembly, file, and NuGet package versions the same. -->
-		<Version>0.9.2-beta</Version>
+		<Version>0.9.3-beta</Version>
 		<UseLocaMeneesLibraries>false</UseLocaMeneesLibraries>
 		<LocaMeneesLibrariesSrc/>
 		<BuildingInsideVisualStudio Condition="'$(BuildingInsideVisualStudio)' == ''">false</BuildingInsideVisualStudio>

diff --git a/src/Menees.Chords/TitleLine.cs b/src/Menees.Chords/TitleLine.cs
@@ -19,7 +19,7 @@ public sealed class TitleLine : TextEntry
 
 	private const string TitleRegexPattern = """
 		(?inx)^\s* # Ignore leading whitespace
-		(?<title>\S.*?)(\s+([\-–—]|((Chords|Tab|Official|Bass|Ukulele|Power|Guitar\s+Pro)\s+by))\s+(?<artist>\S.*?))? # Title with optional artist
+		(?<title>\S.*?)(\s+([\-–—]|(((Chords|Tab|Official|Bass|Ukulele|Power|Guitar\s+Pro)\s+)?by))\s+(?<artist>\S.*?))? # Title with optional artist
 		([\.,;][\t ](?<metadata>\S.*?))* # Optional other info. Change last * to ? to see all captures as one.
 		[\.;]?\s*$ # Optional trailing "separator" and whitespace
 		""";

diff --git a/tests/Menees.Chords.Tests/TitleLineTests.cs b/tests/Menees.Chords.Tests/TitleLineTests.cs
@@ -78,6 +78,12 @@ public void TryParseValidTest()
 			("title", "Pretty Little Lie"),
 			("artist", "Blackberry Smoke"));
 
+		Test(
+			"Free Bird by Lynyrd Skynyrd. Key: G.",
+			("title", "Free Bird"),
+			("artist", "Lynyrd Skynyrd"),
+			("key", "G"));
+
 		Test(
 			"Free Bird Official by Lynyrd Skynyrd. Key: G. Bpm: 110,150.",
 			("title", "Free Bird"),