Fix app cast gen not working w/multiple dashes

Closes #623
NetSparkleUpdater · Oct 5, 2024 · e128349 · e128349
1 parent 2b4faa5
commit e128349
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/NetSparkle.Tests.AppCastGenerator/AppCastMakerTests.cs b/src/NetSparkle.Tests.AppCastGenerator/AppCastMakerTests.cs
@@ -140,6 +140,14 @@ public void CanGetVersionFromName()
             Assert.Equal("2.10.1", AppCastMaker.GetVersionFromName("appsetup_2.10.1.exe"));
             Assert.Equal("2.10.1", AppCastMaker.GetVersionFromName("appsetup 2.10.1.exe"));
             Assert.Equal("2.10.1", AppCastMaker.GetVersionFromName("appsetup2.10.1.exe"));
+
+            // #623
+            Assert.Equal("2.10.1", AppCastMaker.GetVersionFromName("app-setup-2.10.1.exe"));
+            Assert.Equal("2.10.1", AppCastMaker.GetVersionFromName("my-app-setup-2.10.1.exe"));
+            Assert.Equal("2.10.1", AppCastMaker.GetVersionFromName("my-app-setup-2.10.1.exe"));
+            Assert.Equal("2.10.1", AppCastMaker.GetVersionFromName("my-app-setup 2.10.1.exe"));
+            Assert.Equal("2.1", AppCastMaker.GetVersionFromName("my--app-setup-2.1.exe"));
+            Assert.Equal("2.10.1", AppCastMaker.GetVersionFromName("-my--app-setup-2.10.1.exe"));
 
             // Invalid semantic versions tests
             Assert.Null(AppCastMaker.GetVersionFromName("app 1.2.3-0123.txt"));

diff --git a/src/NetSparkle.Tools.AppCastGenerator/AppCastMaker.cs b/src/NetSparkle.Tools.AppCastGenerator/AppCastMaker.cs
@@ -127,10 +127,10 @@ private static string RemoveTextBlockFromRight(string input)
                 // if segment has text in it at the start and digits later, get rid of text and +/- symbol
                 if (Regex.IsMatch(segment, @"[a-zA-Z]") && Regex.IsMatch(segment, @"\d"))
                 {
-                    var match = Regex.Match(segment, @"[^+-]*[a-zA-Z][+-]?");
-                    if (match.Success)
+                    var match = Regex.Matches(segment, @"[^+-]*[a-zA-Z][+-]?");
+                    if (match.Count > 0)
                     {
-                        segment = segment.Substring(match.Index + match.Length);
+                        segment = segment.Substring(match.Last().Index + match.Last().Length);
                         lastVersionToCheck = true;
                     }
                 }