Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

3.0.5387 Beta

Browse Source
This commit is contained in:
Luke Pulverenti 2014-10-01 21:36:58 -04:00
parent 8e41325dca
commit 0bc84b7d41
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs
View File

@ -79,7 +79,7 @@ namespace MediaBrowser.Server.Implementations.Intros
{ {
if (i is Movie) if (i is Movie)
{ {
return true; return !IsDuplicate(item, i);
} }
} }
return false; return false;
@ -162,7 +162,7 @@ namespace MediaBrowser.Server.Implementations.Intros
{ {
return false; return false;
} }
return true; return !IsDuplicate(item, i.Item);
}) })
.OrderByDescending(i => i.Score) .OrderByDescending(i => i.Score)
.ThenBy(i => Guid.NewGuid()) .ThenBy(i => Guid.NewGuid())
@ -172,6 +172,23 @@ namespace MediaBrowser.Server.Implementations.Intros
.Concat(customIntros.Take(1)); .Concat(customIntros.Take(1));
} }
private bool IsDuplicate(BaseItem playingContent, BaseItem test)
{
var id = playingContent.GetProviderId(MetadataProviders.Imdb);
if (!string.IsNullOrWhiteSpace(id) && string.Equals(id, test.GetProviderId(MetadataProviders.Imdb), StringComparison.OrdinalIgnoreCase))
{
return true;
}
id = playingContent.GetProviderId(MetadataProviders.Tmdb);
if (!string.IsNullOrWhiteSpace(id) && string.Equals(id, test.GetProviderId(MetadataProviders.Tmdb), StringComparison.OrdinalIgnoreCase))
{
return true;
}
return false;
}
private CinemaModeConfiguration GetOptions() private CinemaModeConfiguration GetOptions()
{ {
return _serverConfig.GetConfiguration<CinemaModeConfiguration>("cinemamode"); return _serverConfig.GetConfiguration<CinemaModeConfiguration>("cinemamode");

4
MediaBrowser.Server.Implementations/Session/SessionManager.cs
View File

@ -1417,6 +1417,10 @@ namespace MediaBrowser.Server.Implementations.Session
{ {
_jsonSerializer.SerializeToFile(capabilities, path); _jsonSerializer.SerializeToFile(capabilities, path);
} }
catch (Exception ex)
{
_logger.ErrorException("Error saving to {0}", ex, path);
}
finally finally
{ {
_capabilitiesLock.Release(); _capabilitiesLock.Release();