alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-01-15 23:58:57 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

remove unneeded async signatures

Browse Source
This commit is contained in:
Luke Pulverenti
2017-10-03 14:39:37 -04:00
parent a7b0b601fa
commit a5b82cd2ec
32 changed files with 231 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
MediaBrowser.Controller/Entities/Video.cs
View File

@@ -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);
}
}