mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 11:34:57 +02:00
update detail page
This commit is contained in:
parent
b7ca126410
commit
51f69bcb31
3 changed files with 9 additions and 10 deletions
|
@ -615,11 +615,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
|
||||||
private ProgramInfo GetProgramInfoFromCache(string channelId, string programId)
|
private ProgramInfo GetProgramInfoFromCache(string channelId, string programId)
|
||||||
{
|
{
|
||||||
var epgData = GetEpgDataForChannel(channelId);
|
var epgData = GetEpgDataForChannel(channelId);
|
||||||
if (epgData.Any())
|
return epgData.FirstOrDefault(p => string.Equals(p.Id, programId, StringComparison.OrdinalIgnoreCase));
|
||||||
{
|
|
||||||
return epgData.FirstOrDefault(p => p.Id == programId);
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private string RecordingPath
|
private string RecordingPath
|
||||||
|
@ -670,9 +666,9 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
|
||||||
|
|
||||||
allPrograms = GetProgramsForSeries(seriesTimer, allPrograms);
|
allPrograms = GetProgramsForSeries(seriesTimer, allPrograms);
|
||||||
|
|
||||||
var recordingShowIds = currentRecordings.Select(i => i.ShowId).ToList();
|
var recordingShowIds = currentRecordings.Select(i => i.ProgramId).Where(i => !string.IsNullOrWhiteSpace(i)).ToList();
|
||||||
|
|
||||||
allPrograms = allPrograms.Where(epg => !recordingShowIds.Contains(epg.ShowId, StringComparer.OrdinalIgnoreCase));
|
allPrograms = allPrograms.Where(i => !recordingShowIds.Contains(i.Id, StringComparer.OrdinalIgnoreCase));
|
||||||
|
|
||||||
return allPrograms.Select(i => RecordingHelper.CreateTimer(i, seriesTimer));
|
return allPrograms.Select(i => RecordingHelper.CreateTimer(i, seriesTimer));
|
||||||
}
|
}
|
||||||
|
|
|
@ -78,6 +78,12 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings.Emby
|
||||||
{
|
{
|
||||||
// They don't have dashes so try to normalize
|
// They don't have dashes so try to normalize
|
||||||
program.OfficialRating = info.rating.Replace("TV", "TV-").Replace("--", "-");
|
program.OfficialRating = info.rating.Replace("TV", "TV-").Replace("--", "-");
|
||||||
|
|
||||||
|
var invalid = new[] { "N/A", "Approved", "Not Rated" };
|
||||||
|
if (invalid.Contains(program.OfficialRating, StringComparer.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
program.OfficialRating = null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!string.IsNullOrWhiteSpace(info.year))
|
if (!string.IsNullOrWhiteSpace(info.year))
|
||||||
|
|
|
@ -742,9 +742,6 @@
|
||||||
<Content Include="dashboard-ui\reports.html">
|
<Content Include="dashboard-ui\reports.html">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="dashboard-ui\livetvchannel.html">
|
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
<Content Include="dashboard-ui\livetvnewrecording.html">
|
<Content Include="dashboard-ui\livetvnewrecording.html">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
|
|
Loading…
Reference in a new issue