aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Entities/Video.cs
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Controller/Entities/Video.cs')
-rw-r--r--MediaBrowser.Controller/Entities/Video.cs47
1 files changed, 23 insertions, 24 deletions
diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs
index 8693d867c..52f1dd051 100644
--- a/MediaBrowser.Controller/Entities/Video.cs
+++ b/MediaBrowser.Controller/Entities/Video.cs
@@ -45,6 +45,12 @@ namespace MediaBrowser.Controller.Entities
}
[IgnoreDataMember]
+ public override bool SupportsPeople
+ {
+ get { return true; }
+ }
+
+ [IgnoreDataMember]
public override bool SupportsInheritedParentImages
{
get
@@ -78,14 +84,6 @@ namespace MediaBrowser.Controller.Entities
}
}
- public override double? GetDefaultPrimaryImageAspectRatio()
- {
- double value = 16;
- value /= 9;
-
- return value;
- }
-
public override string CreatePresentationUniqueKey()
{
if (!string.IsNullOrWhiteSpace(PrimaryVersionId))
@@ -406,30 +404,31 @@ namespace MediaBrowser.Controller.Entities
}
}
- internal override bool IsValidFromResolver(BaseItem newItem)
+ internal override ItemUpdateType UpdateFromResolvedItem(BaseItem newItem)
{
- var current = this;
+ var updateType = base.UpdateFromResolvedItem(newItem);
- var newAsVideo = newItem as Video;
-
- if (newAsVideo != null)
+ var newVideo = newItem as Video;
+ if (newVideo != null)
{
- if (!current.AdditionalParts.SequenceEqual(newAsVideo.AdditionalParts, StringComparer.OrdinalIgnoreCase))
+ if (!AdditionalParts.SequenceEqual(newVideo.AdditionalParts, StringComparer.Ordinal))
{
- return false;
+ AdditionalParts = newVideo.AdditionalParts;
+ updateType |= ItemUpdateType.MetadataImport;
}
- if (!current.LocalAlternateVersions.SequenceEqual(newAsVideo.LocalAlternateVersions, StringComparer.OrdinalIgnoreCase))
+ if (!LocalAlternateVersions.SequenceEqual(newVideo.LocalAlternateVersions, StringComparer.Ordinal))
{
- return false;
+ LocalAlternateVersions = newVideo.LocalAlternateVersions;
+ updateType |= ItemUpdateType.MetadataImport;
}
-
- if (newAsVideo.VideoType != VideoType)
+ if (VideoType != newVideo.VideoType)
{
- return false;
+ VideoType = newVideo.VideoType;
+ updateType |= ItemUpdateType.MetadataImport;
}
}
- return base.IsValidFromResolver(newItem);
+ return updateType;
}
public static string[] QueryPlayableStreamFiles(string rootPath, VideoType videoType)
@@ -521,9 +520,9 @@ namespace MediaBrowser.Controller.Entities
}
}
- public override async Task UpdateToRepository(ItemUpdateType updateReason, CancellationToken cancellationToken)
+ public override void UpdateToRepository(ItemUpdateType updateReason, CancellationToken cancellationToken)
{
- await base.UpdateToRepository(updateReason, cancellationToken).ConfigureAwait(false);
+ base.UpdateToRepository(updateReason, cancellationToken);
var localAlternates = GetLocalAlternateVersionIds()
.Select(i => LibraryManager.GetItemById(i))
@@ -540,7 +539,7 @@ namespace MediaBrowser.Controller.Entities
item.Genres = Genres;
item.ProviderIds = ProviderIds;
- await item.UpdateToRepository(ItemUpdateType.MetadataDownload, cancellationToken).ConfigureAwait(false);
+ item.UpdateToRepository(ItemUpdateType.MetadataDownload, cancellationToken);
}
}