From 2d27b10d11552d160cb2b3c41c5e0e5bf60e7350 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 23 Feb 2014 00:52:30 -0500 Subject: added chromecast boilerplate --- .../FileOrganization/NameUtils.cs | 9 +++++---- MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs | 6 ++++++ 2 files changed, 11 insertions(+), 4 deletions(-) (limited to 'MediaBrowser.Server.Implementations') diff --git a/MediaBrowser.Server.Implementations/FileOrganization/NameUtils.cs b/MediaBrowser.Server.Implementations/FileOrganization/NameUtils.cs index 75e5d92c3..23d0363cb 100644 --- a/MediaBrowser.Server.Implementations/FileOrganization/NameUtils.cs +++ b/MediaBrowser.Server.Implementations/FileOrganization/NameUtils.cs @@ -1,4 +1,5 @@ -using MediaBrowser.Controller.Entities; +using MediaBrowser.Common.Extensions; +using MediaBrowser.Controller.Entities; using System; using System.Globalization; using System.Linq; @@ -58,7 +59,7 @@ namespace MediaBrowser.Server.Implementations.FileOrganization name = RemoveDiacritics(name); - name = " " + name.ToLower() + " "; + name = " " + name + " "; name = name.Replace(".", " ") .Replace("_", " ") @@ -68,8 +69,8 @@ namespace MediaBrowser.Server.Implementations.FileOrganization .Replace(")", " ") .Replace(",", " ") .Replace("-", " ") - .Replace(" a ", String.Empty) - .Replace(" the ", String.Empty) + .Replace(" a ", String.Empty, StringComparison.OrdinalIgnoreCase) + .Replace(" the ", String.Empty, StringComparison.OrdinalIgnoreCase) .Replace(" ", String.Empty); return name.Trim(); diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs index 22d683e1b..4e1bd860b 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs @@ -251,6 +251,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv if (user != null) { dto.UserData = _dtoService.GetUserItemDataDto(_userDataManager.GetUserData(user.Id, recording.GetUserDataKey())); + + dto.PlayAccess = recording.GetPlayAccess(user); } if (!string.IsNullOrEmpty(info.ProgramId)) @@ -321,6 +323,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv if (user != null) { dto.UserData = _dtoService.GetUserItemDataDto(_userDataManager.GetUserData(user.Id, info.GetUserDataKey())); + + dto.PlayAccess = info.GetPlayAccess(user); } var imageTag = GetImageTag(info); @@ -394,6 +398,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv if (user != null) { dto.UserData = _dtoService.GetUserItemDataDto(_userDataManager.GetUserData(user.Id, item.GetUserDataKey())); + + dto.PlayAccess = item.GetPlayAccess(user); } return dto; -- cgit v1.2.3