mirror of https://github.com/jellyfin/jellyfin.git
normalize tv recording objects
This commit is contained in:
parent
a93045c01a
commit
25736b259a
|
@ -428,7 +428,7 @@ namespace MediaBrowser.Api
|
||||||
var series = item as Series;
|
var series = item as Series;
|
||||||
if (series != null)
|
if (series != null)
|
||||||
{
|
{
|
||||||
series.Status = request.Status;
|
series.Status = request.SeriesStatus;
|
||||||
series.AirDays = request.AirDays;
|
series.AirDays = request.AirDays;
|
||||||
series.AirTime = request.AirTime;
|
series.AirTime = request.AirTime;
|
||||||
|
|
||||||
|
|
|
@ -78,7 +78,7 @@ namespace MediaBrowser.Api.LiveTv
|
||||||
|
|
||||||
[Route("/LiveTv/Recordings", "GET", Summary = "Gets live tv recordings")]
|
[Route("/LiveTv/Recordings", "GET", Summary = "Gets live tv recordings")]
|
||||||
[Authenticated]
|
[Authenticated]
|
||||||
public class GetRecordings : IReturn<QueryResult<RecordingInfoDto>>
|
public class GetRecordings : IReturn<QueryResult<BaseItemDto>>
|
||||||
{
|
{
|
||||||
[ApiMember(Name = "ChannelId", Description = "Optional filter by channel id.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
|
[ApiMember(Name = "ChannelId", Description = "Optional filter by channel id.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
|
||||||
public string ChannelId { get; set; }
|
public string ChannelId { get; set; }
|
||||||
|
@ -107,7 +107,7 @@ namespace MediaBrowser.Api.LiveTv
|
||||||
|
|
||||||
[Route("/LiveTv/Recordings/Groups", "GET", Summary = "Gets live tv recording groups")]
|
[Route("/LiveTv/Recordings/Groups", "GET", Summary = "Gets live tv recording groups")]
|
||||||
[Authenticated]
|
[Authenticated]
|
||||||
public class GetRecordingGroups : IReturn<QueryResult<RecordingGroupDto>>
|
public class GetRecordingGroups : IReturn<QueryResult<BaseItemDto>>
|
||||||
{
|
{
|
||||||
[ApiMember(Name = "UserId", Description = "Optional filter by user and attach user data.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
|
[ApiMember(Name = "UserId", Description = "Optional filter by user and attach user data.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
|
||||||
public string UserId { get; set; }
|
public string UserId { get; set; }
|
||||||
|
@ -115,7 +115,7 @@ namespace MediaBrowser.Api.LiveTv
|
||||||
|
|
||||||
[Route("/LiveTv/Recordings/{Id}", "GET", Summary = "Gets a live tv recording")]
|
[Route("/LiveTv/Recordings/{Id}", "GET", Summary = "Gets a live tv recording")]
|
||||||
[Authenticated]
|
[Authenticated]
|
||||||
public class GetRecording : IReturn<RecordingInfoDto>
|
public class GetRecording : IReturn<BaseItemDto>
|
||||||
{
|
{
|
||||||
[ApiMember(Name = "Id", Description = "Recording Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
|
[ApiMember(Name = "Id", Description = "Recording Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
|
||||||
public string Id { get; set; }
|
public string Id { get; set; }
|
||||||
|
@ -310,7 +310,7 @@ namespace MediaBrowser.Api.LiveTv
|
||||||
|
|
||||||
[Route("/LiveTv/Recordings/Groups/{Id}", "GET", Summary = "Gets a recording group")]
|
[Route("/LiveTv/Recordings/Groups/{Id}", "GET", Summary = "Gets a recording group")]
|
||||||
[Authenticated]
|
[Authenticated]
|
||||||
public class GetRecordingGroup : IReturn<RecordingGroupDto>
|
public class GetRecordingGroup : IReturn<BaseItemDto>
|
||||||
{
|
{
|
||||||
[ApiMember(Name = "Id", Description = "Recording group Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
|
[ApiMember(Name = "Id", Description = "Recording group Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
|
||||||
public string Id { get; set; }
|
public string Id { get; set; }
|
||||||
|
|
|
@ -121,6 +121,15 @@ namespace MediaBrowser.Controller.Entities.Audio
|
||||||
.Select(i => i.GetLookupInfo())
|
.Select(i => i.GetLookupInfo())
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
|
var album = id.SongInfos
|
||||||
|
.Select(i => i.Album)
|
||||||
|
.FirstOrDefault(i => !string.IsNullOrWhiteSpace(i));
|
||||||
|
|
||||||
|
if (!string.IsNullOrWhiteSpace(album))
|
||||||
|
{
|
||||||
|
id.Name = album;
|
||||||
|
}
|
||||||
|
|
||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -79,7 +79,7 @@ namespace MediaBrowser.Controller.LiveTv
|
||||||
/// <param name="cancellationToken">The cancellation token.</param>
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
/// <param name="user">The user.</param>
|
/// <param name="user">The user.</param>
|
||||||
/// <returns>Task{RecordingInfoDto}.</returns>
|
/// <returns>Task{RecordingInfoDto}.</returns>
|
||||||
Task<RecordingInfoDto> GetRecording(string id, DtoOptions options, CancellationToken cancellationToken, User user = null);
|
Task<BaseItemDto> GetRecording(string id, DtoOptions options, CancellationToken cancellationToken, User user = null);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the channel.
|
/// Gets the channel.
|
||||||
|
@ -113,7 +113,7 @@ namespace MediaBrowser.Controller.LiveTv
|
||||||
/// <param name="options">The options.</param>
|
/// <param name="options">The options.</param>
|
||||||
/// <param name="cancellationToken">The cancellation token.</param>
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
/// <returns>QueryResult{RecordingInfoDto}.</returns>
|
/// <returns>QueryResult{RecordingInfoDto}.</returns>
|
||||||
Task<QueryResult<RecordingInfoDto>> GetRecordings(RecordingQuery query, DtoOptions options, CancellationToken cancellationToken);
|
Task<QueryResult<BaseItemDto>> GetRecordings(RecordingQuery query, DtoOptions options, CancellationToken cancellationToken);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the timers.
|
/// Gets the timers.
|
||||||
|
@ -218,7 +218,7 @@ namespace MediaBrowser.Controller.LiveTv
|
||||||
/// <param name="query">The query.</param>
|
/// <param name="query">The query.</param>
|
||||||
/// <param name="cancellationToken">The cancellation token.</param>
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
/// <returns>Task{QueryResult{RecordingGroupDto}}.</returns>
|
/// <returns>Task{QueryResult{RecordingGroupDto}}.</returns>
|
||||||
Task<QueryResult<RecordingGroupDto>> GetRecordingGroups(RecordingGroupQuery query, CancellationToken cancellationToken);
|
Task<QueryResult<BaseItemDto>> GetRecordingGroups(RecordingGroupQuery query, CancellationToken cancellationToken);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Closes the live stream.
|
/// Closes the live stream.
|
||||||
|
@ -321,5 +321,13 @@ namespace MediaBrowser.Controller.LiveTv
|
||||||
/// <param name="cancellationToken">The cancellation token.</param>
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
/// <returns>Task<IEnumerable<MediaSourceInfo>>.</returns>
|
/// <returns>Task<IEnumerable<MediaSourceInfo>>.</returns>
|
||||||
Task<IEnumerable<MediaSourceInfo>> GetChannelMediaSources(string id, CancellationToken cancellationToken);
|
Task<IEnumerable<MediaSourceInfo>> GetChannelMediaSources(string id, CancellationToken cancellationToken);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Adds the information to recording dto.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="item">The item.</param>
|
||||||
|
/// <param name="dto">The dto.</param>
|
||||||
|
/// <param name="user">The user.</param>
|
||||||
|
void AddInfoToRecordingDto(BaseItem item, BaseItemDto dto, User user = null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -58,8 +58,6 @@
|
||||||
<Compile Include="Parsers\SeasonXmlParser.cs" />
|
<Compile Include="Parsers\SeasonXmlParser.cs" />
|
||||||
<Compile Include="Parsers\SeriesXmlParser.cs" />
|
<Compile Include="Parsers\SeriesXmlParser.cs" />
|
||||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||||
<Compile Include="Providers\AlbumXmlProvider.cs" />
|
|
||||||
<Compile Include="Providers\ArtistXmlProvider.cs" />
|
|
||||||
<Compile Include="Providers\BoxSetXmlProvider.cs" />
|
<Compile Include="Providers\BoxSetXmlProvider.cs" />
|
||||||
<Compile Include="Providers\EpisodeXmlProvider.cs" />
|
<Compile Include="Providers\EpisodeXmlProvider.cs" />
|
||||||
<Compile Include="Providers\FolderXmlProvider.cs" />
|
<Compile Include="Providers\FolderXmlProvider.cs" />
|
||||||
|
|
|
@ -1,30 +0,0 @@
|
||||||
using System.IO;
|
|
||||||
using System.Threading;
|
|
||||||
using MediaBrowser.Common.IO;
|
|
||||||
using MediaBrowser.Controller.Entities.Audio;
|
|
||||||
using MediaBrowser.Controller.Providers;
|
|
||||||
using MediaBrowser.Model.Logging;
|
|
||||||
|
|
||||||
namespace MediaBrowser.LocalMetadata.Providers
|
|
||||||
{
|
|
||||||
public class AlbumXmlProvider : BaseXmlProvider<MusicAlbum>
|
|
||||||
{
|
|
||||||
private readonly ILogger _logger;
|
|
||||||
|
|
||||||
public AlbumXmlProvider(IFileSystem fileSystem, ILogger logger)
|
|
||||||
: base(fileSystem)
|
|
||||||
{
|
|
||||||
_logger = logger;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void Fetch(LocalMetadataResult<MusicAlbum> result, string path, CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
new BaseItemXmlParser<MusicAlbum>(_logger).Fetch(result.Item, path, cancellationToken);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override FileSystemInfo GetXmlFile(ItemInfo info, IDirectoryService directoryService)
|
|
||||||
{
|
|
||||||
return directoryService.GetFile(Path.Combine(info.Path, "album.xml"));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,30 +0,0 @@
|
||||||
using System.IO;
|
|
||||||
using System.Threading;
|
|
||||||
using MediaBrowser.Common.IO;
|
|
||||||
using MediaBrowser.Controller.Entities.Audio;
|
|
||||||
using MediaBrowser.Controller.Providers;
|
|
||||||
using MediaBrowser.Model.Logging;
|
|
||||||
|
|
||||||
namespace MediaBrowser.LocalMetadata.Providers
|
|
||||||
{
|
|
||||||
class ArtistXmlProvider : BaseXmlProvider<MusicArtist>
|
|
||||||
{
|
|
||||||
private readonly ILogger _logger;
|
|
||||||
|
|
||||||
public ArtistXmlProvider(IFileSystem fileSystem, ILogger logger)
|
|
||||||
: base(fileSystem)
|
|
||||||
{
|
|
||||||
_logger = logger;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void Fetch(LocalMetadataResult<MusicArtist> result, string path, CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
new BaseItemXmlParser<MusicArtist>(_logger).Fetch(result.Item, path, cancellationToken);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override FileSystemInfo GetXmlFile(ItemInfo info, IDirectoryService directoryService)
|
|
||||||
{
|
|
||||||
return directoryService.GetFile(Path.Combine(info.Path, "artist.xml"));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -11,7 +11,7 @@ using System.Threading;
|
||||||
|
|
||||||
namespace MediaBrowser.LocalMetadata.Savers
|
namespace MediaBrowser.LocalMetadata.Savers
|
||||||
{
|
{
|
||||||
public class SeasonXmlSaver : IMetadataFileSaver
|
public class SeasonXmlSaver
|
||||||
{
|
{
|
||||||
public string Name
|
public string Name
|
||||||
{
|
{
|
||||||
|
|
|
@ -752,15 +752,9 @@
|
||||||
<Compile Include="..\MediaBrowser.Model\LiveTv\RecommendedProgramQuery.cs">
|
<Compile Include="..\MediaBrowser.Model\LiveTv\RecommendedProgramQuery.cs">
|
||||||
<Link>LiveTv\RecommendedProgramQuery.cs</Link>
|
<Link>LiveTv\RecommendedProgramQuery.cs</Link>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="..\MediaBrowser.Model\LiveTv\RecordingGroupDto.cs">
|
|
||||||
<Link>LiveTv\RecordingGroupDto.cs</Link>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="..\MediaBrowser.Model\LiveTv\RecordingGroupQuery.cs">
|
<Compile Include="..\MediaBrowser.Model\LiveTv\RecordingGroupQuery.cs">
|
||||||
<Link>LiveTv\RecordingGroupQuery.cs</Link>
|
<Link>LiveTv\RecordingGroupQuery.cs</Link>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="..\MediaBrowser.Model\LiveTv\RecordingInfoDto.cs">
|
|
||||||
<Link>LiveTv\RecordingInfoDto.cs</Link>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="..\MediaBrowser.Model\LiveTv\RecordingQuery.cs">
|
<Compile Include="..\MediaBrowser.Model\LiveTv\RecordingQuery.cs">
|
||||||
<Link>LiveTv\RecordingQuery.cs</Link>
|
<Link>LiveTv\RecordingQuery.cs</Link>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
|
|
@ -708,15 +708,9 @@
|
||||||
<Compile Include="..\MediaBrowser.Model\LiveTv\RecommendedProgramQuery.cs">
|
<Compile Include="..\MediaBrowser.Model\LiveTv\RecommendedProgramQuery.cs">
|
||||||
<Link>LiveTv\RecommendedProgramQuery.cs</Link>
|
<Link>LiveTv\RecommendedProgramQuery.cs</Link>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="..\MediaBrowser.Model\LiveTv\RecordingGroupDto.cs">
|
|
||||||
<Link>LiveTv\RecordingGroupDto.cs</Link>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="..\MediaBrowser.Model\LiveTv\RecordingGroupQuery.cs">
|
<Compile Include="..\MediaBrowser.Model\LiveTv\RecordingGroupQuery.cs">
|
||||||
<Link>LiveTv\RecordingGroupQuery.cs</Link>
|
<Link>LiveTv\RecordingGroupQuery.cs</Link>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="..\MediaBrowser.Model\LiveTv\RecordingInfoDto.cs">
|
|
||||||
<Link>LiveTv\RecordingInfoDto.cs</Link>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="..\MediaBrowser.Model\LiveTv\RecordingQuery.cs">
|
<Compile Include="..\MediaBrowser.Model\LiveTv\RecordingQuery.cs">
|
||||||
<Link>LiveTv\RecordingQuery.cs</Link>
|
<Link>LiveTv\RecordingQuery.cs</Link>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
|
|
@ -929,14 +929,6 @@ namespace MediaBrowser.Model.ApiClient
|
||||||
/// <returns>System.String.</returns>
|
/// <returns>System.String.</returns>
|
||||||
string GetImageUrl(ChannelInfoDto item, ImageOptions options);
|
string GetImageUrl(ChannelInfoDto item, ImageOptions options);
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets the image URL.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="item">The item.</param>
|
|
||||||
/// <param name="options">The options.</param>
|
|
||||||
/// <returns>System.String.</returns>
|
|
||||||
string GetImageUrl(RecordingInfoDto item, ImageOptions options);
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the image URL.
|
/// Gets the image URL.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -1077,7 +1069,7 @@ namespace MediaBrowser.Model.ApiClient
|
||||||
/// <param name="query">The query.</param>
|
/// <param name="query">The query.</param>
|
||||||
/// <param name="cancellationToken">The cancellation token.</param>
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
/// <returns>Task{QueryResult{RecordingInfoDto}}.</returns>
|
/// <returns>Task{QueryResult{RecordingInfoDto}}.</returns>
|
||||||
Task<QueryResult<RecordingInfoDto>> GetLiveTvRecordingsAsync(RecordingQuery query, CancellationToken cancellationToken = default(CancellationToken));
|
Task<QueryResult<BaseItemDto>> GetLiveTvRecordingsAsync(RecordingQuery query, CancellationToken cancellationToken = default(CancellationToken));
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the live tv recording asynchronous.
|
/// Gets the live tv recording asynchronous.
|
||||||
|
@ -1086,7 +1078,7 @@ namespace MediaBrowser.Model.ApiClient
|
||||||
/// <param name="userId">The user identifier.</param>
|
/// <param name="userId">The user identifier.</param>
|
||||||
/// <param name="cancellationToken">The cancellation token.</param>
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
/// <returns>Task{RecordingInfoDto}.</returns>
|
/// <returns>Task{RecordingInfoDto}.</returns>
|
||||||
Task<RecordingInfoDto> GetLiveTvRecordingAsync(string id, string userId, CancellationToken cancellationToken = default(CancellationToken));
|
Task<BaseItemDto> GetLiveTvRecordingAsync(string id, string userId, CancellationToken cancellationToken = default(CancellationToken));
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the live tv recording groups asynchronous.
|
/// Gets the live tv recording groups asynchronous.
|
||||||
|
@ -1094,7 +1086,7 @@ namespace MediaBrowser.Model.ApiClient
|
||||||
/// <param name="query">The query.</param>
|
/// <param name="query">The query.</param>
|
||||||
/// <param name="cancellationToken">The cancellation token.</param>
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
/// <returns>Task{QueryResult{RecordingGroupDto}}.</returns>
|
/// <returns>Task{QueryResult{RecordingGroupDto}}.</returns>
|
||||||
Task<QueryResult<RecordingGroupDto>> GetLiveTvRecordingGroupsAsync(RecordingGroupQuery query, CancellationToken cancellationToken = default(CancellationToken));
|
Task<QueryResult<BaseItemDto>> GetLiveTvRecordingGroupsAsync(RecordingGroupQuery query, CancellationToken cancellationToken = default(CancellationToken));
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the live tv recording group asynchronous.
|
/// Gets the live tv recording group asynchronous.
|
||||||
|
@ -1103,7 +1095,7 @@ namespace MediaBrowser.Model.ApiClient
|
||||||
/// <param name="userId">The user identifier.</param>
|
/// <param name="userId">The user identifier.</param>
|
||||||
/// <param name="cancellationToken">The cancellation token.</param>
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
/// <returns>Task{RecordingGroupDto}.</returns>
|
/// <returns>Task{RecordingGroupDto}.</returns>
|
||||||
Task<RecordingGroupDto> GetLiveTvRecordingGroupAsync(string id, string userId, CancellationToken cancellationToken = default(CancellationToken));
|
Task<BaseItemDto> GetLiveTvRecordingGroupAsync(string id, string userId, CancellationToken cancellationToken = default(CancellationToken));
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the live tv timers asynchronous.
|
/// Gets the live tv timers asynchronous.
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
using MediaBrowser.Model.Entities;
|
using MediaBrowser.Model.Entities;
|
||||||
using MediaBrowser.Model.Extensions;
|
using MediaBrowser.Model.Extensions;
|
||||||
using MediaBrowser.Model.Library;
|
using MediaBrowser.Model.Library;
|
||||||
|
using MediaBrowser.Model.LiveTv;
|
||||||
using MediaBrowser.Model.Providers;
|
using MediaBrowser.Model.Providers;
|
||||||
using MediaBrowser.Model.Sync;
|
using MediaBrowser.Model.Sync;
|
||||||
using System;
|
using System;
|
||||||
|
@ -442,7 +443,57 @@ namespace MediaBrowser.Model.Dto
|
||||||
/// Gets or sets the status.
|
/// Gets or sets the status.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <value>The status.</value>
|
/// <value>The status.</value>
|
||||||
public SeriesStatus? Status { get; set; }
|
public string Status { get; set; }
|
||||||
|
|
||||||
|
[IgnoreDataMember]
|
||||||
|
public SeriesStatus? SeriesStatus
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(Status))
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (SeriesStatus)Enum.Parse(typeof(SeriesStatus), Status, true);
|
||||||
|
}
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (value == null)
|
||||||
|
{
|
||||||
|
Status = null;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Status = value.Value.ToString();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[IgnoreDataMember]
|
||||||
|
public RecordingStatus? RecordingStatus
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(Status))
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (RecordingStatus)Enum.Parse(typeof(RecordingStatus), Status, true);
|
||||||
|
}
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (value == null)
|
||||||
|
{
|
||||||
|
Status = null;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Status = value.Value.ToString();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the air time.
|
/// Gets or sets the air time.
|
||||||
|
@ -797,6 +848,17 @@ namespace MediaBrowser.Model.Dto
|
||||||
public double? Altitude { get; set; }
|
public double? Altitude { get; set; }
|
||||||
public int? IsoSpeedRating { get; set; }
|
public int? IsoSpeedRating { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Used by RecordingGroup
|
||||||
|
/// </summary>
|
||||||
|
public int? RecordingCount { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets the series timer identifier.
|
||||||
|
/// </summary>
|
||||||
|
/// <value>The series timer identifier.</value>
|
||||||
|
public string SeriesTimerId { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets a value indicating whether this instance can resume.
|
/// Gets a value indicating whether this instance can resume.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -1017,5 +1079,101 @@ namespace MediaBrowser.Model.Dto
|
||||||
/// Occurs when [property changed].
|
/// Occurs when [property changed].
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public event PropertyChangedEventHandler PropertyChanged;
|
public event PropertyChangedEventHandler PropertyChanged;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets the program identifier.
|
||||||
|
/// </summary>
|
||||||
|
/// <value>The program identifier.</value>
|
||||||
|
public string ProgramId { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets the channel primary image tag.
|
||||||
|
/// </summary>
|
||||||
|
/// <value>The channel primary image tag.</value>
|
||||||
|
public string ChannelPrimaryImageTag { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The start date of the recording, in UTC.
|
||||||
|
/// </summary>
|
||||||
|
public DateTime? StartDate { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets the original air date.
|
||||||
|
/// </summary>
|
||||||
|
/// <value>The original air date.</value>
|
||||||
|
public DateTime? OriginalAirDate { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets the completion percentage.
|
||||||
|
/// </summary>
|
||||||
|
/// <value>The completion percentage.</value>
|
||||||
|
public double? CompletionPercentage { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets a value indicating whether this instance is repeat.
|
||||||
|
/// </summary>
|
||||||
|
/// <value><c>true</c> if this instance is repeat; otherwise, <c>false</c>.</value>
|
||||||
|
public bool? IsRepeat { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets the episode title.
|
||||||
|
/// </summary>
|
||||||
|
/// <value>The episode title.</value>
|
||||||
|
public string EpisodeTitle { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets the type of the channel.
|
||||||
|
/// </summary>
|
||||||
|
/// <value>The type of the channel.</value>
|
||||||
|
public ChannelType? ChannelType { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets the audio.
|
||||||
|
/// </summary>
|
||||||
|
/// <value>The audio.</value>
|
||||||
|
public ProgramAudio? Audio { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets a value indicating whether this instance is movie.
|
||||||
|
/// </summary>
|
||||||
|
/// <value><c>true</c> if this instance is movie; otherwise, <c>false</c>.</value>
|
||||||
|
public bool? IsMovie { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets a value indicating whether this instance is sports.
|
||||||
|
/// </summary>
|
||||||
|
/// <value><c>true</c> if this instance is sports; otherwise, <c>false</c>.</value>
|
||||||
|
public bool? IsSports { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets a value indicating whether this instance is series.
|
||||||
|
/// </summary>
|
||||||
|
/// <value><c>true</c> if this instance is series; otherwise, <c>false</c>.</value>
|
||||||
|
public bool? IsSeries { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets a value indicating whether this instance is live.
|
||||||
|
/// </summary>
|
||||||
|
/// <value><c>true</c> if this instance is live; otherwise, <c>false</c>.</value>
|
||||||
|
public bool? IsLive { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets a value indicating whether this instance is news.
|
||||||
|
/// </summary>
|
||||||
|
/// <value><c>true</c> if this instance is news; otherwise, <c>false</c>.</value>
|
||||||
|
public bool? IsNews { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets a value indicating whether this instance is kids.
|
||||||
|
/// </summary>
|
||||||
|
/// <value><c>true</c> if this instance is kids; otherwise, <c>false</c>.</value>
|
||||||
|
public bool? IsKids { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets a value indicating whether this instance is premiere.
|
||||||
|
/// </summary>
|
||||||
|
/// <value><c>true</c> if this instance is premiere; otherwise, <c>false</c>.</value>
|
||||||
|
public bool? IsPremiere { get; set; }
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
using System;
|
using MediaBrowser.Model.Dto;
|
||||||
using System.ComponentModel;
|
|
||||||
using MediaBrowser.Model.Dto;
|
|
||||||
using MediaBrowser.Model.Extensions;
|
using MediaBrowser.Model.Extensions;
|
||||||
|
using System;
|
||||||
|
using System.ComponentModel;
|
||||||
|
|
||||||
namespace MediaBrowser.Model.LiveTv
|
namespace MediaBrowser.Model.LiveTv
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,40 +0,0 @@
|
||||||
using MediaBrowser.Model.Dto;
|
|
||||||
using MediaBrowser.Model.Extensions;
|
|
||||||
using System.ComponentModel;
|
|
||||||
using System.Diagnostics;
|
|
||||||
|
|
||||||
namespace MediaBrowser.Model.LiveTv
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Class RecordingGroupDto.
|
|
||||||
/// </summary>
|
|
||||||
[DebuggerDisplay("Name = {Name}, Count = {RecordingCount}")]
|
|
||||||
public class RecordingGroupDto : IHasPropertyChangedEvent, IHasServerId
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the server identifier.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The server identifier.</value>
|
|
||||||
public string ServerId { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the name.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The name.</value>
|
|
||||||
public string Name { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the identifier.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The identifier.</value>
|
|
||||||
public string Id { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the recording count.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The recording count.</value>
|
|
||||||
public int RecordingCount { get; set; }
|
|
||||||
|
|
||||||
public event PropertyChangedEventHandler PropertyChanged;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,313 +0,0 @@
|
||||||
using MediaBrowser.Model.Dto;
|
|
||||||
using MediaBrowser.Model.Entities;
|
|
||||||
using MediaBrowser.Model.Extensions;
|
|
||||||
using MediaBrowser.Model.Library;
|
|
||||||
using MediaBrowser.Model.Sync;
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.ComponentModel;
|
|
||||||
using System.Diagnostics;
|
|
||||||
using System.Runtime.Serialization;
|
|
||||||
|
|
||||||
namespace MediaBrowser.Model.LiveTv
|
|
||||||
{
|
|
||||||
[DebuggerDisplay("Name = {Name}, ChannelName = {ChannelName}")]
|
|
||||||
public class RecordingInfoDto : IHasPropertyChangedEvent, IItemDto, IHasServerId, IHasSyncInfo
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Id of the recording.
|
|
||||||
/// </summary>
|
|
||||||
public string Id { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the primary image aspect ratio.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The primary image aspect ratio.</value>
|
|
||||||
public double? PrimaryImageAspectRatio { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the server identifier.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The server identifier.</value>
|
|
||||||
public string ServerId { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the original primary image aspect ratio.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The original primary image aspect ratio.</value>
|
|
||||||
public double? OriginalPrimaryImageAspectRatio { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets a value indicating whether [supports synchronize].
|
|
||||||
/// </summary>
|
|
||||||
/// <value><c>null</c> if [supports synchronize] contains no value, <c>true</c> if [supports synchronize]; otherwise, <c>false</c>.</value>
|
|
||||||
public bool? SupportsSync { get; set; }
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets a value indicating whether this instance has synchronize job.
|
|
||||||
/// </summary>
|
|
||||||
/// <value><c>null</c> if [has synchronize job] contains no value, <c>true</c> if [has synchronize job]; otherwise, <c>false</c>.</value>
|
|
||||||
public bool? HasSyncJob { get; set; }
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets a value indicating whether this instance is synced.
|
|
||||||
/// </summary>
|
|
||||||
/// <value><c>null</c> if [is synced] contains no value, <c>true</c> if [is synced]; otherwise, <c>false</c>.</value>
|
|
||||||
public bool? IsSynced { get; set; }
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the synchronize status.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The synchronize status.</value>
|
|
||||||
public SyncJobItemStatus? SyncStatus { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the series timer identifier.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The series timer identifier.</value>
|
|
||||||
public string SeriesTimerId { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the external identifier.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The external identifier.</value>
|
|
||||||
public string ExternalId { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the program identifier.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The program identifier.</value>
|
|
||||||
public string ProgramId { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// ChannelId of the recording.
|
|
||||||
/// </summary>
|
|
||||||
public string ChannelId { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the play access.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The play access.</value>
|
|
||||||
public PlayAccess PlayAccess { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the channel primary image tag.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The channel primary image tag.</value>
|
|
||||||
public string ChannelPrimaryImageTag { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// ChannelName of the recording.
|
|
||||||
/// </summary>
|
|
||||||
public string ChannelName { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the name of the service.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The name of the service.</value>
|
|
||||||
public string ServiceName { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Name of the recording.
|
|
||||||
/// </summary>
|
|
||||||
public string Name { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the media streams.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The media streams.</value>
|
|
||||||
public List<MediaStream> MediaStreams { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the path.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The path.</value>
|
|
||||||
public string Path { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets a value indicating whether this instance can delete.
|
|
||||||
/// </summary>
|
|
||||||
/// <value><c>null</c> if [can delete] contains no value, <c>true</c> if [can delete]; otherwise, <c>false</c>.</value>
|
|
||||||
public bool? CanDelete { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Overview of the recording.
|
|
||||||
/// </summary>
|
|
||||||
public string Overview { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The start date of the recording, in UTC.
|
|
||||||
/// </summary>
|
|
||||||
public DateTime StartDate { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The end date of the recording, in UTC.
|
|
||||||
/// </summary>
|
|
||||||
public DateTime EndDate { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the original air date.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The original air date.</value>
|
|
||||||
public DateTime? OriginalAirDate { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the status.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The status.</value>
|
|
||||||
public RecordingStatus Status { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the name of the status.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The name of the status.</value>
|
|
||||||
public string StatusName { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the completion percentage.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The completion percentage.</value>
|
|
||||||
public double? CompletionPercentage { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Genre of the program.
|
|
||||||
/// </summary>
|
|
||||||
public List<string> Genres { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets a value indicating whether this instance is repeat.
|
|
||||||
/// </summary>
|
|
||||||
/// <value><c>true</c> if this instance is repeat; otherwise, <c>false</c>.</value>
|
|
||||||
public bool IsRepeat { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the episode title.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The episode title.</value>
|
|
||||||
public string EpisodeTitle { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the run time ticks.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The run time ticks.</value>
|
|
||||||
public long? RunTimeTicks { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the type of the media.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The type of the media.</value>
|
|
||||||
public string MediaType { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the type of the channel.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The type of the channel.</value>
|
|
||||||
public ChannelType ChannelType { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the official rating.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The official rating.</value>
|
|
||||||
public string OfficialRating { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the community rating.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The community rating.</value>
|
|
||||||
public float? CommunityRating { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets a value indicating whether this instance is hd.
|
|
||||||
/// </summary>
|
|
||||||
/// <value><c>true</c> if this instance is hd; otherwise, <c>false</c>.</value>
|
|
||||||
public bool? IsHD { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the audio.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The audio.</value>
|
|
||||||
public ProgramAudio? Audio { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets a value indicating whether this instance is movie.
|
|
||||||
/// </summary>
|
|
||||||
/// <value><c>true</c> if this instance is movie; otherwise, <c>false</c>.</value>
|
|
||||||
public bool IsMovie { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets a value indicating whether this instance is sports.
|
|
||||||
/// </summary>
|
|
||||||
/// <value><c>true</c> if this instance is sports; otherwise, <c>false</c>.</value>
|
|
||||||
public bool IsSports { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets a value indicating whether this instance is series.
|
|
||||||
/// </summary>
|
|
||||||
/// <value><c>true</c> if this instance is series; otherwise, <c>false</c>.</value>
|
|
||||||
public bool IsSeries { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets a value indicating whether this instance is live.
|
|
||||||
/// </summary>
|
|
||||||
/// <value><c>true</c> if this instance is live; otherwise, <c>false</c>.</value>
|
|
||||||
public bool IsLive { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets a value indicating whether this instance is news.
|
|
||||||
/// </summary>
|
|
||||||
/// <value><c>true</c> if this instance is news; otherwise, <c>false</c>.</value>
|
|
||||||
public bool IsNews { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets a value indicating whether this instance is kids.
|
|
||||||
/// </summary>
|
|
||||||
/// <value><c>true</c> if this instance is kids; otherwise, <c>false</c>.</value>
|
|
||||||
public bool IsKids { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets a value indicating whether this instance is premiere.
|
|
||||||
/// </summary>
|
|
||||||
/// <value><c>true</c> if this instance is premiere; otherwise, <c>false</c>.</value>
|
|
||||||
public bool IsPremiere { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the image tags.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The image tags.</value>
|
|
||||||
public Dictionary<ImageType, string> ImageTags { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the user data.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The user data.</value>
|
|
||||||
public UserItemDataDto UserData { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets a value indicating whether this instance has primary image.
|
|
||||||
/// </summary>
|
|
||||||
/// <value><c>true</c> if this instance has primary image; otherwise, <c>false</c>.</value>
|
|
||||||
[IgnoreDataMember]
|
|
||||||
public bool HasPrimaryImage
|
|
||||||
{
|
|
||||||
get { return ImageTags != null && ImageTags.ContainsKey(ImageType.Primary); }
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the type.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The type.</value>
|
|
||||||
public string Type { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the media sources.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The media sources.</value>
|
|
||||||
public List<MediaSourceInfo> MediaSources { get; set; }
|
|
||||||
|
|
||||||
public RecordingInfoDto()
|
|
||||||
{
|
|
||||||
Genres = new List<string>();
|
|
||||||
ImageTags = new Dictionary<ImageType, string>();
|
|
||||||
MediaSources = new List<MediaSourceInfo>();
|
|
||||||
}
|
|
||||||
|
|
||||||
public event PropertyChangedEventHandler PropertyChanged;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -262,7 +262,6 @@
|
||||||
<Compile Include="LiveTv\ProgramInfoDto.cs" />
|
<Compile Include="LiveTv\ProgramInfoDto.cs" />
|
||||||
<Compile Include="LiveTv\ProgramQuery.cs" />
|
<Compile Include="LiveTv\ProgramQuery.cs" />
|
||||||
<Compile Include="LiveTv\RecommendedProgramQuery.cs" />
|
<Compile Include="LiveTv\RecommendedProgramQuery.cs" />
|
||||||
<Compile Include="LiveTv\RecordingGroupDto.cs" />
|
|
||||||
<Compile Include="LiveTv\RecordingGroupQuery.cs" />
|
<Compile Include="LiveTv\RecordingGroupQuery.cs" />
|
||||||
<Compile Include="LiveTv\RecordingQuery.cs" />
|
<Compile Include="LiveTv\RecordingQuery.cs" />
|
||||||
<Compile Include="LiveTv\RecordingStatus.cs" />
|
<Compile Include="LiveTv\RecordingStatus.cs" />
|
||||||
|
@ -299,7 +298,6 @@
|
||||||
<Compile Include="IO\IIsoMounter.cs" />
|
<Compile Include="IO\IIsoMounter.cs" />
|
||||||
<Compile Include="LiveTv\ChannelType.cs" />
|
<Compile Include="LiveTv\ChannelType.cs" />
|
||||||
<Compile Include="LiveTv\LiveTvServiceInfo.cs" />
|
<Compile Include="LiveTv\LiveTvServiceInfo.cs" />
|
||||||
<Compile Include="LiveTv\RecordingInfoDto.cs" />
|
|
||||||
<Compile Include="Net\WebSocketMessage.cs" />
|
<Compile Include="Net\WebSocketMessage.cs" />
|
||||||
<Compile Include="Net\WebSocketMessageType.cs" />
|
<Compile Include="Net\WebSocketMessageType.cs" />
|
||||||
<Compile Include="Net\WebSocketState.cs" />
|
<Compile Include="Net\WebSocketState.cs" />
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
using System;
|
using MediaBrowser.Model.Extensions;
|
||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
@ -45,33 +46,50 @@ namespace MediaBrowser.Model.Net
|
||||||
".rec"
|
".rec"
|
||||||
};
|
};
|
||||||
|
|
||||||
private static readonly Dictionary<string, string> VideoFileExtensionsDictionary = VideoFileExtensions.ToDictionary(i => i, StringComparer.OrdinalIgnoreCase);
|
private static Dictionary<string, string> GetVideoFileExtensionsDictionary()
|
||||||
|
{
|
||||||
|
Dictionary<string, string> dict = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
|
||||||
|
|
||||||
|
foreach (string ext in VideoFileExtensions)
|
||||||
|
{
|
||||||
|
dict[ext] = ext;
|
||||||
|
}
|
||||||
|
|
||||||
|
return dict;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static readonly Dictionary<string, string> VideoFileExtensionsDictionary = GetVideoFileExtensionsDictionary();
|
||||||
|
|
||||||
// http://en.wikipedia.org/wiki/Internet_media_type
|
// http://en.wikipedia.org/wiki/Internet_media_type
|
||||||
// Add more as needed
|
// Add more as needed
|
||||||
|
|
||||||
private static readonly Dictionary<string, string> MimeTypeLookup =
|
private static Dictionary<string, string> GetMimeTypeLookup()
|
||||||
new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
|
{
|
||||||
{
|
Dictionary<string, string> dict = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
|
||||||
{".jpg", "image/jpeg"},
|
|
||||||
{".jpeg", "image/jpeg"},
|
dict.Add(".jpg", "image/jpeg");
|
||||||
{".tbn", "image/jpeg"},
|
dict.Add(".jpeg", "image/jpeg");
|
||||||
{".png", "image/png"},
|
dict.Add(".tbn", "image/jpeg");
|
||||||
{".gif", "image/gif"},
|
dict.Add(".png", "image/png");
|
||||||
{".webp", "image/webp"},
|
dict.Add(".gif", "image/gif");
|
||||||
{".ico", "image/vnd.microsoft.icon"},
|
dict.Add(".webp", "image/webp");
|
||||||
{".mpg", "video/mpeg"},
|
dict.Add(".ico", "image/vnd.microsoft.icon");
|
||||||
{".mpeg", "video/mpeg"},
|
dict.Add(".mpg", "video/mpeg");
|
||||||
{".ogv", "video/ogg"},
|
dict.Add(".mpeg", "video/mpeg");
|
||||||
{".mov", "video/quicktime"},
|
dict.Add(".ogv", "video/ogg");
|
||||||
{".webm", "video/webm"},
|
dict.Add(".mov", "video/quicktime");
|
||||||
{".mkv", "video/x-matroska"},
|
dict.Add(".webm", "video/webm");
|
||||||
{".wmv", "video/x-ms-wmv"},
|
dict.Add(".mkv", "video/x-matroska");
|
||||||
{".flv", "video/x-flv"},
|
dict.Add(".wmv", "video/x-ms-wmv");
|
||||||
{".avi", "video/x-msvideo"},
|
dict.Add(".flv", "video/x-flv");
|
||||||
{".asf", "video/x-ms-asf"},
|
dict.Add(".avi", "video/x-msvideo");
|
||||||
{".m4v", "video/x-m4v"}
|
dict.Add(".asf", "video/x-ms-asf");
|
||||||
};
|
dict.Add(".m4v", "video/x-m4v");
|
||||||
|
|
||||||
|
return dict;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static readonly Dictionary<string, string> MimeTypeLookup = GetMimeTypeLookup();
|
||||||
|
|
||||||
private static readonly Dictionary<string, string> ExtensionLookup = CreateExtensionLookup();
|
private static readonly Dictionary<string, string> ExtensionLookup = CreateExtensionLookup();
|
||||||
|
|
||||||
|
@ -109,19 +127,19 @@ namespace MediaBrowser.Model.Net
|
||||||
}
|
}
|
||||||
|
|
||||||
// Type video
|
// Type video
|
||||||
if (ext.Equals(".3gp", StringComparison.OrdinalIgnoreCase))
|
if (StringHelper.EqualsIgnoreCase(ext, ".3gp"))
|
||||||
{
|
{
|
||||||
return "video/3gpp";
|
return "video/3gpp";
|
||||||
}
|
}
|
||||||
if (ext.Equals(".3g2", StringComparison.OrdinalIgnoreCase))
|
if (StringHelper.EqualsIgnoreCase(ext, ".3g2"))
|
||||||
{
|
{
|
||||||
return "video/3gpp2";
|
return "video/3gpp2";
|
||||||
}
|
}
|
||||||
if (ext.Equals(".ts", StringComparison.OrdinalIgnoreCase))
|
if (StringHelper.EqualsIgnoreCase(ext, ".ts"))
|
||||||
{
|
{
|
||||||
return "video/mp2t";
|
return "video/mp2t";
|
||||||
}
|
}
|
||||||
if (ext.Equals(".mpd", StringComparison.OrdinalIgnoreCase))
|
if (StringHelper.EqualsIgnoreCase(ext, ".mpd"))
|
||||||
{
|
{
|
||||||
return "video/vnd.mpeg.dash.mpd";
|
return "video/vnd.mpeg.dash.mpd";
|
||||||
}
|
}
|
||||||
|
@ -133,134 +151,154 @@ namespace MediaBrowser.Model.Net
|
||||||
}
|
}
|
||||||
|
|
||||||
// Type text
|
// Type text
|
||||||
if (ext.Equals(".css", StringComparison.OrdinalIgnoreCase))
|
if (StringHelper.EqualsIgnoreCase(ext, ".css"))
|
||||||
{
|
{
|
||||||
return "text/css";
|
return "text/css";
|
||||||
}
|
}
|
||||||
if (ext.Equals(".csv", StringComparison.OrdinalIgnoreCase))
|
if (StringHelper.EqualsIgnoreCase(ext, ".csv"))
|
||||||
{
|
{
|
||||||
return "text/csv";
|
return "text/csv";
|
||||||
}
|
}
|
||||||
if (ext.Equals(".html", StringComparison.OrdinalIgnoreCase) || ext.Equals(".htm", StringComparison.OrdinalIgnoreCase))
|
if (StringHelper.EqualsIgnoreCase(ext, ".html"))
|
||||||
{
|
{
|
||||||
return "text/html; charset=UTF-8";
|
return "text/html; charset=UTF-8";
|
||||||
}
|
}
|
||||||
if (ext.Equals(".txt", StringComparison.OrdinalIgnoreCase))
|
if (StringHelper.EqualsIgnoreCase(ext, ".htm"))
|
||||||
|
{
|
||||||
|
return "text/html; charset=UTF-8";
|
||||||
|
}
|
||||||
|
if (StringHelper.EqualsIgnoreCase(ext, ".txt"))
|
||||||
{
|
{
|
||||||
return "text/plain";
|
return "text/plain";
|
||||||
}
|
}
|
||||||
if (ext.Equals(".xml", StringComparison.OrdinalIgnoreCase))
|
if (StringHelper.EqualsIgnoreCase(ext, ".xml"))
|
||||||
{
|
{
|
||||||
return "application/xml";
|
return "application/xml";
|
||||||
}
|
}
|
||||||
|
|
||||||
// Type document
|
// Type document
|
||||||
if (ext.Equals(".pdf", StringComparison.OrdinalIgnoreCase))
|
if (StringHelper.EqualsIgnoreCase(ext, ".pdf"))
|
||||||
{
|
{
|
||||||
return "application/pdf";
|
return "application/pdf";
|
||||||
}
|
}
|
||||||
if (ext.Equals(".mobi", StringComparison.OrdinalIgnoreCase))
|
if (StringHelper.EqualsIgnoreCase(ext, ".mobi"))
|
||||||
{
|
{
|
||||||
return "application/x-mobipocket-ebook";
|
return "application/x-mobipocket-ebook";
|
||||||
}
|
}
|
||||||
if (ext.Equals(".epub", StringComparison.OrdinalIgnoreCase))
|
if (StringHelper.EqualsIgnoreCase(ext, ".epub"))
|
||||||
{
|
{
|
||||||
return "application/epub+zip";
|
return "application/epub+zip";
|
||||||
}
|
}
|
||||||
if (ext.Equals(".cbz", StringComparison.OrdinalIgnoreCase) || ext.Equals(".cbr", StringComparison.OrdinalIgnoreCase))
|
if (StringHelper.EqualsIgnoreCase(ext, ".cbz"))
|
||||||
{
|
{
|
||||||
return "application/x-cdisplay";
|
return "application/epub+zip";
|
||||||
|
}
|
||||||
|
if (StringHelper.EqualsIgnoreCase(ext, ".cbr"))
|
||||||
|
{
|
||||||
|
return "application/epub+zip";
|
||||||
}
|
}
|
||||||
|
|
||||||
// Type audio
|
// Type audio
|
||||||
if (ext.Equals(".mp3", StringComparison.OrdinalIgnoreCase))
|
if (StringHelper.EqualsIgnoreCase(ext, ".mp3"))
|
||||||
{
|
{
|
||||||
return "audio/mpeg";
|
return "audio/mpeg";
|
||||||
}
|
}
|
||||||
if (ext.Equals(".m4a", StringComparison.OrdinalIgnoreCase) || ext.Equals(".aac", StringComparison.OrdinalIgnoreCase))
|
if (StringHelper.EqualsIgnoreCase(ext, ".m4a"))
|
||||||
{
|
{
|
||||||
return "audio/mp4";
|
return "audio/mp4";
|
||||||
}
|
}
|
||||||
if (ext.Equals(".webma", StringComparison.OrdinalIgnoreCase))
|
if (StringHelper.EqualsIgnoreCase(ext, ".aac"))
|
||||||
|
{
|
||||||
|
return "audio/mp4";
|
||||||
|
}
|
||||||
|
if (StringHelper.EqualsIgnoreCase(ext, ".webma"))
|
||||||
{
|
{
|
||||||
return "audio/webm";
|
return "audio/webm";
|
||||||
}
|
}
|
||||||
if (ext.Equals(".wav", StringComparison.OrdinalIgnoreCase))
|
if (StringHelper.EqualsIgnoreCase(ext, ".wav"))
|
||||||
{
|
{
|
||||||
return "audio/wav";
|
return "audio/wav";
|
||||||
}
|
}
|
||||||
if (ext.Equals(".wma", StringComparison.OrdinalIgnoreCase))
|
if (StringHelper.EqualsIgnoreCase(ext, ".wma"))
|
||||||
{
|
{
|
||||||
return "audio/x-ms-wma";
|
return "audio/x-ms-wma";
|
||||||
}
|
}
|
||||||
if (ext.Equals(".flac", StringComparison.OrdinalIgnoreCase))
|
if (StringHelper.EqualsIgnoreCase(ext, ".flac"))
|
||||||
{
|
{
|
||||||
return "audio/flac";
|
return "audio/flac";
|
||||||
}
|
}
|
||||||
if (ext.Equals(".aac", StringComparison.OrdinalIgnoreCase))
|
if (StringHelper.EqualsIgnoreCase(ext, ".aac"))
|
||||||
{
|
{
|
||||||
return "audio/x-aac";
|
return "audio/x-aac";
|
||||||
}
|
}
|
||||||
if (ext.Equals(".ogg", StringComparison.OrdinalIgnoreCase) || ext.Equals(".oga", StringComparison.OrdinalIgnoreCase))
|
if (StringHelper.EqualsIgnoreCase(ext, ".ogg"))
|
||||||
|
{
|
||||||
|
return "audio/ogg";
|
||||||
|
}
|
||||||
|
if (StringHelper.EqualsIgnoreCase(ext, ".oga"))
|
||||||
{
|
{
|
||||||
return "audio/ogg";
|
return "audio/ogg";
|
||||||
}
|
}
|
||||||
|
|
||||||
// Playlists
|
// Playlists
|
||||||
if (ext.Equals(".m3u8", StringComparison.OrdinalIgnoreCase))
|
if (StringHelper.EqualsIgnoreCase(ext, ".m3u8"))
|
||||||
{
|
{
|
||||||
return "application/x-mpegURL";
|
return "application/x-mpegURL";
|
||||||
}
|
}
|
||||||
|
|
||||||
// Misc
|
// Misc
|
||||||
if (ext.Equals(".dll", StringComparison.OrdinalIgnoreCase))
|
if (StringHelper.EqualsIgnoreCase(ext, ".dll"))
|
||||||
{
|
{
|
||||||
return "application/octet-stream";
|
return "application/octet-stream";
|
||||||
}
|
}
|
||||||
|
|
||||||
// Web
|
// Web
|
||||||
if (ext.Equals(".js", StringComparison.OrdinalIgnoreCase))
|
if (StringHelper.EqualsIgnoreCase(ext, ".js"))
|
||||||
{
|
{
|
||||||
return "application/x-javascript";
|
return "application/x-javascript";
|
||||||
}
|
}
|
||||||
if (ext.Equals(".json", StringComparison.OrdinalIgnoreCase))
|
if (StringHelper.EqualsIgnoreCase(ext, ".json"))
|
||||||
{
|
{
|
||||||
return "application/json";
|
return "application/json";
|
||||||
}
|
}
|
||||||
if (ext.Equals(".map", StringComparison.OrdinalIgnoreCase))
|
if (StringHelper.EqualsIgnoreCase(ext, ".map"))
|
||||||
{
|
{
|
||||||
return "application/x-javascript";
|
return "application/x-javascript";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ext.Equals(".woff", StringComparison.OrdinalIgnoreCase))
|
if (StringHelper.EqualsIgnoreCase(ext, ".woff"))
|
||||||
{
|
{
|
||||||
return "font/woff";
|
return "font/woff";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ext.Equals(".ttf", StringComparison.OrdinalIgnoreCase))
|
if (StringHelper.EqualsIgnoreCase(ext, ".ttf"))
|
||||||
{
|
{
|
||||||
return "font/ttf";
|
return "font/ttf";
|
||||||
}
|
}
|
||||||
if (ext.Equals(".eot", StringComparison.OrdinalIgnoreCase))
|
if (StringHelper.EqualsIgnoreCase(ext, ".eot"))
|
||||||
{
|
{
|
||||||
return "application/vnd.ms-fontobject";
|
return "application/vnd.ms-fontobject";
|
||||||
}
|
}
|
||||||
if (ext.Equals(".svg", StringComparison.OrdinalIgnoreCase) || ext.Equals(".svgz", StringComparison.OrdinalIgnoreCase))
|
if (StringHelper.EqualsIgnoreCase(ext, ".svg"))
|
||||||
|
{
|
||||||
|
return "image/svg+xml";
|
||||||
|
}
|
||||||
|
if (StringHelper.EqualsIgnoreCase(ext, ".svgz"))
|
||||||
{
|
{
|
||||||
return "image/svg+xml";
|
return "image/svg+xml";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ext.Equals(".srt", StringComparison.OrdinalIgnoreCase))
|
if (StringHelper.EqualsIgnoreCase(ext, ".srt"))
|
||||||
{
|
{
|
||||||
return "text/plain";
|
return "text/plain";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ext.Equals(".vtt", StringComparison.OrdinalIgnoreCase))
|
if (StringHelper.EqualsIgnoreCase(ext, ".vtt"))
|
||||||
{
|
{
|
||||||
return "text/vtt";
|
return "text/vtt";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ext.Equals(".ttml", StringComparison.OrdinalIgnoreCase))
|
if (StringHelper.EqualsIgnoreCase(ext, ".ttml"))
|
||||||
{
|
{
|
||||||
return "application/ttml+xml";
|
return "application/ttml+xml";
|
||||||
}
|
}
|
||||||
|
|
|
@ -58,10 +58,13 @@ namespace MediaBrowser.Providers.Movies
|
||||||
|
|
||||||
var tmdbImageUrl = tmdbSettings.images.base_url + "original";
|
var tmdbImageUrl = tmdbSettings.images.base_url + "original";
|
||||||
|
|
||||||
var parsedName = _libraryManager.ParseName(name);
|
if (!string.IsNullOrWhiteSpace(name))
|
||||||
var yearInName = parsedName.Year;
|
{
|
||||||
name = parsedName.Name;
|
var parsedName = _libraryManager.ParseName(name);
|
||||||
year = year ?? yearInName;
|
var yearInName = parsedName.Year;
|
||||||
|
name = parsedName.Name;
|
||||||
|
year = year ?? yearInName;
|
||||||
|
}
|
||||||
|
|
||||||
_logger.Info("MovieDbProvider: Finding id for item: " + name);
|
_logger.Info("MovieDbProvider: Finding id for item: " + name);
|
||||||
var language = idInfo.MetadataLanguage.ToLower();
|
var language = idInfo.MetadataLanguage.ToLower();
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
using MediaBrowser.Common.Net;
|
using System.Linq;
|
||||||
|
using MediaBrowser.Common.Net;
|
||||||
using MediaBrowser.Controller.Channels;
|
using MediaBrowser.Controller.Channels;
|
||||||
using MediaBrowser.Controller.Entities;
|
using MediaBrowser.Controller.Entities;
|
||||||
using MediaBrowser.Controller.Entities.Movies;
|
using MediaBrowser.Controller.Entities.Movies;
|
||||||
|
@ -52,28 +53,34 @@ namespace MediaBrowser.Providers.Omdb
|
||||||
var list = new List<RemoteSearchResult>();
|
var list = new List<RemoteSearchResult>();
|
||||||
|
|
||||||
var imdbId = searchInfo.GetProviderId(MetadataProviders.Imdb);
|
var imdbId = searchInfo.GetProviderId(MetadataProviders.Imdb);
|
||||||
if (!string.IsNullOrWhiteSpace(imdbId))
|
|
||||||
{
|
|
||||||
return list;
|
|
||||||
}
|
|
||||||
|
|
||||||
var url = "http://www.omdbapi.com/?plot=short&r=json";
|
var url = "http://www.omdbapi.com/?plot=short&r=json";
|
||||||
|
|
||||||
var name = searchInfo.Name;
|
var name = searchInfo.Name;
|
||||||
var year = searchInfo.Year;
|
var year = searchInfo.Year;
|
||||||
|
|
||||||
var parsedName = _libraryManager.ParseName(name);
|
if (!string.IsNullOrWhiteSpace(name))
|
||||||
var yearInName = parsedName.Year;
|
|
||||||
name = parsedName.Name;
|
|
||||||
year = year ?? yearInName;
|
|
||||||
|
|
||||||
if (year.HasValue)
|
|
||||||
{
|
{
|
||||||
url += "&y=" + year.Value.ToString(CultureInfo.InvariantCulture);
|
var parsedName = _libraryManager.ParseName(name);
|
||||||
|
var yearInName = parsedName.Year;
|
||||||
|
name = parsedName.Name;
|
||||||
|
year = year ?? yearInName;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (string.IsNullOrWhiteSpace(imdbId))
|
||||||
|
{
|
||||||
|
if (year.HasValue)
|
||||||
|
{
|
||||||
|
url += "&y=" + year.Value.ToString(CultureInfo.InvariantCulture);
|
||||||
|
}
|
||||||
|
|
||||||
url += "&t=" + WebUtility.UrlEncode(name);
|
url += "&t=" + WebUtility.UrlEncode(name);
|
||||||
url += "&type=" + type;
|
url += "&type=" + type;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
url += "&i=" + imdbId;
|
||||||
|
}
|
||||||
|
|
||||||
using (var stream = await _httpClient.Get(new HttpRequestOptions
|
using (var stream = await _httpClient.Get(new HttpRequestOptions
|
||||||
{
|
{
|
||||||
|
@ -81,7 +88,7 @@ namespace MediaBrowser.Providers.Omdb
|
||||||
ResourcePool = OmdbProvider.ResourcePool,
|
ResourcePool = OmdbProvider.ResourcePool,
|
||||||
CancellationToken = cancellationToken,
|
CancellationToken = cancellationToken,
|
||||||
CacheMode = CacheMode.Unconditional,
|
CacheMode = CacheMode.Unconditional,
|
||||||
CacheLength = TimeSpan.FromDays(7)
|
CacheLength = TimeSpan.FromDays(2)
|
||||||
|
|
||||||
}).ConfigureAwait(false))
|
}).ConfigureAwait(false))
|
||||||
{
|
{
|
||||||
|
@ -145,33 +152,18 @@ namespace MediaBrowser.Providers.Omdb
|
||||||
Item = new Series()
|
Item = new Series()
|
||||||
};
|
};
|
||||||
|
|
||||||
var searchResult = await GetSeriesImdbId(info, cancellationToken).ConfigureAwait(false);
|
var imdbId = info.GetProviderId(MetadataProviders.Imdb);
|
||||||
result.Item.Name = searchResult.Item4;
|
if (string.IsNullOrWhiteSpace(imdbId))
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(searchResult.Item1))
|
|
||||||
{
|
{
|
||||||
result.Item.SetProviderId(MetadataProviders.Imdb, searchResult.Item1);
|
imdbId = await GetSeriesImdbId(info, cancellationToken).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(searchResult.Item2))
|
|
||||||
{
|
|
||||||
result.Item.SetProviderId(MetadataProviders.Tmdb, searchResult.Item2);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(searchResult.Item3))
|
|
||||||
{
|
|
||||||
result.Item.SetProviderId(MetadataProviders.Tvdb, searchResult.Item3);
|
|
||||||
}
|
|
||||||
|
|
||||||
var imdbId = result.Item.GetProviderId(MetadataProviders.Imdb);
|
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(imdbId))
|
if (!string.IsNullOrEmpty(imdbId))
|
||||||
{
|
{
|
||||||
result.Item.SetProviderId(MetadataProviders.Imdb, imdbId);
|
result.Item.SetProviderId(MetadataProviders.Imdb, imdbId);
|
||||||
result.HasMetadata = true;
|
result.HasMetadata = true;
|
||||||
|
|
||||||
await new OmdbProvider(_jsonSerializer, _httpClient).Fetch(result.Item, imdbId, cancellationToken)
|
await new OmdbProvider(_jsonSerializer, _httpClient).Fetch(result.Item, imdbId, cancellationToken).ConfigureAwait(false);
|
||||||
.ConfigureAwait(false);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
|
@ -191,64 +183,34 @@ namespace MediaBrowser.Providers.Omdb
|
||||||
};
|
};
|
||||||
|
|
||||||
var imdbId = info.GetProviderId(MetadataProviders.Imdb);
|
var imdbId = info.GetProviderId(MetadataProviders.Imdb);
|
||||||
|
|
||||||
var searchResult = await GetMovieImdbId(info, cancellationToken).ConfigureAwait(false);
|
|
||||||
result.Item.Name = searchResult.Item3;
|
|
||||||
|
|
||||||
if (string.IsNullOrWhiteSpace(imdbId))
|
if (string.IsNullOrWhiteSpace(imdbId))
|
||||||
{
|
{
|
||||||
imdbId = searchResult.Item1;
|
imdbId = await GetMovieImdbId(info, cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(searchResult.Item2))
|
|
||||||
{
|
|
||||||
result.Item.SetProviderId(MetadataProviders.Tmdb, searchResult.Item2);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!string.IsNullOrWhiteSpace(imdbId))
|
if (!string.IsNullOrEmpty(imdbId))
|
||||||
{
|
{
|
||||||
result.Item.SetProviderId(MetadataProviders.Imdb, imdbId);
|
result.Item.SetProviderId(MetadataProviders.Imdb, imdbId);
|
||||||
result.HasMetadata = true;
|
result.HasMetadata = true;
|
||||||
|
|
||||||
await new OmdbProvider(_jsonSerializer, _httpClient).Fetch(result.Item, imdbId, cancellationToken)
|
await new OmdbProvider(_jsonSerializer, _httpClient).Fetch(result.Item, imdbId, cancellationToken).ConfigureAwait(false);
|
||||||
.ConfigureAwait(false);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task<Tuple<string, string, string>> GetMovieImdbId(ItemLookupInfo info, CancellationToken cancellationToken)
|
private async Task<string> GetMovieImdbId(ItemLookupInfo info, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
var result = await new GenericMovieDbInfo<Movie>(_logger, _jsonSerializer, _libraryManager).GetMetadata(info, cancellationToken)
|
var results = await GetSearchResults(info, "movie", cancellationToken).ConfigureAwait(false);
|
||||||
.ConfigureAwait(false);
|
var first = results.FirstOrDefault();
|
||||||
|
return first == null ? null : first.GetProviderId(MetadataProviders.Imdb);
|
||||||
var imdb = result.HasMetadata ? result.Item.GetProviderId(MetadataProviders.Imdb) : null;
|
|
||||||
var tmdb = result.HasMetadata ? result.Item.GetProviderId(MetadataProviders.Tmdb) : null;
|
|
||||||
var name = result.HasMetadata ? result.Item.Name : null;
|
|
||||||
|
|
||||||
return new Tuple<string, string, string>(imdb, tmdb, name);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task<Tuple<string, string, string, string>> GetSeriesImdbId(SeriesInfo info, CancellationToken cancellationToken)
|
private async Task<string> GetSeriesImdbId(SeriesInfo info, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
//var result = await TvdbSeriesProvider.Current.GetMetadata(info, cancellationToken)
|
var results = await GetSearchResults(info, cancellationToken).ConfigureAwait(false);
|
||||||
// .ConfigureAwait(false);
|
var first = results.FirstOrDefault();
|
||||||
|
return first == null ? null : first.GetProviderId(MetadataProviders.Imdb);
|
||||||
//var imdb = result.HasMetadata ? result.Item.GetProviderId(MetadataProviders.Imdb) : null;
|
|
||||||
//var tvdb = result.HasMetadata ? result.Item.GetProviderId(MetadataProviders.Tvdb) : null;
|
|
||||||
//var name = result.HasMetadata ? result.Item.Name : null;
|
|
||||||
|
|
||||||
//return new Tuple<string, string, string>(imdb, tvdb, name);
|
|
||||||
|
|
||||||
var result = await MovieDbSeriesProvider.Current.GetMetadata(info, cancellationToken)
|
|
||||||
.ConfigureAwait(false);
|
|
||||||
|
|
||||||
var imdb = result.HasMetadata ? result.Item.GetProviderId(MetadataProviders.Imdb) : null;
|
|
||||||
var tmdb = result.HasMetadata ? result.Item.GetProviderId(MetadataProviders.Tmdb) : null;
|
|
||||||
var tvdb = result.HasMetadata ? result.Item.GetProviderId(MetadataProviders.Tvdb) : null;
|
|
||||||
var name = result.HasMetadata ? result.Item.Name : null;
|
|
||||||
|
|
||||||
return new Tuple<string, string, string, string>(imdb, tmdb, tvdb, name);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
|
public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
|
||||||
|
|
|
@ -46,8 +46,9 @@ namespace MediaBrowser.Server.Implementations.Dto
|
||||||
private readonly IApplicationHost _appHost;
|
private readonly IApplicationHost _appHost;
|
||||||
private readonly Func<IDeviceManager> _deviceManager;
|
private readonly Func<IDeviceManager> _deviceManager;
|
||||||
private readonly Func<IMediaSourceManager> _mediaSourceManager;
|
private readonly Func<IMediaSourceManager> _mediaSourceManager;
|
||||||
|
private readonly Func<ILiveTvManager> _livetvManager;
|
||||||
|
|
||||||
public DtoService(ILogger logger, ILibraryManager libraryManager, IUserDataManager userDataRepository, IItemRepository itemRepo, IImageProcessor imageProcessor, IServerConfigurationManager config, IFileSystem fileSystem, IProviderManager providerManager, Func<IChannelManager> channelManagerFactory, ISyncManager syncManager, IApplicationHost appHost, Func<IDeviceManager> deviceManager, Func<IMediaSourceManager> mediaSourceManager)
|
public DtoService(ILogger logger, ILibraryManager libraryManager, IUserDataManager userDataRepository, IItemRepository itemRepo, IImageProcessor imageProcessor, IServerConfigurationManager config, IFileSystem fileSystem, IProviderManager providerManager, Func<IChannelManager> channelManagerFactory, ISyncManager syncManager, IApplicationHost appHost, Func<IDeviceManager> deviceManager, Func<IMediaSourceManager> mediaSourceManager, Func<ILiveTvManager> livetvManager)
|
||||||
{
|
{
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
_libraryManager = libraryManager;
|
_libraryManager = libraryManager;
|
||||||
|
@ -62,6 +63,7 @@ namespace MediaBrowser.Server.Implementations.Dto
|
||||||
_appHost = appHost;
|
_appHost = appHost;
|
||||||
_deviceManager = deviceManager;
|
_deviceManager = deviceManager;
|
||||||
_mediaSourceManager = mediaSourceManager;
|
_mediaSourceManager = mediaSourceManager;
|
||||||
|
_livetvManager = livetvManager;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -350,6 +352,11 @@ namespace MediaBrowser.Server.Implementations.Dto
|
||||||
dto.Etag = item.GetEtag(user);
|
dto.Etag = item.GetEtag(user);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (item is ILiveTvRecording)
|
||||||
|
{
|
||||||
|
_livetvManager().AddInfoToRecordingDto(item, dto, user);
|
||||||
|
}
|
||||||
|
|
||||||
return dto;
|
return dto;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1384,7 +1391,7 @@ namespace MediaBrowser.Server.Implementations.Dto
|
||||||
{
|
{
|
||||||
dto.AirDays = series.AirDays;
|
dto.AirDays = series.AirDays;
|
||||||
dto.AirTime = series.AirTime;
|
dto.AirTime = series.AirTime;
|
||||||
dto.Status = series.Status;
|
dto.SeriesStatus = series.Status;
|
||||||
|
|
||||||
dto.SeasonCount = series.SeasonCount;
|
dto.SeasonCount = series.SeasonCount;
|
||||||
|
|
||||||
|
|
|
@ -167,122 +167,6 @@ namespace MediaBrowser.Server.Implementations.LiveTv
|
||||||
return val.Value;
|
return val.Value;
|
||||||
}
|
}
|
||||||
|
|
||||||
public string GetStatusName(RecordingStatus status)
|
|
||||||
{
|
|
||||||
if (status == RecordingStatus.InProgress)
|
|
||||||
{
|
|
||||||
return "In Progress";
|
|
||||||
}
|
|
||||||
|
|
||||||
if (status == RecordingStatus.ConflictedNotOk)
|
|
||||||
{
|
|
||||||
return "Conflicted";
|
|
||||||
}
|
|
||||||
|
|
||||||
if (status == RecordingStatus.ConflictedOk)
|
|
||||||
{
|
|
||||||
return "Scheduled";
|
|
||||||
}
|
|
||||||
|
|
||||||
return status.ToString();
|
|
||||||
}
|
|
||||||
|
|
||||||
public RecordingInfoDto GetRecordingInfoDto(ILiveTvRecording recording, LiveTvChannel channel, ILiveTvService service, User user = null)
|
|
||||||
{
|
|
||||||
var info = recording.RecordingInfo;
|
|
||||||
|
|
||||||
var dto = new RecordingInfoDto
|
|
||||||
{
|
|
||||||
Id = GetInternalRecordingId(service.Name, info.Id).ToString("N"),
|
|
||||||
SeriesTimerId = string.IsNullOrEmpty(info.SeriesTimerId) ? null : GetInternalSeriesTimerId(service.Name, info.SeriesTimerId).ToString("N"),
|
|
||||||
Type = recording.GetClientTypeName(),
|
|
||||||
Overview = info.Overview,
|
|
||||||
EndDate = info.EndDate,
|
|
||||||
Name = info.Name,
|
|
||||||
StartDate = info.StartDate,
|
|
||||||
ExternalId = info.Id,
|
|
||||||
ChannelId = GetInternalChannelId(service.Name, info.ChannelId).ToString("N"),
|
|
||||||
Status = info.Status,
|
|
||||||
StatusName = GetStatusName(info.Status),
|
|
||||||
Path = info.Path,
|
|
||||||
Genres = info.Genres,
|
|
||||||
IsRepeat = info.IsRepeat,
|
|
||||||
EpisodeTitle = info.EpisodeTitle,
|
|
||||||
ChannelType = info.ChannelType,
|
|
||||||
MediaType = info.ChannelType == ChannelType.Radio ? MediaType.Audio : MediaType.Video,
|
|
||||||
CommunityRating = GetClientCommunityRating(info.CommunityRating),
|
|
||||||
OfficialRating = info.OfficialRating,
|
|
||||||
Audio = info.Audio,
|
|
||||||
IsHD = info.IsHD,
|
|
||||||
ServiceName = service.Name,
|
|
||||||
IsMovie = info.IsMovie,
|
|
||||||
IsSeries = info.IsSeries,
|
|
||||||
IsSports = info.IsSports,
|
|
||||||
IsLive = info.IsLive,
|
|
||||||
IsNews = info.IsNews,
|
|
||||||
IsKids = info.IsKids,
|
|
||||||
IsPremiere = info.IsPremiere,
|
|
||||||
RunTimeTicks = (info.EndDate - info.StartDate).Ticks,
|
|
||||||
OriginalAirDate = info.OriginalAirDate,
|
|
||||||
|
|
||||||
MediaSources = recording.GetMediaSources(true).ToList(),
|
|
||||||
ServerId = _appHost.SystemId
|
|
||||||
};
|
|
||||||
|
|
||||||
dto.CanDelete = user == null
|
|
||||||
? recording.CanDelete()
|
|
||||||
: recording.CanDelete(user);
|
|
||||||
|
|
||||||
dto.MediaStreams = dto.MediaSources.SelectMany(i => i.MediaStreams).ToList();
|
|
||||||
|
|
||||||
if (info.Status == RecordingStatus.InProgress)
|
|
||||||
{
|
|
||||||
var now = DateTime.UtcNow.Ticks;
|
|
||||||
var start = info.StartDate.Ticks;
|
|
||||||
var end = info.EndDate.Ticks;
|
|
||||||
|
|
||||||
var pct = now - start;
|
|
||||||
pct /= end;
|
|
||||||
pct *= 100;
|
|
||||||
dto.CompletionPercentage = pct;
|
|
||||||
}
|
|
||||||
|
|
||||||
var imageTag = GetImageTag(recording);
|
|
||||||
|
|
||||||
if (imageTag != null)
|
|
||||||
{
|
|
||||||
dto.ImageTags[ImageType.Primary] = imageTag;
|
|
||||||
_dtoService.AttachPrimaryImageAspectRatio(dto, recording, new List<ItemFields>
|
|
||||||
{
|
|
||||||
ItemFields.PrimaryImageAspectRatio
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if (user != null)
|
|
||||||
{
|
|
||||||
dto.UserData = _userDataManager.GetUserDataDto(recording, user);
|
|
||||||
|
|
||||||
dto.PlayAccess = recording.GetPlayAccess(user);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(info.ProgramId))
|
|
||||||
{
|
|
||||||
dto.ProgramId = GetInternalProgramId(service.Name, info.ProgramId).ToString("N");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (channel != null)
|
|
||||||
{
|
|
||||||
dto.ChannelName = channel.Name;
|
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(channel.PrimaryImagePath))
|
|
||||||
{
|
|
||||||
dto.ChannelPrimaryImageTag = GetImageTag(channel);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return dto;
|
|
||||||
}
|
|
||||||
|
|
||||||
public LiveTvTunerInfoDto GetTunerInfoDto(string serviceName, LiveTvTunerInfo info, string channelName)
|
public LiveTvTunerInfoDto GetTunerInfoDto(string serviceName, LiveTvTunerInfo info, string channelName)
|
||||||
{
|
{
|
||||||
var dto = new LiveTvTunerInfoDto
|
var dto = new LiveTvTunerInfoDto
|
||||||
|
@ -430,7 +314,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
|
||||||
return dto;
|
return dto;
|
||||||
}
|
}
|
||||||
|
|
||||||
private string GetImageTag(IHasImages info)
|
internal string GetImageTag(IHasImages info)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
|
|
@ -119,11 +119,11 @@ namespace MediaBrowser.Server.Implementations.LiveTv
|
||||||
{
|
{
|
||||||
var dict = new Dictionary<Guid, LiveTvProgram>();
|
var dict = new Dictionary<Guid, LiveTvProgram>();
|
||||||
|
|
||||||
foreach (var item in _itemRepo.GetItemsOfType(typeof (LiveTvProgram))
|
foreach (var item in _itemRepo.GetItemsOfType(typeof(LiveTvProgram))
|
||||||
.Cast<LiveTvProgram>()
|
.Cast<LiveTvProgram>()
|
||||||
.ToList())
|
.ToList())
|
||||||
{
|
{
|
||||||
dict[item.Id] = item;
|
dict[item.Id] = item;
|
||||||
}
|
}
|
||||||
|
|
||||||
_programs = dict;
|
_programs = dict;
|
||||||
|
@ -658,7 +658,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
|
||||||
|
|
||||||
var id = _tvDtoService.GetInternalRecordingId(serviceName, info.Id);
|
var id = _tvDtoService.GetInternalRecordingId(serviceName, info.Id);
|
||||||
|
|
||||||
var item = _itemRepo.RetrieveItem(id) as ILiveTvRecording;
|
var item = _itemRepo.RetrieveItem(id);
|
||||||
|
|
||||||
if (item == null)
|
if (item == null)
|
||||||
{
|
{
|
||||||
|
@ -687,8 +687,15 @@ namespace MediaBrowser.Server.Implementations.LiveTv
|
||||||
isNew = true;
|
isNew = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
item.RecordingInfo = info;
|
item.CommunityRating = info.CommunityRating;
|
||||||
item.ServiceName = serviceName;
|
item.OfficialRating = info.OfficialRating;
|
||||||
|
item.Overview = info.Overview;
|
||||||
|
item.EndDate = info.EndDate;
|
||||||
|
|
||||||
|
var recording = (ILiveTvRecording)item;
|
||||||
|
|
||||||
|
recording.RecordingInfo = info;
|
||||||
|
recording.ServiceName = serviceName;
|
||||||
|
|
||||||
var originalPath = item.Path;
|
var originalPath = item.Path;
|
||||||
|
|
||||||
|
@ -709,9 +716,9 @@ namespace MediaBrowser.Server.Implementations.LiveTv
|
||||||
|
|
||||||
}, cancellationToken);
|
}, cancellationToken);
|
||||||
|
|
||||||
_libraryManager.RegisterItem((BaseItem)item);
|
_libraryManager.RegisterItem(item);
|
||||||
|
|
||||||
return item;
|
return recording;
|
||||||
}
|
}
|
||||||
|
|
||||||
private LiveTvChannel GetChannel(LiveTvProgram program)
|
private LiveTvChannel GetChannel(LiveTvProgram program)
|
||||||
|
@ -1355,20 +1362,89 @@ namespace MediaBrowser.Server.Implementations.LiveTv
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<QueryResult<RecordingInfoDto>> GetRecordings(RecordingQuery query, DtoOptions options, CancellationToken cancellationToken)
|
public void AddInfoToRecordingDto(BaseItem item, BaseItemDto dto, User user = null)
|
||||||
|
{
|
||||||
|
var recording = (ILiveTvRecording)item;
|
||||||
|
var service = GetService(recording);
|
||||||
|
|
||||||
|
var channel = string.IsNullOrEmpty(recording.RecordingInfo.ChannelId) ? null : GetInternalChannel(_tvDtoService.GetInternalChannelId(service.Name, recording.RecordingInfo.ChannelId));
|
||||||
|
|
||||||
|
var info = recording.RecordingInfo;
|
||||||
|
|
||||||
|
dto.Id = _tvDtoService.GetInternalRecordingId(service.Name, info.Id).ToString("N");
|
||||||
|
dto.SeriesTimerId = string.IsNullOrEmpty(info.SeriesTimerId)
|
||||||
|
? null
|
||||||
|
: _tvDtoService.GetInternalSeriesTimerId(service.Name, info.SeriesTimerId).ToString("N");
|
||||||
|
|
||||||
|
dto.ChannelId = _tvDtoService.GetInternalChannelId(service.Name, info.ChannelId).ToString("N");
|
||||||
|
|
||||||
|
dto.StartDate = info.StartDate;
|
||||||
|
dto.RecordingStatus = info.Status;
|
||||||
|
dto.IsRepeat = info.IsRepeat;
|
||||||
|
dto.EpisodeTitle = info.EpisodeTitle;
|
||||||
|
dto.ChannelType = info.ChannelType;
|
||||||
|
dto.Audio = info.Audio;
|
||||||
|
dto.IsHD = info.IsHD;
|
||||||
|
dto.IsMovie = info.IsMovie;
|
||||||
|
dto.IsSeries = info.IsSeries;
|
||||||
|
dto.IsSports = info.IsSports;
|
||||||
|
dto.IsLive = info.IsLive;
|
||||||
|
dto.IsNews = info.IsNews;
|
||||||
|
dto.IsKids = info.IsKids;
|
||||||
|
dto.IsPremiere = info.IsPremiere;
|
||||||
|
dto.RunTimeTicks = (info.EndDate - info.StartDate).Ticks;
|
||||||
|
dto.OriginalAirDate = info.OriginalAirDate;
|
||||||
|
|
||||||
|
dto.CanDelete = user == null
|
||||||
|
? recording.CanDelete()
|
||||||
|
: recording.CanDelete(user);
|
||||||
|
|
||||||
|
if (dto.MediaSources == null)
|
||||||
|
{
|
||||||
|
dto.MediaSources = recording.GetMediaSources(true).ToList();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (dto.MediaStreams == null)
|
||||||
|
{
|
||||||
|
dto.MediaStreams = dto.MediaSources.SelectMany(i => i.MediaStreams).ToList();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (info.Status == RecordingStatus.InProgress)
|
||||||
|
{
|
||||||
|
var now = DateTime.UtcNow.Ticks;
|
||||||
|
var start = info.StartDate.Ticks;
|
||||||
|
var end = info.EndDate.Ticks;
|
||||||
|
|
||||||
|
var pct = now - start;
|
||||||
|
pct /= end;
|
||||||
|
pct *= 100;
|
||||||
|
dto.CompletionPercentage = pct;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(info.ProgramId))
|
||||||
|
{
|
||||||
|
dto.ProgramId = _tvDtoService.GetInternalProgramId(service.Name, info.ProgramId).ToString("N");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (channel != null)
|
||||||
|
{
|
||||||
|
dto.ChannelName = channel.Name;
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(channel.PrimaryImagePath))
|
||||||
|
{
|
||||||
|
dto.ChannelPrimaryImageTag = _tvDtoService.GetImageTag(channel);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<QueryResult<BaseItemDto>> GetRecordings(RecordingQuery query, DtoOptions options, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
var user = string.IsNullOrEmpty(query.UserId) ? null : _userManager.GetUserById(query.UserId);
|
var user = string.IsNullOrEmpty(query.UserId) ? null : _userManager.GetUserById(query.UserId);
|
||||||
|
|
||||||
var internalResult = await GetInternalRecordings(query, cancellationToken).ConfigureAwait(false);
|
var internalResult = await GetInternalRecordings(query, cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
var returnArray = internalResult.Items.Cast<ILiveTvRecording>()
|
var returnArray = internalResult.Items
|
||||||
.Select(i =>
|
.Select(i => _dtoService.GetBaseItemDto(i, options, user))
|
||||||
{
|
|
||||||
var service = GetService(i);
|
|
||||||
|
|
||||||
var channel = string.IsNullOrEmpty(i.RecordingInfo.ChannelId) ? null : GetInternalChannel(_tvDtoService.GetInternalChannelId(service.Name, i.RecordingInfo.ChannelId));
|
|
||||||
return _tvDtoService.GetRecordingInfoDto(i, channel, service, user);
|
|
||||||
})
|
|
||||||
.ToArray();
|
.ToArray();
|
||||||
|
|
||||||
if (user != null)
|
if (user != null)
|
||||||
|
@ -1376,7 +1452,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
|
||||||
_dtoService.FillSyncInfo(returnArray, new DtoOptions(), user);
|
_dtoService.FillSyncInfo(returnArray, new DtoOptions(), user);
|
||||||
}
|
}
|
||||||
|
|
||||||
return new QueryResult<RecordingInfoDto>
|
return new QueryResult<BaseItemDto>
|
||||||
{
|
{
|
||||||
Items = returnArray,
|
Items = returnArray,
|
||||||
TotalRecordCount = internalResult.TotalRecordCount
|
TotalRecordCount = internalResult.TotalRecordCount
|
||||||
|
@ -1448,10 +1524,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
|
||||||
|
|
||||||
public async Task DeleteRecording(string recordingId)
|
public async Task DeleteRecording(string recordingId)
|
||||||
{
|
{
|
||||||
var dtoOptions = new DtoOptions();
|
var recording = await GetInternalRecording(recordingId, CancellationToken.None).ConfigureAwait(false);
|
||||||
dtoOptions.Fields.Remove(ItemFields.SyncInfo);
|
|
||||||
|
|
||||||
var recording = await GetRecording(recordingId, dtoOptions, CancellationToken.None).ConfigureAwait(false);
|
|
||||||
|
|
||||||
if (recording == null)
|
if (recording == null)
|
||||||
{
|
{
|
||||||
|
@ -1460,7 +1533,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
|
||||||
|
|
||||||
var service = GetService(recording.ServiceName);
|
var service = GetService(recording.ServiceName);
|
||||||
|
|
||||||
await service.DeleteRecordingAsync(recording.ExternalId, CancellationToken.None).ConfigureAwait(false);
|
await service.DeleteRecordingAsync(recording.RecordingInfo.Id, CancellationToken.None).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task CancelTimer(string id)
|
public async Task CancelTimer(string id)
|
||||||
|
@ -1491,16 +1564,16 @@ namespace MediaBrowser.Server.Implementations.LiveTv
|
||||||
await service.CancelSeriesTimerAsync(timer.ExternalId, CancellationToken.None).ConfigureAwait(false);
|
await service.CancelSeriesTimerAsync(timer.ExternalId, CancellationToken.None).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<RecordingInfoDto> GetRecording(string id, DtoOptions options, CancellationToken cancellationToken, User user = null)
|
public async Task<BaseItemDto> GetRecording(string id, DtoOptions options, CancellationToken cancellationToken, User user = null)
|
||||||
{
|
{
|
||||||
var results = await GetRecordings(new RecordingQuery
|
var item = await GetInternalRecording(id, cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
|
if (item == null)
|
||||||
{
|
{
|
||||||
UserId = user == null ? null : user.Id.ToString("N"),
|
return null;
|
||||||
Id = id
|
}
|
||||||
|
|
||||||
}, options, cancellationToken).ConfigureAwait(false);
|
return _dtoService.GetBaseItemDto((BaseItem)item, options, user);
|
||||||
|
|
||||||
return results.Items.FirstOrDefault();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<TimerInfoDto> GetTimer(string id, CancellationToken cancellationToken)
|
public async Task<TimerInfoDto> GetTimer(string id, CancellationToken cancellationToken)
|
||||||
|
@ -1776,60 +1849,57 @@ namespace MediaBrowser.Server.Implementations.LiveTv
|
||||||
.ToList();
|
.ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<QueryResult<RecordingGroupDto>> GetRecordingGroups(RecordingGroupQuery query, CancellationToken cancellationToken)
|
public async Task<QueryResult<BaseItemDto>> GetRecordingGroups(RecordingGroupQuery query, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
var dtoOptions = new DtoOptions();
|
var recordingResult = await GetInternalRecordings(new RecordingQuery
|
||||||
dtoOptions.Fields.Remove(ItemFields.SyncInfo);
|
|
||||||
|
|
||||||
var recordingResult = await GetRecordings(new RecordingQuery
|
|
||||||
{
|
{
|
||||||
UserId = query.UserId
|
UserId = query.UserId
|
||||||
|
|
||||||
}, dtoOptions, cancellationToken).ConfigureAwait(false);
|
}, cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
var recordings = recordingResult.Items;
|
var recordings = recordingResult.Items.Cast<ILiveTvRecording>().ToList();
|
||||||
|
|
||||||
var groups = new List<RecordingGroupDto>();
|
var groups = new List<BaseItemDto>();
|
||||||
|
|
||||||
var series = recordings
|
var series = recordings
|
||||||
.Where(i => i.IsSeries)
|
.Where(i => i.RecordingInfo.IsSeries)
|
||||||
.ToLookup(i => i.Name, StringComparer.OrdinalIgnoreCase)
|
.ToLookup(i => i.Name, StringComparer.OrdinalIgnoreCase)
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
groups.AddRange(series.OrderByString(i => i.Key).Select(i => new RecordingGroupDto
|
groups.AddRange(series.OrderByString(i => i.Key).Select(i => new BaseItemDto
|
||||||
{
|
{
|
||||||
Name = i.Key,
|
Name = i.Key,
|
||||||
RecordingCount = i.Count()
|
RecordingCount = i.Count()
|
||||||
}));
|
}));
|
||||||
|
|
||||||
groups.Add(new RecordingGroupDto
|
groups.Add(new BaseItemDto
|
||||||
{
|
{
|
||||||
Name = "Kids",
|
Name = "Kids",
|
||||||
RecordingCount = recordings.Count(i => i.IsKids)
|
RecordingCount = recordings.Count(i => i.RecordingInfo.IsKids)
|
||||||
});
|
});
|
||||||
|
|
||||||
groups.Add(new RecordingGroupDto
|
groups.Add(new BaseItemDto
|
||||||
{
|
{
|
||||||
Name = "Movies",
|
Name = "Movies",
|
||||||
RecordingCount = recordings.Count(i => i.IsMovie)
|
RecordingCount = recordings.Count(i => i.RecordingInfo.IsMovie)
|
||||||
});
|
});
|
||||||
|
|
||||||
groups.Add(new RecordingGroupDto
|
groups.Add(new BaseItemDto
|
||||||
{
|
{
|
||||||
Name = "News",
|
Name = "News",
|
||||||
RecordingCount = recordings.Count(i => i.IsNews)
|
RecordingCount = recordings.Count(i => i.RecordingInfo.IsNews)
|
||||||
});
|
});
|
||||||
|
|
||||||
groups.Add(new RecordingGroupDto
|
groups.Add(new BaseItemDto
|
||||||
{
|
{
|
||||||
Name = "Sports",
|
Name = "Sports",
|
||||||
RecordingCount = recordings.Count(i => i.IsSports)
|
RecordingCount = recordings.Count(i => i.RecordingInfo.IsSports)
|
||||||
});
|
});
|
||||||
|
|
||||||
groups.Add(new RecordingGroupDto
|
groups.Add(new BaseItemDto
|
||||||
{
|
{
|
||||||
Name = "Others",
|
Name = "Others",
|
||||||
RecordingCount = recordings.Count(i => !i.IsSports && !i.IsNews && !i.IsMovie && !i.IsKids && !i.IsSeries)
|
RecordingCount = recordings.Count(i => !i.RecordingInfo.IsSports && !i.RecordingInfo.IsNews && !i.RecordingInfo.IsMovie && !i.RecordingInfo.IsKids && !i.RecordingInfo.IsSeries)
|
||||||
});
|
});
|
||||||
|
|
||||||
groups = groups
|
groups = groups
|
||||||
|
@ -1841,7 +1911,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
|
||||||
group.Id = group.Name.ToLower().GetMD5().ToString("N");
|
group.Id = group.Name.ToLower().GetMD5().ToString("N");
|
||||||
}
|
}
|
||||||
|
|
||||||
return new QueryResult<RecordingGroupDto>
|
return new QueryResult<BaseItemDto>
|
||||||
{
|
{
|
||||||
Items = groups.ToArray(),
|
Items = groups.ToArray(),
|
||||||
TotalRecordCount = groups.Count
|
TotalRecordCount = groups.Count
|
||||||
|
|
|
@ -790,5 +790,6 @@
|
||||||
"OptionEnableFullscreen": "Enable Fullscreen",
|
"OptionEnableFullscreen": "Enable Fullscreen",
|
||||||
"ButtonServer": "Server",
|
"ButtonServer": "Server",
|
||||||
"HeaderAdmin": "Admin",
|
"HeaderAdmin": "Admin",
|
||||||
"HeaderLibrary": "Library"
|
"HeaderLibrary": "Library",
|
||||||
|
"HeaderMedia": "Media"
|
||||||
}
|
}
|
||||||
|
|
|
@ -50,6 +50,7 @@ using MediaBrowser.Dlna.Main;
|
||||||
using MediaBrowser.Dlna.MediaReceiverRegistrar;
|
using MediaBrowser.Dlna.MediaReceiverRegistrar;
|
||||||
using MediaBrowser.Dlna.Ssdp;
|
using MediaBrowser.Dlna.Ssdp;
|
||||||
using MediaBrowser.LocalMetadata.Providers;
|
using MediaBrowser.LocalMetadata.Providers;
|
||||||
|
using MediaBrowser.LocalMetadata.Savers;
|
||||||
using MediaBrowser.MediaEncoding.BdInfo;
|
using MediaBrowser.MediaEncoding.BdInfo;
|
||||||
using MediaBrowser.MediaEncoding.Encoder;
|
using MediaBrowser.MediaEncoding.Encoder;
|
||||||
using MediaBrowser.MediaEncoding.Subtitles;
|
using MediaBrowser.MediaEncoding.Subtitles;
|
||||||
|
@ -449,7 +450,7 @@ namespace MediaBrowser.Server.Startup.Common
|
||||||
SyncManager = new SyncManager(LibraryManager, SyncRepository, ImageProcessor, LogManager.GetLogger("SyncManager"), UserManager, () => DtoService, this, TVSeriesManager, () => MediaEncoder, FileSystemManager, () => SubtitleEncoder, ServerConfigurationManager, UserDataManager, () => MediaSourceManager, JsonSerializer);
|
SyncManager = new SyncManager(LibraryManager, SyncRepository, ImageProcessor, LogManager.GetLogger("SyncManager"), UserManager, () => DtoService, this, TVSeriesManager, () => MediaEncoder, FileSystemManager, () => SubtitleEncoder, ServerConfigurationManager, UserDataManager, () => MediaSourceManager, JsonSerializer);
|
||||||
RegisterSingleInstance(SyncManager);
|
RegisterSingleInstance(SyncManager);
|
||||||
|
|
||||||
DtoService = new DtoService(LogManager.GetLogger("DtoService"), LibraryManager, UserDataManager, ItemRepository, ImageProcessor, ServerConfigurationManager, FileSystemManager, ProviderManager, () => ChannelManager, SyncManager, this, () => DeviceManager, () => MediaSourceManager);
|
DtoService = new DtoService(LogManager.GetLogger("DtoService"), LibraryManager, UserDataManager, ItemRepository, ImageProcessor, ServerConfigurationManager, FileSystemManager, ProviderManager, () => ChannelManager, SyncManager, this, () => DeviceManager, () => MediaSourceManager, () => LiveTvManager);
|
||||||
RegisterSingleInstance(DtoService);
|
RegisterSingleInstance(DtoService);
|
||||||
|
|
||||||
var encryptionManager = new EncryptionManager();
|
var encryptionManager = new EncryptionManager();
|
||||||
|
@ -989,7 +990,7 @@ namespace MediaBrowser.Server.Startup.Common
|
||||||
list.Add(typeof(DlnaEntryPoint).Assembly);
|
list.Add(typeof(DlnaEntryPoint).Assembly);
|
||||||
|
|
||||||
// Local metadata
|
// Local metadata
|
||||||
list.Add(typeof(AlbumXmlProvider).Assembly);
|
list.Add(typeof(BoxSetXmlSaver).Assembly);
|
||||||
|
|
||||||
// Xbmc
|
// Xbmc
|
||||||
list.Add(typeof(ArtistNfoProvider).Assembly);
|
list.Add(typeof(ArtistNfoProvider).Assembly);
|
||||||
|
|
Loading…
Reference in New Issue