majomi/intro-skipper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor ChapterAnalyzer: Unify intro and credits detection loop (#204)

Browse Source
This commit is contained in:
rlauuzo 2024-06-26 17:31:18 +02:00 committed by GitHub
parent bcd302045b
commit b9b9e88765
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 52 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/ChapterAnalyzer.cs
View File

@ -89,115 +89,39 @@ public class ChapterAnalyzer : IMediaFileAnalyzer
string expression,
AnalysisMode mode)
{
Intro? matchingChapter = null;
var config = Plugin.Instance?.Configuration ?? new PluginConfiguration();
var (minDuration, maxDuration) = mode switch
{
AnalysisMode.Introduction => (config.MinimumIntroDuration, config.MaximumIntroDuration),
_ => (config.MinimumCreditsDuration, config.MaximumCreditsDuration)
};
if (chapters.Count == 0)
{
return null;
}
if (mode == AnalysisMode.Credits)
{
// Since the ending credits chapter may be the last chapter in the file, append a virtual
// chapter at the very end of the file.
chapters.Add(new()
{
StartPositionTicks = TimeSpan.FromSeconds(episode.Duration).Ticks
});
var config = Plugin.Instance?.Configuration ?? new PluginConfiguration();
var count = chapters.Count;
var reversed = mode != AnalysisMode.Introduction;
var (minDuration, maxDuration) = !reversed
? (config.MinimumIntroDuration, config.MaximumIntroDuration)
: (config.MinimumCreditsDuration, config.MaximumCreditsDuration);
// Check all chapters in reverse order, skipping the virtual chapter
for (int i = chapters.Count - 2; i > 0; i--)
{
var current = chapters[i];
var previous = chapters[i - 1];
if (string.IsNullOrWhiteSpace(current.Name))
{
continue;
}
var currentRange = new TimeRange(
TimeSpan.FromTicks(current.StartPositionTicks).TotalSeconds,
TimeSpan.FromTicks(chapters[i + 1].StartPositionTicks).TotalSeconds);
var baseMessage = string.Format(
CultureInfo.InvariantCulture,
"{0}: Chapter \"{1}\" ({2} - {3})",
episode.Path,
current.Name,
currentRange.Start,
currentRange.End);
if (currentRange.Duration < minDuration || currentRange.Duration > maxDuration)
{
_logger.LogTrace("{Base}: ignoring (invalid duration)", baseMessage);
continue;
}
// Regex.IsMatch() is used here in order to allow the runtime to cache the compiled regex
// between function invocations.
var match = Regex.IsMatch(
current.Name,
expression,
RegexOptions.None,
TimeSpan.FromSeconds(1));
if (!match)
{
_logger.LogTrace("{Base}: ignoring (does not match regular expression)", baseMessage);
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;
}
}
else
{
// Check all chapters
for (int i = 0; i < chapters.Count - 1; i++)
for (int i = reversed ? count - 1 : 0; reversed ? i >= 0 : i < count; i += reversed ? -1 : 1)
{
var current = chapters[i];
var next = chapters[i + 1];
var chapter = chapters[i];
var next = chapters.ElementAtOrDefault(i + 1) ??
new ChapterInfo { StartPositionTicks = TimeSpan.FromSeconds(episode.Duration).Ticks }; // Since the ending credits chapter may be the last chapter in the file, append a virtual chapter.
if (string.IsNullOrWhiteSpace(current.Name))
if (string.IsNullOrWhiteSpace(chapter.Name))
{
continue;
}
var currentRange = new TimeRange(
TimeSpan.FromTicks(current.StartPositionTicks).TotalSeconds,
TimeSpan.FromTicks(chapter.StartPositionTicks).TotalSeconds,
TimeSpan.FromTicks(next.StartPositionTicks).TotalSeconds);
var baseMessage = string.Format(
CultureInfo.InvariantCulture,
"{0}: Chapter \"{1}\" ({2} - {3})",
episode.Path,
current.Name,
chapter.Name,
currentRange.Start,
currentRange.End);
@ -210,7 +134,7 @@ public class ChapterAnalyzer : IMediaFileAnalyzer
// Regex.IsMatch() is used here in order to allow the runtime to cache the compiled regex
// between function invocations.
var match = Regex.IsMatch(
current.Name,
chapter.Name,
expression,
RegexOptions.None,
TimeSpan.FromSeconds(1));
@ -221,27 +145,28 @@ public class ChapterAnalyzer : IMediaFileAnalyzer
continue;
}
if (!string.IsNullOrWhiteSpace(next.Name))
// Check if the next (or previous for Credits) chapter also matches
var adjacentChapter = reversed ? chapters.ElementAtOrDefault(i - 1) : next;
if (adjacentChapter != null && !string.IsNullOrWhiteSpace(adjacentChapter.Name))
{
// Check for possibility of overlapping keywords
var overlap = Regex.IsMatch(
next.Name,
adjacentChapter.Name,
expression,
RegexOptions.None,
TimeSpan.FromSeconds(1));
if (overlap)
{
_logger.LogTrace("{Base}: ignoring (adjacent chapter also matches)", baseMessage);
continue;
}
}
matchingChapter = new(episode.EpisodeId, currentRange);
_logger.LogTrace("{Base}: okay", baseMessage);
break;
}
return new Intro(episode.EpisodeId, currentRange);
}
return matchingChapter;
return null;
}
}