diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-06-18 01:16:00 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-06-18 01:16:00 -0400 |
| commit | f8bfe596b4d5731aeb93a12abca3951d4a3de989 (patch) | |
| tree | 6b42d7c1fe553a7fde40e277f6646bc75653733f /MediaBrowser.Server.Implementations | |
| parent | 645640baca4a4da1f5d7f75c9e457f8d22465abf (diff) | |
channel fixes
Diffstat (limited to 'MediaBrowser.Server.Implementations')
3 files changed, 8 insertions, 8 deletions
diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs index aaebd1c34..e9df5e52c 100644 --- a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs +++ b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs @@ -542,8 +542,7 @@ namespace MediaBrowser.Server.Implementations.Channels var totalCount = results.Length; IEnumerable<Tuple<IChannel, ChannelItemInfo>> items = results - .SelectMany(i => i.Item2.Items.Select(m => new Tuple<IChannel, ChannelItemInfo>(i.Item1, m))) - .OrderBy(i => i.Item2.Name); + .SelectMany(i => i.Item2.Items.Select(m => new Tuple<IChannel, ChannelItemInfo>(i.Item1, m))); if (query.ContentTypes.Length > 0) { @@ -994,10 +993,9 @@ namespace MediaBrowser.Server.Implementations.Channels item.ProductionYear = info.ProductionYear; item.ProviderIds = info.ProviderIds; - if (info.DateCreated.HasValue) - { - item.DateCreated = info.DateCreated.Value; - } + item.DateCreated = info.DateCreated.HasValue ? + info.DateCreated.Value : + DateTime.UtcNow; } var channelItem = (IChannelItem)item; diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs index 4dad71465..c6a632fec 100644 --- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs +++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs @@ -1,5 +1,4 @@ -using MediaBrowser.Common.Configuration; -using MediaBrowser.Common.Extensions; +using MediaBrowser.Common.Extensions; using MediaBrowser.Common.IO; using MediaBrowser.Common.Progress; using MediaBrowser.Common.ScheduledTasks; diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj index 18c2d8582..201648de8 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -52,6 +52,9 @@ <SpecificVersion>False</SpecificVersion> <HintPath>..\packages\Mono.Nat.1.2.13.0\lib\net40\Mono.Nat.dll</HintPath> </Reference> + <Reference Include="Nowin"> + <HintPath>..\ThirdParty\Nowin\Nowin.dll</HintPath> + </Reference> <Reference Include="ServiceStack.Api.Swagger"> <HintPath>..\ThirdParty\ServiceStack\ServiceStack.Api.Swagger.dll</HintPath> </Reference> |