aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-05-03 00:20:04 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-05-03 00:20:04 -0400
commit6936336b82467d3d8ea53af89bd5abcf7cdea678 (patch)
treef11a0cd9443193d60260088ca2220e5fb46fcea0 /MediaBrowser.Server.Implementations
parent3228f50895d52afb97e985d8223ffc062a75c69a (diff)
add channels infrastructure
Diffstat (limited to 'MediaBrowser.Server.Implementations')
-rw-r--r--MediaBrowser.Server.Implementations/Channels/ChannelManager.cs247
-rw-r--r--MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs2
-rw-r--r--MediaBrowser.Server.Implementations/Localization/Server/server.json3
3 files changed, 214 insertions, 38 deletions
diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
index ae5bf7716..e028065c3 100644
--- a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
+++ b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
@@ -8,6 +8,7 @@ using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Channels;
using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Querying;
using System;
@@ -25,13 +26,14 @@ namespace MediaBrowser.Server.Implementations.Channels
private List<Channel> _channelEntities = new List<Channel>();
private readonly IUserManager _userManager;
+ private readonly IUserDataManager _userDataManager;
private readonly IDtoService _dtoService;
private readonly ILibraryManager _libraryManager;
private readonly ILogger _logger;
private readonly IServerConfigurationManager _config;
private readonly IFileSystem _fileSystem;
- public ChannelManager(IUserManager userManager, IDtoService dtoService, ILibraryManager libraryManager, ILogger logger, IServerConfigurationManager config, IFileSystem fileSystem)
+ public ChannelManager(IUserManager userManager, IDtoService dtoService, ILibraryManager libraryManager, ILogger logger, IServerConfigurationManager config, IFileSystem fileSystem, IUserDataManager userDataManager)
{
_userManager = userManager;
_dtoService = dtoService;
@@ -39,6 +41,7 @@ namespace MediaBrowser.Server.Implementations.Channels
_logger = logger;
_config = config;
_fileSystem = fileSystem;
+ _userDataManager = userDataManager;
}
public void AddParts(IEnumerable<IChannel> channels)
@@ -158,7 +161,9 @@ namespace MediaBrowser.Server.Implementations.Channels
isNew = true;
}
- item.HomePageUrl = channelInfo.HomePageUrl;
+ var info = channelInfo.GetChannelInfo();
+
+ item.HomePageUrl = info.HomePageUrl;
item.OriginalChannelName = channelInfo.Name;
if (string.IsNullOrEmpty(item.Name))
@@ -198,8 +203,7 @@ namespace MediaBrowser.Server.Implementations.Channels
var items = await GetChannelItems(channelProvider, user, query.CategoryId, cancellationToken)
.ConfigureAwait(false);
-
- return await GetReturnItems(items, user, query.StartIndex, query.Limit, cancellationToken).ConfigureAwait(false);
+ return await GetReturnItems(items, user, query, cancellationToken).ConfigureAwait(false);
}
private async Task<IEnumerable<ChannelItemInfo>> GetChannelItems(IChannel channel, User user, string categoryId, CancellationToken cancellationToken)
@@ -217,76 +221,247 @@ namespace MediaBrowser.Server.Implementations.Channels
return result.Items;
}
- private async Task<QueryResult<BaseItemDto>> GetReturnItems(IEnumerable<ChannelItemInfo> items, User user, int? startIndex, int? limit, CancellationToken cancellationToken)
+ private async Task<QueryResult<BaseItemDto>> GetReturnItems(IEnumerable<ChannelItemInfo> items, User user, ChannelItemQuery query, CancellationToken cancellationToken)
{
- if (startIndex.HasValue)
- {
- items = items.Skip(startIndex.Value);
- }
- if (limit.HasValue)
- {
- items = items.Take(limit.Value);
- }
-
// Get everything
var fields = Enum.GetNames(typeof(ItemFields))
.Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true))
.ToList();
- var tasks = items.Select(GetChannelItemEntity);
+ var tasks = items.Select(i => GetChannelItemEntity(i, cancellationToken));
+
+ IEnumerable<BaseItem> entities = await Task.WhenAll(tasks).ConfigureAwait(false);
+
+ entities = ApplyFilters(entities, query.Filters, user);
- var returnItems = await Task.WhenAll(tasks).ConfigureAwait(false);
- returnItems = new BaseItem[] {};
- var returnItemArray = returnItems.Select(i => _dtoService.GetBaseItemDto(i, fields, user))
+ entities = _libraryManager.Sort(entities, user, query.SortBy, query.SortOrder ?? SortOrder.Ascending);
+
+ var all = entities.ToList();
+ var totalCount = all.Count;
+
+ if (query.StartIndex.HasValue)
+ {
+ all = all.Skip(query.StartIndex.Value).ToList();
+ }
+ if (query.Limit.HasValue)
+ {
+ all = all.Take(query.Limit.Value).ToList();
+ }
+
+ await RefreshIfNeeded(all, cancellationToken).ConfigureAwait(false);
+
+ var returnItemArray = all.Select(i => _dtoService.GetBaseItemDto(i, fields, user))
.ToArray();
return new QueryResult<BaseItemDto>
{
Items = returnItemArray,
- TotalRecordCount = returnItems.Length
+ TotalRecordCount = totalCount
};
}
- private async Task<BaseItem> GetChannelItemEntity(ChannelItemInfo info)
+ private string GetIdToHash(string externalId)
{
- BaseItem item;
+ // Increment this as needed to force new downloads
+ return externalId + "3";
+ }
+ private async Task<BaseItem> GetChannelItemEntity(ChannelItemInfo info, CancellationToken cancellationToken)
+ {
+ BaseItem item;
Guid id;
+ var isNew = false;
if (info.Type == ChannelItemType.Category)
{
- id = info.Id.GetMBId(typeof(ChannelCategoryItem));
- item = new ChannelCategoryItem();
+ id = GetIdToHash(info.Id).GetMBId(typeof(ChannelCategoryItem));
+
+ item = _libraryManager.GetItemById(id) as ChannelCategoryItem;
+
+ if (item == null)
+ {
+ isNew = true;
+ item = new ChannelCategoryItem();
+ }
}
else if (info.MediaType == ChannelMediaType.Audio)
{
- id = info.Id.GetMBId(typeof(ChannelCategoryItem));
- item = new ChannelAudioItem();
+ id = GetIdToHash(info.Id).GetMBId(typeof(ChannelCategoryItem));
+
+ item = _libraryManager.GetItemById(id) as ChannelAudioItem;
+
+ if (item == null)
+ {
+ isNew = true;
+ item = new ChannelAudioItem();
+ }
}
else
{
- id = info.Id.GetMBId(typeof(ChannelVideoItem));
- item = new ChannelVideoItem();
+ id = GetIdToHash(info.Id).GetMBId(typeof(ChannelVideoItem));
+
+ item = _libraryManager.GetItemById(id) as ChannelVideoItem;
+
+ if (item == null)
+ {
+ isNew = true;
+ item = new ChannelVideoItem();
+ }
}
item.Id = id;
- item.Name = info.Name;
- item.Genres = info.Genres;
- item.CommunityRating = info.CommunityRating;
- item.OfficialRating = info.OfficialRating;
- item.Overview = info.Overview;
- item.People = info.People;
- item.PremiereDate = info.PremiereDate;
- item.ProductionYear = info.ProductionYear;
item.RunTimeTicks = info.RunTimeTicks;
- item.ProviderIds = info.ProviderIds;
+
+ var mediaSource = info.MediaSources.FirstOrDefault();
+
+ item.Path = mediaSource == null ? null : mediaSource.Path;
+
+ if (isNew)
+ {
+ item.Name = info.Name;
+ item.Genres = info.Genres;
+ item.Studios = info.Studios;
+ item.CommunityRating = info.CommunityRating;
+ item.OfficialRating = info.OfficialRating;
+ item.Overview = info.Overview;
+ item.People = info.People;
+ item.PremiereDate = info.PremiereDate;
+ item.ProductionYear = info.ProductionYear;
+ item.ProviderIds = info.ProviderIds;
+
+ if (info.DateCreated.HasValue)
+ {
+ item.DateCreated = info.DateCreated.Value;
+ }
+ }
+
+ var channelItem = (IChannelItem)item;
+
+ channelItem.OriginalImageUrl = info.ImageUrl;
+ channelItem.ExternalId = info.Id;
+ channelItem.ChannelItemType = info.Type;
+
+ var channelMediaItem = item as IChannelMediaItem;
+
+ if (channelMediaItem != null)
+ {
+ channelMediaItem.IsInfiniteStream = info.IsInfiniteStream;
+ channelMediaItem.ContentType = info.ContentType;
+ }
+
+ if (isNew)
+ {
+ await _libraryManager.CreateItem(item, cancellationToken).ConfigureAwait(false);
+ _libraryManager.RegisterItem(item);
+ }
return item;
}
+ private async Task RefreshIfNeeded(IEnumerable<BaseItem> programs, CancellationToken cancellationToken)
+ {
+ foreach (var program in programs)
+ {
+ await RefreshIfNeeded(program, cancellationToken).ConfigureAwait(false);
+ }
+ }
+
+ private async Task RefreshIfNeeded(BaseItem program, CancellationToken cancellationToken)
+ {
+ //if (_refreshedPrograms.ContainsKey(program.Id))
+ {
+ //return;
+ }
+
+ await program.RefreshMetadata(cancellationToken).ConfigureAwait(false);
+
+ //_refreshedPrograms.TryAdd(program.Id, true);
+ }
+
internal IChannel GetChannelProvider(Channel channel)
{
return _channels.First(i => string.Equals(i.Name, channel.OriginalChannelName, StringComparison.OrdinalIgnoreCase));
}
+
+ private IEnumerable<BaseItem> ApplyFilters(IEnumerable<BaseItem> items, IEnumerable<ItemFilter> filters, User user)
+ {
+ foreach (var filter in filters.OrderByDescending(f => (int)f))
+ {
+ items = ApplyFilter(items, filter, user);
+ }
+
+ return items;
+ }
+
+ private IEnumerable<BaseItem> ApplyFilter(IEnumerable<BaseItem> items, ItemFilter filter, User user)
+ {
+ // Avoid implicitly captured closure
+ var currentUser = user;
+
+ switch (filter)
+ {
+ case ItemFilter.IsFavoriteOrLikes:
+ return items.Where(item =>
+ {
+ var userdata = _userDataManager.GetUserData(user.Id, item.GetUserDataKey());
+
+ if (userdata == null)
+ {
+ return false;
+ }
+
+ var likes = userdata.Likes ?? false;
+ var favorite = userdata.IsFavorite;
+
+ return likes || favorite;
+ });
+
+ case ItemFilter.Likes:
+ return items.Where(item =>
+ {
+ var userdata = _userDataManager.GetUserData(user.Id, item.GetUserDataKey());
+
+ return userdata != null && userdata.Likes.HasValue && userdata.Likes.Value;
+ });
+
+ case ItemFilter.Dislikes:
+ return items.Where(item =>
+ {
+ var userdata = _userDataManager.GetUserData(user.Id, item.GetUserDataKey());
+
+ return userdata != null && userdata.Likes.HasValue && !userdata.Likes.Value;
+ });
+
+ case ItemFilter.IsFavorite:
+ return items.Where(item =>
+ {
+ var userdata = _userDataManager.GetUserData(user.Id, item.GetUserDataKey());
+
+ return userdata != null && userdata.IsFavorite;
+ });
+
+ case ItemFilter.IsResumable:
+ return items.Where(item =>
+ {
+ var userdata = _userDataManager.GetUserData(user.Id, item.GetUserDataKey());
+
+ return userdata != null && userdata.PlaybackPositionTicks > 0;
+ });
+
+ case ItemFilter.IsPlayed:
+ return items.Where(item => item.IsPlayed(currentUser));
+
+ case ItemFilter.IsUnplayed:
+ return items.Where(item => item.IsUnplayed(currentUser));
+
+ case ItemFilter.IsFolder:
+ return items.Where(item => item.IsFolder);
+
+ case ItemFilter.IsNotFolder:
+ return items.Where(item => !item.IsFolder);
+ }
+
+ return items;
+ }
}
}
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index b828dc0de..11d010ca1 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -228,7 +228,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
return;
}
- await program.RefreshMetadata(CancellationToken.None).ConfigureAwait(false);
+ await program.RefreshMetadata(cancellationToken).ConfigureAwait(false);
_refreshedPrograms.TryAdd(program.Id, true);
}
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index c8265490f..8e2fa18b9 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -76,6 +76,7 @@
"LabelMaxParentalRating": "Maximum allowed parental rating:",
"MaxParentalRatingHelp": "Content with a higher rating will be hidden from this user.",
"LibraryAccessHelp": "Select the media folders to share with this user. Administrators will be able to edit all folders using the metadata manager.",
+ "ChannelAccessHelp": "Select the channels to share with this user. Administrators will be able to edit all channels using the metadata manager.",
"ButtonDeleteImage": "Delete Image",
"LabelSelectUsers": "Select users:",
"ButtonUpload": "Upload",
@@ -267,7 +268,7 @@
"LabelAutomaticUpdatesTmdbHelp": "If enabled, new images will be downloaded automatically as they're added to TheMovieDB.org. Existing images will not be replaced.",
"LabelAutomaticUpdatesTvdbHelp": "If enabled, new images will be downloaded automatically as they're added to TheTVDB.com. Existing images will not be replaced.",
"ExtractChapterImagesHelp": "Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs as a nightly scheduled task at 4am, although this is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.",
- "LabelMetadataDownloadLanguage": "Preferred language:",
+ "LabelMetadataDownloadLanguage": "Preferred download language:",
"ButtonAutoScroll": "Auto-scroll",
"LabelImageSavingConvention": "Image saving convention:",
"LabelImageSavingConventionHelp": "Media Browser recognizes images from most major media applications. Choosing your downloading convention is useful if you also use other products.",