aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Entities/Video.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-10-03 14:39:37 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-10-03 14:39:37 -0400
commita5b82cd2ec9b03e949ab79791dc6c0469390c085 (patch)
tree261a5e7b228f849bfd00801d49016252e51d6f80 /MediaBrowser.Controller/Entities/Video.cs
parenta7b0b601fa7a783e6b8dfbbc8c74485f53a58259 (diff)
remove unneeded async signatures
Diffstat (limited to 'MediaBrowser.Controller/Entities/Video.cs')
-rw-r--r--MediaBrowser.Controller/Entities/Video.cs33
1 files changed, 17 insertions, 16 deletions
diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs
index 8693d867c..8203e5304 100644
--- a/MediaBrowser.Controller/Entities/Video.cs
+++ b/MediaBrowser.Controller/Entities/Video.cs
@@ -406,30 +406,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 +522,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 +541,7 @@ namespace MediaBrowser.Controller.Entities
item.Genres = Genres;
item.ProviderIds = ProviderIds;
- await item.UpdateToRepository(ItemUpdateType.MetadataDownload, cancellationToken).ConfigureAwait(false);
+ item.UpdateToRepository(ItemUpdateType.MetadataDownload, cancellationToken);
}
}