find the first credits chapter marker (#138)

jumoog · May 17, 2024 · e58e74b · e58e74b
1 parent d41ec2a
commit e58e74b
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/ChapterAnalyzer.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/ChapterAnalyzer.cs
@@ -116,7 +116,7 @@ public ChapterAnalyzer(ILogger<ChapterAnalyzer> logger)
             for (int i = chapters.Count - 2; i >= 0; i--)
             {
                 var current = chapters[i];
-                var next = chapters[i + 1];
+                var previous = chapters[i - 1];
 
                 if (string.IsNullOrWhiteSpace(current.Name))
                 {
@@ -125,7 +125,7 @@ public ChapterAnalyzer(ILogger<ChapterAnalyzer> logger)
 
                 var currentRange = new TimeRange(
                     TimeSpan.FromTicks(current.StartPositionTicks).TotalSeconds,
-                    TimeSpan.FromTicks(next.StartPositionTicks).TotalSeconds);
+                    TimeSpan.FromTicks(chapters[i + 1].StartPositionTicks).TotalSeconds);
 
                 var baseMessage = string.Format(
                     CultureInfo.InvariantCulture,
@@ -155,6 +155,21 @@ public ChapterAnalyzer(ILogger<ChapterAnalyzer> logger)
                     continue;
                 }
 
+                if (!string.IsNullOrWhiteSpace(previous.Name))
+                {
+                    // Check for possibility of overlapping keywords
+                    var overlap = Regex.IsMatch(
+                        previous.Name,
+                        expression,
+                        RegexOptions.None,
+                        TimeSpan.FromSeconds(1));
+
+                    if (overlap)
+                    {
+                        continue;
+                    }
+                }
+
                 matchingChapter = new(episode.EpisodeId, currentRange);
                 _logger.LogTrace("{Base}: okay", baseMessage);
                 break;