From 25fd56d83c0e5e1b82a03d1c756f49094ff802d2 Mon Sep 17 00:00:00 2001 From: Kilian von Pflugk Date: Sat, 31 Aug 2024 18:56:48 +0200 Subject: [PATCH] use correct namespace --- .../TestAudioFingerprinting.cs | 2 ++ .../TestBlackFrames.cs | 2 ++ .../TestChapterAnalyzer.cs | 2 ++ .../TestContiguous.cs | 1 + .../TestEdl.cs | 1 + .../TestWarnings.cs | 1 + .../Analyzers/BlackFrameAnalyzer.cs | 5 +++-- .../Analyzers/ChapterAnalyzer.cs | 3 ++- .../Analyzers/ChromaprintAnalyzer.cs | 19 ++++++++++--------- .../Analyzers/IMediaFileAnalyzer.cs | 3 ++- .../Analyzers/SegmentAnalyzer.cs | 3 ++- .../AutoSkip.cs | 1 + .../AutoSkipCredits.cs | 1 + .../Configuration/PluginConfiguration.cs | 1 + .../Controllers/TroubleshootingController.cs | 1 + .../Data/AnalysisMode.cs | 2 +- .../Data/BlackFrame.cs | 2 +- .../Data/EdlAction.cs | 2 +- .../Data/EpisodeState.cs | 2 +- .../Data/EpisodeVisualization.cs | 2 +- .../Data/FingerprintException.cs | 2 +- .../Data/Intro.cs | 2 +- .../Data/IntroWithMetadata.cs | 2 +- .../Data/PluginWarning.cs | 2 +- .../Data/QueuedEpisode.cs | 2 +- .../Data/TimeRange.cs | 2 +- .../Data/TimeRangeHelpers.cs | 2 +- .../Data/WarningManager.cs | 2 +- .../EdlManager.cs | 1 + .../Entrypoint.cs | 2 ++ .../FFmpegWrapper.cs | 1 + .../Plugin.cs | 1 + .../QueueManager.cs | 1 + .../ScheduledTasks/BaseItemAnalyzerTask.cs | 4 +++- .../ScheduledTasks/CleanCacheTask.cs | 2 +- .../ScheduledTasks/DetectCreditsTask.cs | 3 ++- .../ScheduledTasks/DetectIntrosCreditsTask.cs | 3 ++- .../ScheduledTasks/DetectIntrosTask.cs | 3 ++- .../ScheduledTasks/ScheduledTaskSemaphore.cs | 2 +- .../XmlSerializationHelper.cs | 1 + 40 files changed, 63 insertions(+), 33 deletions(-) diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestAudioFingerprinting.cs b/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestAudioFingerprinting.cs index b07629a..4bf7025 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestAudioFingerprinting.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestAudioFingerprinting.cs @@ -6,6 +6,8 @@ using System; using System.Collections.Generic; using Xunit; using Microsoft.Extensions.Logging; +using ConfusedPolarBear.Plugin.IntroSkipper.Analyzers; +using ConfusedPolarBear.Plugin.IntroSkipper.Data; namespace ConfusedPolarBear.Plugin.IntroSkipper.Tests; diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestBlackFrames.cs b/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestBlackFrames.cs index 60d3115..7cb86bc 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestBlackFrames.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestBlackFrames.cs @@ -2,6 +2,8 @@ namespace ConfusedPolarBear.Plugin.IntroSkipper.Tests; using System; using System.Collections.Generic; +using ConfusedPolarBear.Plugin.IntroSkipper.Analyzers; +using ConfusedPolarBear.Plugin.IntroSkipper.Data; using Microsoft.Extensions.Logging; using Xunit; diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestChapterAnalyzer.cs b/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestChapterAnalyzer.cs index 96feb8e..136f04e 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestChapterAnalyzer.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestChapterAnalyzer.cs @@ -3,6 +3,8 @@ namespace ConfusedPolarBear.Plugin.IntroSkipper.Tests; using System; using System.Collections.Generic; using System.Collections.ObjectModel; +using ConfusedPolarBear.Plugin.IntroSkipper.Analyzers; +using ConfusedPolarBear.Plugin.IntroSkipper.Data; using MediaBrowser.Model.Entities; using Microsoft.Extensions.Logging; using Xunit; diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestContiguous.cs b/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestContiguous.cs index 50121f6..fb59010 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestContiguous.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestContiguous.cs @@ -1,3 +1,4 @@ +using ConfusedPolarBear.Plugin.IntroSkipper.Data; using Xunit; namespace ConfusedPolarBear.Plugin.IntroSkipper.Tests; diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestEdl.cs b/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestEdl.cs index fd71c42..c8b1e17 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestEdl.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestEdl.cs @@ -1,4 +1,5 @@ using System; +using ConfusedPolarBear.Plugin.IntroSkipper.Data; using Xunit; namespace ConfusedPolarBear.Plugin.IntroSkipper.Tests; diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestWarnings.cs b/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestWarnings.cs index 278de86..9dde767 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestWarnings.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestWarnings.cs @@ -1,5 +1,6 @@ namespace ConfusedPolarBear.Plugin.IntroSkipper.Tests; +using ConfusedPolarBear.Plugin.IntroSkipper.Data; using Xunit; public class TestFlags diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/BlackFrameAnalyzer.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/BlackFrameAnalyzer.cs index 8925684..b5464de 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/BlackFrameAnalyzer.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/BlackFrameAnalyzer.cs @@ -4,9 +4,10 @@ using System.Collections.ObjectModel; using System.Linq; using System.Threading; using ConfusedPolarBear.Plugin.IntroSkipper.Configuration; +using ConfusedPolarBear.Plugin.IntroSkipper.Data; using Microsoft.Extensions.Logging; -namespace ConfusedPolarBear.Plugin.IntroSkipper; +namespace ConfusedPolarBear.Plugin.IntroSkipper.Analyzers; /// /// Media file analyzer used to detect end credits that consist of text overlaid on a black background. @@ -30,7 +31,7 @@ public class BlackFrameAnalyzer : IMediaFileAnalyzer /// Logger. public BlackFrameAnalyzer(ILogger logger) { - var config = Plugin.Instance?.Configuration ?? new Configuration.PluginConfiguration(); + var config = Plugin.Instance?.Configuration ?? new PluginConfiguration(); minimumCreditsDuration = config.MinimumCreditsDuration; maximumCreditsDuration = 2 * config.MaximumCreditsDuration; blackFrameMinimumPercentage = config.BlackFrameMinimumPercentage; diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/ChapterAnalyzer.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/ChapterAnalyzer.cs index ae6bdf6..a302d57 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/ChapterAnalyzer.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/ChapterAnalyzer.cs @@ -6,10 +6,11 @@ using System.Linq; using System.Text.RegularExpressions; using System.Threading; using ConfusedPolarBear.Plugin.IntroSkipper.Configuration; +using ConfusedPolarBear.Plugin.IntroSkipper.Data; using MediaBrowser.Model.Entities; using Microsoft.Extensions.Logging; -namespace ConfusedPolarBear.Plugin.IntroSkipper; +namespace ConfusedPolarBear.Plugin.IntroSkipper.Analyzers; /// /// Chapter name analyzer. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/ChromaprintAnalyzer.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/ChromaprintAnalyzer.cs index 2a27d6b..187a520 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/ChromaprintAnalyzer.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/ChromaprintAnalyzer.cs @@ -6,9 +6,10 @@ using System.Linq; using System.Numerics; using System.Threading; using ConfusedPolarBear.Plugin.IntroSkipper.Configuration; +using ConfusedPolarBear.Plugin.IntroSkipper.Data; using Microsoft.Extensions.Logging; -namespace ConfusedPolarBear.Plugin.IntroSkipper; +namespace ConfusedPolarBear.Plugin.IntroSkipper.Analyzers; /// /// Chromaprint audio analyzer. @@ -69,7 +70,7 @@ public class ChromaprintAnalyzer : IMediaFileAnalyzer // Episodes that were analyzed and do not have an introduction. var episodesWithoutIntros = episodeAnalysisQueue.Where(e => !e.State.IsAnalyzed(mode)).ToList(); - this._analysisMode = mode; + _analysisMode = mode; if (episodesWithoutIntros.Count == 0 || episodeAnalysisQueue.Count <= 1) { @@ -142,7 +143,7 @@ public class ChromaprintAnalyzer : IMediaFileAnalyzer // - the introduction exceeds the configured limit if ( !remainingIntro.Valid || - (this._analysisMode == AnalysisMode.Introduction && remainingIntro.Duration > Plugin.Instance!.Configuration.MaximumIntroDuration)) + (_analysisMode == AnalysisMode.Introduction && remainingIntro.Duration > Plugin.Instance!.Configuration.MaximumIntroDuration)) { continue; } @@ -156,7 +157,7 @@ public class ChromaprintAnalyzer : IMediaFileAnalyzer * To fix this, the starting and ending times need to be switched, as they were previously reversed * and subtracted from the episode duration to get the reported time range. */ - if (this._analysisMode == AnalysisMode.Credits) + if (_analysisMode == AnalysisMode.Credits) { // Calculate new values for the current intro double currentOriginalIntroStart = currentIntro.IntroStart; @@ -203,13 +204,13 @@ public class ChromaprintAnalyzer : IMediaFileAnalyzer return analysisQueue; } - if (this._analysisMode == AnalysisMode.Introduction) + if (_analysisMode == AnalysisMode.Introduction) { // Adjust all introduction end times so that they end at silence. seasonIntros = AdjustIntroEndTimes(analysisQueue, seasonIntros); } - Plugin.Instance!.UpdateTimestamps(seasonIntros, this._analysisMode); + Plugin.Instance!.UpdateTimestamps(seasonIntros, _analysisMode); return episodeAnalysisQueue.AsReadOnly(); } @@ -301,8 +302,8 @@ public class ChromaprintAnalyzer : IMediaFileAnalyzer var rhsRanges = new List(); // Generate inverted indexes for the left and right episodes. - var lhsIndex = FFmpegWrapper.CreateInvertedIndex(lhsId, lhsPoints, this._analysisMode); - var rhsIndex = FFmpegWrapper.CreateInvertedIndex(rhsId, rhsPoints, this._analysisMode); + var lhsIndex = FFmpegWrapper.CreateInvertedIndex(lhsId, lhsPoints, _analysisMode); + var rhsIndex = FFmpegWrapper.CreateInvertedIndex(rhsId, rhsPoints, _analysisMode); var indexShifts = new HashSet(); // For all audio points in the left episode, check if the right episode has a point which matches exactly. @@ -402,7 +403,7 @@ public class ChromaprintAnalyzer : IMediaFileAnalyzer // Since LHS had a contiguous time range, RHS must have one also. var rContiguous = TimeRangeHelpers.FindContiguous(rhsTimes.ToArray(), maximumTimeSkip)!; - if (this._analysisMode == AnalysisMode.Introduction) + if (_analysisMode == AnalysisMode.Introduction) { // Tweak the end timestamps just a bit to ensure as little content as possible is skipped over. // TODO: remove this diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/IMediaFileAnalyzer.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/IMediaFileAnalyzer.cs index 047aba7..caf5f22 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/IMediaFileAnalyzer.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/IMediaFileAnalyzer.cs @@ -1,7 +1,8 @@ using System.Collections.ObjectModel; using System.Threading; +using ConfusedPolarBear.Plugin.IntroSkipper.Data; -namespace ConfusedPolarBear.Plugin.IntroSkipper; +namespace ConfusedPolarBear.Plugin.IntroSkipper.Analyzers; /// /// Media file analyzer interface. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/SegmentAnalyzer.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/SegmentAnalyzer.cs index 873fc7c..6fa0db8 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/SegmentAnalyzer.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/SegmentAnalyzer.cs @@ -1,8 +1,9 @@ using System.Collections.ObjectModel; using System.Threading; +using ConfusedPolarBear.Plugin.IntroSkipper.Data; using Microsoft.Extensions.Logging; -namespace ConfusedPolarBear.Plugin.IntroSkipper; +namespace ConfusedPolarBear.Plugin.IntroSkipper.Analyzers; /// /// Chapter name analyzer. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/AutoSkip.cs b/ConfusedPolarBear.Plugin.IntroSkipper/AutoSkip.cs index 13a3b6c..7656e7b 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/AutoSkip.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/AutoSkip.cs @@ -4,6 +4,7 @@ using System.Threading; using System.Threading.Tasks; using System.Timers; using ConfusedPolarBear.Plugin.IntroSkipper.Configuration; +using ConfusedPolarBear.Plugin.IntroSkipper.Data; using MediaBrowser.Common.Extensions; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Session; diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/AutoSkipCredits.cs b/ConfusedPolarBear.Plugin.IntroSkipper/AutoSkipCredits.cs index 1c04365..998f9a6 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/AutoSkipCredits.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/AutoSkipCredits.cs @@ -4,6 +4,7 @@ using System.Threading; using System.Threading.Tasks; using System.Timers; using ConfusedPolarBear.Plugin.IntroSkipper.Configuration; +using ConfusedPolarBear.Plugin.IntroSkipper.Data; using MediaBrowser.Common.Extensions; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Session; diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Configuration/PluginConfiguration.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Configuration/PluginConfiguration.cs index 35198b8..dc12a8e 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Configuration/PluginConfiguration.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/Configuration/PluginConfiguration.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Diagnostics; +using ConfusedPolarBear.Plugin.IntroSkipper.Data; using MediaBrowser.Model.Plugins; namespace ConfusedPolarBear.Plugin.IntroSkipper.Configuration; diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Controllers/TroubleshootingController.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Controllers/TroubleshootingController.cs index 79d9c51..ef96236 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Controllers/TroubleshootingController.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/Controllers/TroubleshootingController.cs @@ -3,6 +3,7 @@ using System.Globalization; using System.IO; using System.Net.Mime; using System.Text; +using ConfusedPolarBear.Plugin.IntroSkipper.Data; using MediaBrowser.Common; using MediaBrowser.Common.Api; using MediaBrowser.Controller.Library; diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Data/AnalysisMode.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Data/AnalysisMode.cs index 7ed0367..7da010a 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Data/AnalysisMode.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/Data/AnalysisMode.cs @@ -1,4 +1,4 @@ -namespace ConfusedPolarBear.Plugin.IntroSkipper; +namespace ConfusedPolarBear.Plugin.IntroSkipper.Data; /// /// Type of media file analysis to perform. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Data/BlackFrame.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Data/BlackFrame.cs index df3a957..4f71be1 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Data/BlackFrame.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/Data/BlackFrame.cs @@ -1,4 +1,4 @@ -namespace ConfusedPolarBear.Plugin.IntroSkipper; +namespace ConfusedPolarBear.Plugin.IntroSkipper.Data; /// /// A frame of video that partially (or entirely) consists of black pixels. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Data/EdlAction.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Data/EdlAction.cs index 159e950..55bc1c1 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Data/EdlAction.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/Data/EdlAction.cs @@ -1,4 +1,4 @@ -namespace ConfusedPolarBear.Plugin.IntroSkipper; +namespace ConfusedPolarBear.Plugin.IntroSkipper.Data; /// /// Taken from https://kodi.wiki/view/Edit_decision_list#MPlayer_EDL. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Data/EpisodeState.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Data/EpisodeState.cs index ebc809b..b5fd801 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Data/EpisodeState.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/Data/EpisodeState.cs @@ -1,6 +1,6 @@ using System; -namespace ConfusedPolarBear.Plugin.IntroSkipper; +namespace ConfusedPolarBear.Plugin.IntroSkipper.Data; /// /// Represents the state of an episode regarding analysis and blacklist status. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Data/EpisodeVisualization.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Data/EpisodeVisualization.cs index 64bf022..2c8a206 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Data/EpisodeVisualization.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/Data/EpisodeVisualization.cs @@ -1,6 +1,6 @@ using System; -namespace ConfusedPolarBear.Plugin.IntroSkipper; +namespace ConfusedPolarBear.Plugin.IntroSkipper.Data; /// /// Episode name and internal ID as returned by the visualization controller. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Data/FingerprintException.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Data/FingerprintException.cs index 772b03c..5878cf2 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Data/FingerprintException.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/Data/FingerprintException.cs @@ -1,6 +1,6 @@ using System; -namespace ConfusedPolarBear.Plugin.IntroSkipper; +namespace ConfusedPolarBear.Plugin.IntroSkipper.Data; /// /// Exception raised when an error is encountered analyzing audio. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Data/Intro.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Data/Intro.cs index 9c8985f..d3bbf22 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Data/Intro.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/Data/Intro.cs @@ -2,7 +2,7 @@ using System; using System.Globalization; using System.Text.Json.Serialization; -namespace ConfusedPolarBear.Plugin.IntroSkipper; +namespace ConfusedPolarBear.Plugin.IntroSkipper.Data; /// /// Result of fingerprinting and analyzing two episodes in a season. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Data/IntroWithMetadata.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Data/IntroWithMetadata.cs index efafa68..e76e870 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Data/IntroWithMetadata.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/Data/IntroWithMetadata.cs @@ -1,4 +1,4 @@ -namespace ConfusedPolarBear.Plugin.IntroSkipper; +namespace ConfusedPolarBear.Plugin.IntroSkipper.Data; /// /// An Intro class with episode metadata. Only used in end to end testing programs. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Data/PluginWarning.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Data/PluginWarning.cs index 325514e..02d68d5 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Data/PluginWarning.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/Data/PluginWarning.cs @@ -1,6 +1,6 @@ using System; -namespace ConfusedPolarBear.Plugin.IntroSkipper; +namespace ConfusedPolarBear.Plugin.IntroSkipper.Data; /// /// Support bundle warning. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Data/QueuedEpisode.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Data/QueuedEpisode.cs index 7f5a6a9..c58c28e 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Data/QueuedEpisode.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/Data/QueuedEpisode.cs @@ -1,6 +1,6 @@ using System; -namespace ConfusedPolarBear.Plugin.IntroSkipper; +namespace ConfusedPolarBear.Plugin.IntroSkipper.Data; /// /// Episode queued for analysis. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Data/TimeRange.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Data/TimeRange.cs index 6223891..af1368a 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Data/TimeRange.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/Data/TimeRange.cs @@ -1,6 +1,6 @@ using System; -namespace ConfusedPolarBear.Plugin.IntroSkipper; +namespace ConfusedPolarBear.Plugin.IntroSkipper.Data; #pragma warning disable CA1036 // Override methods on comparable types diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Data/TimeRangeHelpers.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Data/TimeRangeHelpers.cs index 1ab8196..96fe7d7 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Data/TimeRangeHelpers.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/Data/TimeRangeHelpers.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace ConfusedPolarBear.Plugin.IntroSkipper; +namespace ConfusedPolarBear.Plugin.IntroSkipper.Data; #pragma warning restore CA1036 /// diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Data/WarningManager.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Data/WarningManager.cs index 1f01a7a..83d240f 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Data/WarningManager.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/Data/WarningManager.cs @@ -1,4 +1,4 @@ -namespace ConfusedPolarBear.Plugin.IntroSkipper; +namespace ConfusedPolarBear.Plugin.IntroSkipper.Data; /// /// Warning manager. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/EdlManager.cs b/ConfusedPolarBear.Plugin.IntroSkipper/EdlManager.cs index 9b5b296..6d374f1 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/EdlManager.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/EdlManager.cs @@ -1,6 +1,7 @@ using System; using System.Collections.ObjectModel; using System.IO; +using ConfusedPolarBear.Plugin.IntroSkipper.Data; using Microsoft.Extensions.Logging; namespace ConfusedPolarBear.Plugin.IntroSkipper; diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Entrypoint.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Entrypoint.cs index 818ded3..3d2457b 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Entrypoint.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/Entrypoint.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Threading; using System.Threading.Tasks; +using ConfusedPolarBear.Plugin.IntroSkipper.Data; +using ConfusedPolarBear.Plugin.IntroSkipper.ScheduledTasks; using MediaBrowser.Controller.Entities.TV; using MediaBrowser.Controller.Library; using MediaBrowser.Model.Entities; diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/FFmpegWrapper.cs b/ConfusedPolarBear.Plugin.IntroSkipper/FFmpegWrapper.cs index e2e19db..abe142f 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/FFmpegWrapper.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/FFmpegWrapper.cs @@ -6,6 +6,7 @@ using System.Globalization; using System.IO; using System.Text; using System.Text.RegularExpressions; +using ConfusedPolarBear.Plugin.IntroSkipper.Data; using Microsoft.Extensions.Logging; namespace ConfusedPolarBear.Plugin.IntroSkipper; diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Plugin.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Plugin.cs index 4c4f386..f81f341 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Plugin.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/Plugin.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.IO; using System.Text.RegularExpressions; using ConfusedPolarBear.Plugin.IntroSkipper.Configuration; +using ConfusedPolarBear.Plugin.IntroSkipper.Data; using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Plugins; using MediaBrowser.Controller.Configuration; diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/QueueManager.cs b/ConfusedPolarBear.Plugin.IntroSkipper/QueueManager.cs index ad156e2..01e3611 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/QueueManager.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/QueueManager.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.IO; using System.Linq; +using ConfusedPolarBear.Plugin.IntroSkipper.Data; using Jellyfin.Data.Enums; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.TV; diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/BaseItemAnalyzerTask.cs b/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/BaseItemAnalyzerTask.cs index 7556dae..88f0218 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/BaseItemAnalyzerTask.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/BaseItemAnalyzerTask.cs @@ -4,10 +4,12 @@ using System.Collections.ObjectModel; using System.Linq; using System.Threading; using System.Threading.Tasks; +using ConfusedPolarBear.Plugin.IntroSkipper.Analyzers; +using ConfusedPolarBear.Plugin.IntroSkipper.Data; using MediaBrowser.Controller.Library; using Microsoft.Extensions.Logging; -namespace ConfusedPolarBear.Plugin.IntroSkipper; +namespace ConfusedPolarBear.Plugin.IntroSkipper.ScheduledTasks; /// /// Common code shared by all media item analyzer tasks. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/CleanCacheTask.cs b/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/CleanCacheTask.cs index e58e226..d6682c6 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/CleanCacheTask.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/CleanCacheTask.cs @@ -8,7 +8,7 @@ using MediaBrowser.Controller.Library; using MediaBrowser.Model.Tasks; using Microsoft.Extensions.Logging; -namespace ConfusedPolarBear.Plugin.IntroSkipper; +namespace ConfusedPolarBear.Plugin.IntroSkipper.ScheduledTasks; /// /// Analyze all television episodes for introduction sequences. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/DetectCreditsTask.cs b/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/DetectCreditsTask.cs index 1d642d3..d30975f 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/DetectCreditsTask.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/DetectCreditsTask.cs @@ -3,11 +3,12 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Threading; using System.Threading.Tasks; +using ConfusedPolarBear.Plugin.IntroSkipper.Data; using MediaBrowser.Controller.Library; using MediaBrowser.Model.Tasks; using Microsoft.Extensions.Logging; -namespace ConfusedPolarBear.Plugin.IntroSkipper; +namespace ConfusedPolarBear.Plugin.IntroSkipper.ScheduledTasks; /// /// Analyze all television episodes for credits. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/DetectIntrosCreditsTask.cs b/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/DetectIntrosCreditsTask.cs index d629937..e7806ba 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/DetectIntrosCreditsTask.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/DetectIntrosCreditsTask.cs @@ -3,11 +3,12 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Threading; using System.Threading.Tasks; +using ConfusedPolarBear.Plugin.IntroSkipper.Data; using MediaBrowser.Controller.Library; using MediaBrowser.Model.Tasks; using Microsoft.Extensions.Logging; -namespace ConfusedPolarBear.Plugin.IntroSkipper; +namespace ConfusedPolarBear.Plugin.IntroSkipper.ScheduledTasks; /// /// Analyze all television episodes for introduction sequences. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/DetectIntrosTask.cs b/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/DetectIntrosTask.cs index dbded69..1547d5d 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/DetectIntrosTask.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/DetectIntrosTask.cs @@ -3,11 +3,12 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Threading; using System.Threading.Tasks; +using ConfusedPolarBear.Plugin.IntroSkipper.Data; using MediaBrowser.Controller.Library; using MediaBrowser.Model.Tasks; using Microsoft.Extensions.Logging; -namespace ConfusedPolarBear.Plugin.IntroSkipper; +namespace ConfusedPolarBear.Plugin.IntroSkipper.ScheduledTasks; /// /// Analyze all television episodes for introduction sequences. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/ScheduledTaskSemaphore.cs b/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/ScheduledTaskSemaphore.cs index 8b6c2b3..654f288 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/ScheduledTaskSemaphore.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/ScheduledTaskSemaphore.cs @@ -1,7 +1,7 @@ using System; using System.Threading; -namespace ConfusedPolarBear.Plugin.IntroSkipper; +namespace ConfusedPolarBear.Plugin.IntroSkipper.ScheduledTasks; internal sealed class ScheduledTaskSemaphore : IDisposable { diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/XmlSerializationHelper.cs b/ConfusedPolarBear.Plugin.IntroSkipper/XmlSerializationHelper.cs index e0bcc72..b7d90ec 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/XmlSerializationHelper.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/XmlSerializationHelper.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Runtime.Serialization; using System.Xml; +using ConfusedPolarBear.Plugin.IntroSkipper.Data; namespace ConfusedPolarBear.Plugin.IntroSkipper {