aboutsummaryrefslogtreecommitdiff
path: root/Emby.Naming/Video
diff options
context:
space:
mode:
authorBond_009 <bond.009@outlook.com>2020-01-11 21:31:35 +0100
committerBond_009 <bond.009@outlook.com>2020-01-11 22:17:05 +0100
commitabf03f7d3ad14f026fd439f522403353a7ecec86 (patch)
tree106d8c5ad1b5b560e4ebdad414dae3b962ca646a /Emby.Naming/Video
parentec0ef2a2c5a20b7e6aaa5959b52bf399b0b6dde2 (diff)
Clean up some more
Diffstat (limited to 'Emby.Naming/Video')
-rw-r--r--Emby.Naming/Video/CleanDateTimeParser.cs19
-rw-r--r--Emby.Naming/Video/VideoResolver.cs2
2 files changed, 6 insertions, 15 deletions
diff --git a/Emby.Naming/Video/CleanDateTimeParser.cs b/Emby.Naming/Video/CleanDateTimeParser.cs
index 84a14a54f5..6c74c07d55 100644
--- a/Emby.Naming/Video/CleanDateTimeParser.cs
+++ b/Emby.Naming/Video/CleanDateTimeParser.cs
@@ -2,33 +2,24 @@
#pragma warning disable SA1600
#nullable enable
+using System.Collections.Generic;
using System.Globalization;
using System.Text.RegularExpressions;
-using Emby.Naming.Common;
namespace Emby.Naming.Video
{
/// <summary>
/// <see href="http://kodi.wiki/view/Advancedsettings.xml#video" />.
/// </summary>
- public class CleanDateTimeParser
+ public static class CleanDateTimeParser
{
- private readonly NamingOptions _options;
-
- public CleanDateTimeParser(NamingOptions options)
+ public static CleanDateTimeResult Clean(string name, IReadOnlyList<Regex> cleanDateTimeRegexes)
{
- _options = options;
- }
-
- public CleanDateTimeResult Clean(string name)
- {
- var regexes = _options.CleanDateTimeRegexes;
- var len = regexes.Length;
-
CleanDateTimeResult result = new CleanDateTimeResult(name);
+ var len = cleanDateTimeRegexes.Count;
for (int i = 0; i < len; i++)
{
- if (TryClean(name, regexes[i], ref result))
+ if (TryClean(name, cleanDateTimeRegexes[i], ref result))
{
return result;
}
diff --git a/Emby.Naming/Video/VideoResolver.cs b/Emby.Naming/Video/VideoResolver.cs
index 76e0a5a0ec..f93db24866 100644
--- a/Emby.Naming/Video/VideoResolver.cs
+++ b/Emby.Naming/Video/VideoResolver.cs
@@ -138,7 +138,7 @@ namespace Emby.Naming.Video
public CleanDateTimeResult CleanDateTime(string name)
{
- return new CleanDateTimeParser(_options).Clean(name);
+ return CleanDateTimeParser.Clean(name, _options.CleanDateTimeRegexes);
}
}
}