alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-30 03:13:17 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

add playback of in-progress recordings

Browse Source
This commit is contained in:
Luke Pulverenti
2016-10-09 03:18:43 -04:00
parent b3595eab6a
commit daaae69df5
49 changed files with 570 additions and 397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MediaBrowser.Providers/Manager/ProviderUtils.cs
View File

@@ -170,6 +170,14 @@ namespace MediaBrowser.Providers.Manager
}
}
if (!lockedFields.Contains(MetadataFields.ProductionLocations))
{
if (replaceData || target.ProductionLocations.Count == 0)
{
target.ProductionLocations = source.ProductionLocations;
}
}
if (replaceData || !target.VoteCount.HasValue)
{
target.VoteCount = source.VoteCount;

12
MediaBrowser.Providers/Movies/GenericMovieDbInfo.cs
View File

@@ -148,14 +148,10 @@ namespace MediaBrowser.Providers.Movies
if (movieData.production_countries != null)
{
//var hasProductionLocations = movie as IHasProductionLocations;
//if (hasProductionLocations != null)
//{
// hasProductionLocations.ProductionLocations = movieData
// .production_countries
// .Select(i => i.name)
// .ToList();
//}
movie.ProductionLocations = movieData
.production_countries
.Select(i => i.name)
.ToList();
}
movie.SetProviderId(MetadataProviders.Tmdb, movieData.id.ToString(_usCulture));

6
MediaBrowser.Providers/People/MovieDbPersonProvider.cs
View File

@@ -179,7 +179,11 @@ namespace MediaBrowser.Providers.People
item.Name = info.name;
item.HomePageUrl = info.homepage;
item.PlaceOfBirth = info.place_of_birth;
if (!string.IsNullOrWhiteSpace(info.place_of_birth))
{
item.ProductionLocations = new List<string> { info.place_of_birth };
}
item.Overview = info.biography;
DateTime date;

8
MediaBrowser.Providers/People/PersonMetadataService.cs
View File

@@ -15,14 +15,6 @@ namespace MediaBrowser.Providers.People
protected override void MergeData(MetadataResult<Person> source, MetadataResult<Person> target, List<MetadataFields> lockedFields, bool replaceData, bool mergeMetadataSettings)
{
ProviderUtils.MergeBaseItemData(source, target, lockedFields, replaceData, mergeMetadataSettings);
var sourceItem = source.Item;
var targetItem = target.Item;
if (replaceData || string.IsNullOrEmpty(targetItem.PlaceOfBirth))
{
targetItem.PlaceOfBirth = sourceItem.PlaceOfBirth;
}
}
public PersonMetadataService(IServerConfigurationManager serverConfigurationManager, ILogger logger, IProviderManager providerManager, IFileSystem fileSystem, IUserDataManager userDataManager, ILibraryManager libraryManager) : base(serverConfigurationManager, logger, providerManager, fileSystem, userDataManager, libraryManager)