lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev

Browse Source
This commit is contained in:
Luke Pulverenti 2015-10-29 18:46:09 -04:00
commit f66c6f2c75
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
View File

@ -739,6 +739,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv
recording.ExternalId = info.Id; recording.ExternalId = info.Id;
var dataChanged = false;
recording.Audio = info.Audio; recording.Audio = info.Audio;
recording.EndDate = info.EndDate; recording.EndDate = info.EndDate;
recording.EpisodeTitle = info.EpisodeTitle; recording.EpisodeTitle = info.EpisodeTitle;
@ -749,11 +751,16 @@ namespace MediaBrowser.Server.Implementations.LiveTv
recording.IsNews = info.IsNews; recording.IsNews = info.IsNews;
recording.IsPremiere = info.IsPremiere; recording.IsPremiere = info.IsPremiere;
recording.IsRepeat = info.IsRepeat; recording.IsRepeat = info.IsRepeat;
recording.IsSeries = info.IsSeries;
recording.IsSports = info.IsSports; recording.IsSports = info.IsSports;
recording.SeriesTimerId = info.SeriesTimerId; recording.SeriesTimerId = info.SeriesTimerId;
recording.StartDate = info.StartDate; recording.StartDate = info.StartDate;
if (!dataChanged)
{
dataChanged = recording.IsSeries != info.IsSeries;
}
recording.IsSeries = info.IsSeries;
if (!string.IsNullOrWhiteSpace(info.ImagePath)) if (!string.IsNullOrWhiteSpace(info.ImagePath))
{ {
item.SetImagePath(ImageType.Primary, info.ImagePath); item.SetImagePath(ImageType.Primary, info.ImagePath);
@ -769,11 +776,12 @@ namespace MediaBrowser.Server.Implementations.LiveTv
recording.ServiceName = serviceName; recording.ServiceName = serviceName;
var pathChanged = false;
if (!string.IsNullOrEmpty(info.Path)) if (!string.IsNullOrEmpty(info.Path))
{ {
pathChanged = !string.Equals(item.Path, info.Path); if (!dataChanged)
{
dataChanged = !string.Equals(item.Path, info.Path);
}
var fileInfo = _fileSystem.GetFileInfo(info.Path); var fileInfo = _fileSystem.GetFileInfo(info.Path);
recording.DateCreated = _fileSystem.GetCreationTimeUtc(fileInfo); recording.DateCreated = _fileSystem.GetCreationTimeUtc(fileInfo);
@ -782,7 +790,10 @@ namespace MediaBrowser.Server.Implementations.LiveTv
} }
else if (!string.IsNullOrEmpty(info.Url)) else if (!string.IsNullOrEmpty(info.Url))
{ {
pathChanged = !string.Equals(item.Path, info.Url); if (!dataChanged)
{
dataChanged = !string.Equals(item.Path, info.Url);
}
item.Path = info.Url; item.Path = info.Url;
} }
@ -792,7 +803,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
{ {
await _libraryManager.CreateItem(item, cancellationToken).ConfigureAwait(false); await _libraryManager.CreateItem(item, cancellationToken).ConfigureAwait(false);
} }
else if (pathChanged || info.DateLastUpdated > recording.DateLastSaved || statusChanged) else if (dataChanged || info.DateLastUpdated > recording.DateLastSaved || statusChanged)
{ {
metadataRefreshMode = MetadataRefreshMode.FullRefresh; metadataRefreshMode = MetadataRefreshMode.FullRefresh;
await _libraryManager.UpdateItem(item, ItemUpdateType.MetadataImport, cancellationToken).ConfigureAwait(false); await _libraryManager.UpdateItem(item, ItemUpdateType.MetadataImport, cancellationToken).ConfigureAwait(false);