alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-28 11:28:27 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

update recording screens

Browse Source
This commit is contained in:
Luke Pulverenti
2016-09-21 13:07:18 -04:00
parent 61ee765de9
commit d94598a75e
6 changed files with 56 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
View File

@@ -843,6 +843,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
if (recordingEndDate <= DateTime.UtcNow)
{
_logger.Warn("Recording timer fired for timer {0}, Id: {1}, but the program has already ended.", timer.Name, timer.Id);
_timerProvider.Delete(timer);
return;
}
@@ -1273,6 +1274,15 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
writer.WriteElementString("rating", timer.CommunityRating.Value.ToString(CultureInfo.InvariantCulture));
}
if (timer.IsSports)
{
AddGenre(timer.Genres, "Sports");
}
if (timer.IsKids)
{
AddGenre(timer.Genres, "Kids");
}
foreach (var genre in timer.Genres)
{
writer.WriteElementString("genre", genre);
@@ -1294,6 +1304,14 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
}
}
private void AddGenre(List<string> genres, string genre)
{
if (!genres.Contains(genre, StringComparer.OrdinalIgnoreCase))
{
genres.Add(genre);
}
}
private ProgramInfo GetProgramInfoFromCache(string channelId, string programId)
{
var epgData = GetEpgDataForChannel(channelId);

24
MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
View File

@@ -339,13 +339,18 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
channelNumber = channelNumber.TrimStart('0');
_logger.Debug("Found channel: " + channelNumber + " in Schedules Direct");
if (root.stations != null)
var schChannel = (root.stations ?? new List<ScheduleDirect.Station>()).FirstOrDefault(item => string.Equals(item.stationID, map.stationID, StringComparison.OrdinalIgnoreCase));
if (schChannel != null)
{
var schChannel = root.stations.FirstOrDefault(item => string.Equals(item.stationID, map.stationID, StringComparison.OrdinalIgnoreCase));
if (schChannel != null)
AddToChannelPairCache(listingsId, channelNumber, schChannel);
}
else
{
AddToChannelPairCache(listingsId, channelNumber, new ScheduleDirect.Station
{
AddToChannelPairCache(listingsId, channelNumber, schChannel);
}
stationID = map.stationID
});
}
}
_logger.Info("Added " + GetChannelPairCacheCount(listingsId) + " channels to the dictionary");
@@ -361,8 +366,11 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
channel.ImageUrl = station.logo.URL;
channel.HasImage = true;
}
string channelName = station.name;
channel.Name = channelName;
if (!string.IsNullOrWhiteSpace(station.name))
{
channel.Name = station.name;
}
}
else
{
@@ -993,7 +1001,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
var name = channelNumber;
var station = GetStation(listingsId, channelNumber, null);
if (station != null)
if (station != null && !string.IsNullOrWhiteSpace(station.name))
{
name = station.name;
}