aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBond-009 <bond.009@outlook.com>2022-07-03 21:30:34 +0200
committerGitHub <noreply@github.com>2022-07-03 21:30:34 +0200
commitecae0982cc47f2ff30a9679f26594484e40bd360 (patch)
treedfb12e014d214ba24aa5009d28bbc1fedf84f9b9
parent28594ececaec447f42f9fec09258ce568de97f06 (diff)
parent8e1796f08ad36f43c661aece1367a136f749c66e (diff)
Merge pull request #8008 from revam/add-escape-hatch-for-series-merging
-rw-r--r--MediaBrowser.Controller/Entities/TV/Series.cs5
-rw-r--r--MediaBrowser.Model/Entities/MetadataProvider.cs6
2 files changed, 11 insertions, 0 deletions
diff --git a/MediaBrowser.Controller/Entities/TV/Series.cs b/MediaBrowser.Controller/Entities/TV/Series.cs
index a3c4a81fd..727efee50 100644
--- a/MediaBrowser.Controller/Entities/TV/Series.cs
+++ b/MediaBrowser.Controller/Entities/TV/Series.cs
@@ -184,6 +184,11 @@ namespace MediaBrowser.Controller.Entities.TV
list.Insert(0, key);
}
+ if (this.TryGetProviderId(MetadataProvider.Custom, out key))
+ {
+ list.Insert(0, key);
+ }
+
return list;
}
diff --git a/MediaBrowser.Model/Entities/MetadataProvider.cs b/MediaBrowser.Model/Entities/MetadataProvider.cs
index e9c098021..37e3d8864 100644
--- a/MediaBrowser.Model/Entities/MetadataProvider.cs
+++ b/MediaBrowser.Model/Entities/MetadataProvider.cs
@@ -8,6 +8,12 @@ namespace MediaBrowser.Model.Entities
public enum MetadataProvider
{
/// <summary>
+ /// This metadata provider is for users and/or plugins to override the
+ /// default merging behaviour.
+ /// </summary>
+ Custom = 0,
+
+ /// <summary>
/// The imdb.
/// </summary>
Imdb = 2,