Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-21 21:20:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1647 from MediaBrowser/dev

Browse source 
fix tabs
This commit is contained in:
Luke 2016-04-13 16:57:00 -04:00
parent c72561176b b0379ec7f8
commit d63e68d356
10 changed files with 125 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
MediaBrowser.Api/TvShowsService.cs
View file

@ -123,7 +123,7 @@ namespace MediaBrowser.Api
}
[Route("/Shows/{Id}/Episodes", "GET", Summary = "Gets episodes for a tv season")]
public class GetEpisodes : IReturn<ItemsResult>, IHasItemFields
public class GetEpisodes : IReturn<ItemsResult>, IHasItemFields, IHasDtoOptions
{
/// <summary>
/// Gets or sets the user id.
@ -173,10 +173,19 @@ namespace MediaBrowser.Api
/// <value>The limit.</value>
[ApiMember(Name = "Limit", Description = "Optional. The maximum number of records to return", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
public int? Limit { get; set; }
[ApiMember(Name = "EnableImages", Description = "Optional, include image information in output", IsRequired = false, DataType = "boolean", ParameterType = "query", Verb = "GET")]
public bool? EnableImages { get; set; }
[ApiMember(Name = "ImageTypeLimit", Description = "Optional, the max number of images to return, per image type", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
public int? ImageTypeLimit { get; set; }
[ApiMember(Name = "EnableImageTypes", Description = "Optional. The image types to include in the output.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
public string EnableImageTypes { get; set; }
}
[Route("/Shows/{Id}/Seasons", "GET", Summary = "Gets seasons for a tv series")]
public class GetSeasons : IReturn<ItemsResult>, IHasItemFields
public class GetSeasons : IReturn<ItemsResult>, IHasItemFields, IHasDtoOptions
{
/// <summary>
/// Gets or sets the user id.
@ -206,6 +215,15 @@ namespace MediaBrowser.Api
[ApiMember(Name = "AdjacentTo", Description = "Optional. Return items that are siblings of a supplied item.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
public string AdjacentTo { get; set; }
[ApiMember(Name = "EnableImages", Description = "Optional, include image information in output", IsRequired = false, DataType = "boolean", ParameterType = "query", Verb = "GET")]
public bool? EnableImages { get; set; }
[ApiMember(Name = "ImageTypeLimit", Description = "Optional, the max number of images to return, per image type", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
public int? ImageTypeLimit { get; set; }
[ApiMember(Name = "EnableImageTypes", Description = "Optional. The image types to include in the output.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
public string EnableImageTypes { get; set; }
}
/// <summary>

2
MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
View file

@ -51,6 +51,8 @@ namespace MediaBrowser.Controller.MediaEncoding
/// <returns>Task{Stream}.</returns>
Task<Stream> ExtractVideoImage(string[] inputFiles, MediaProtocol protocol, Video3DFormat? threedFormat, TimeSpan? offset, CancellationToken cancellationToken);
Task<Stream> ExtractVideoImage(string[] inputFiles, MediaProtocol protocol, int? imageStreamIndex, CancellationToken cancellationToken);
/// <summary>
/// Extracts the video images on interval.
/// </summary>

8
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View file

@ -484,12 +484,16 @@ namespace MediaBrowser.MediaEncoding.Encoder
return ExtractImage(new[] { path }, imageStreamIndex, MediaProtocol.File, true, null, null, cancellationToken);
}
public Task<Stream> ExtractVideoImage(string[] inputFiles, MediaProtocol protocol, Video3DFormat? threedFormat,
TimeSpan? offset, CancellationToken cancellationToken)
public Task<Stream> ExtractVideoImage(string[] inputFiles, MediaProtocol protocol, Video3DFormat? threedFormat, TimeSpan? offset, CancellationToken cancellationToken)
{
return ExtractImage(inputFiles, null, protocol, false, threedFormat, offset, cancellationToken);
}
public Task<Stream> ExtractVideoImage(string[] inputFiles, MediaProtocol protocol, int? imageStreamIndex, CancellationToken cancellationToken)
{
return ExtractImage(inputFiles, imageStreamIndex, protocol, false, null, null, cancellationToken);
}
private async Task<Stream> ExtractImage(string[] inputFiles, int? imageStreamIndex, MediaProtocol protocol, bool isAudio,
Video3DFormat? threedFormat, TimeSpan? offset, CancellationToken cancellationToken)
{

8
MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
View file

@ -138,10 +138,14 @@ namespace MediaBrowser.MediaEncoding.Probing
var parts = iTunEXTC.Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries);
// Example
// mpaa|G|100|For crude humor
if (parts.Length == 4)
if (parts.Length > 1)
{
info.OfficialRating = parts[1];
info.OfficialRatingDescription = parts[3];
if (parts.Length > 3)
{
info.OfficialRatingDescription = parts[3];
}
}
}

22
MediaBrowser.Model/Dlna/StreamBuilder.cs
View file

@ -520,7 +520,7 @@ namespace MediaBrowser.Model.Dlna
{
if (StringHelper.EqualsIgnoreCase(targetAudioCodec, "ac3"))
{
defaultBitrate = 384000;
defaultBitrate = 448000;
}
else
{
@ -840,13 +840,25 @@ namespace MediaBrowser.Model.Dlna
private bool IsAudioEligibleForDirectPlay(MediaSourceInfo item, int? maxBitrate)
{
if (!maxBitrate.HasValue || (item.Bitrate.HasValue && item.Bitrate.Value <= maxBitrate.Value))
if (!maxBitrate.HasValue)
{
return true;
_logger.Info("Cannot direct play due to unknown supported bitrate");
return false;
}
_logger.Info("Bitrate exceeds DirectPlay limit");
return false;
if (!item.Bitrate.HasValue)
{
_logger.Info("Cannot direct play due to unknown content bitrate");
return false;
}
if (item.Bitrate.Value > maxBitrate.Value)
{
_logger.Info("Bitrate exceeds DirectPlay limit");
return false;
}
return true;
}
private void ValidateInput(VideoOptions options)

12
MediaBrowser.Providers/Manager/ProviderUtils.cs
View file

@ -10,9 +10,9 @@ namespace MediaBrowser.Providers.Manager
public static class ProviderUtils
{
public static void MergeBaseItemData<T>(MetadataResult<T> sourceResult,
MetadataResult<T> targetResult,
List<MetadataFields> lockedFields,
bool replaceData,
MetadataResult<T> targetResult,
List<MetadataFields> lockedFields,
bool replaceData,
bool mergeMetadataSettings)
where T : BaseItem
{
@ -89,7 +89,7 @@ namespace MediaBrowser.Providers.Manager
{
target.CustomRating = source.CustomRating;
}
if (!lockedFields.Contains(MetadataFields.Overview))
{
if (replaceData || string.IsNullOrEmpty(target.Overview))
@ -107,7 +107,7 @@ namespace MediaBrowser.Providers.Manager
{
if (replaceData || targetResult.People == null || targetResult.People.Count == 0)
{
targetResult.People = sourceResult.People ?? new List<PersonInfo>();
targetResult.People = sourceResult.People;
}
}
@ -238,7 +238,7 @@ namespace MediaBrowser.Providers.Manager
targetHasDisplayOrder.DisplayOrder = sourceHasDisplayOrder.DisplayOrder;
}
}
private static void MergeShortOverview(BaseItem source, BaseItem target, List<MetadataFields> lockedFields, bool replaceData)
{
var sourceHasShortOverview = source as IHasShortOverview;

3
MediaBrowser.Providers/MediaInfo/AudioImageProvider.cs
View file

@ -78,7 +78,8 @@ namespace MediaBrowser.Providers.MediaInfo
_fileSystem.CreateDirectory(Path.GetDirectoryName(path));
var imageStream = imageStreams.FirstOrDefault(i => (i.Comment ?? string.Empty).IndexOf("front", StringComparison.OrdinalIgnoreCase) != -1) ??
imageStreams.FirstOrDefault(i => (i.Comment ?? string.Empty).IndexOf("cover", StringComparison.OrdinalIgnoreCase) != -1);
imageStreams.FirstOrDefault(i => (i.Comment ?? string.Empty).IndexOf("cover", StringComparison.OrdinalIgnoreCase) != -1) ??
imageStreams.FirstOrDefault();
var imageStreamIndex = imageStream == null ? (int?)null : imageStream.Index;

57
MediaBrowser.Providers/MediaInfo/VideoImageProvider.cs
View file

@ -10,6 +10,8 @@ using MediaBrowser.Model.Logging;
using MediaBrowser.Model.MediaInfo;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using CommonIO;
@ -93,20 +95,59 @@ namespace MediaBrowser.Providers.MediaInfo
try
{
// If we know the duration, grab it from 10% into the video. Otherwise just 10 seconds in.
// Always use 10 seconds for dvd because our duration could be out of whack
var imageOffset = item.VideoType != VideoType.Dvd && item.RunTimeTicks.HasValue &&
item.RunTimeTicks.Value > 0
? TimeSpan.FromTicks(Convert.ToInt64(item.RunTimeTicks.Value * .1))
: TimeSpan.FromSeconds(10);
var protocol = item.LocationType == LocationType.Remote
? MediaProtocol.Http
: MediaProtocol.File;
var inputPath = MediaEncoderHelpers.GetInputArgument(_fileSystem, item.Path, protocol, isoMount, item.PlayableStreamFileNames);
var stream = await _mediaEncoder.ExtractVideoImage(inputPath, protocol, item.Video3DFormat, imageOffset, cancellationToken).ConfigureAwait(false);
var mediaStreams =
item.GetMediaSources(false)
.Take(1)
.SelectMany(i => i.MediaStreams)
.ToList();
var imageStreams =
mediaStreams
.Where(i => i.Type == MediaStreamType.EmbeddedImage)
.ToList();
var imageStream = imageStreams.FirstOrDefault(i => (i.Comment ?? string.Empty).IndexOf("front", StringComparison.OrdinalIgnoreCase) != -1) ??
imageStreams.FirstOrDefault(i => (i.Comment ?? string.Empty).IndexOf("cover", StringComparison.OrdinalIgnoreCase) != -1) ??
imageStreams.FirstOrDefault();
Stream stream;
if (imageStream != null)
{
// Instead of using the raw stream index, we need to use nth video/embedded image stream
var videoIndex = -1;
foreach (var mediaStream in mediaStreams)
{
if (mediaStream.Type == MediaStreamType.Video ||
mediaStream.Type == MediaStreamType.EmbeddedImage)
{
videoIndex++;
}
if (mediaStream == imageStream)
{
break;
}
}
stream = await _mediaEncoder.ExtractVideoImage(inputPath, protocol, videoIndex, cancellationToken).ConfigureAwait(false);
}
else
{
// If we know the duration, grab it from 10% into the video. Otherwise just 10 seconds in.
// Always use 10 seconds for dvd because our duration could be out of whack
var imageOffset = item.VideoType != VideoType.Dvd && item.RunTimeTicks.HasValue &&
item.RunTimeTicks.Value > 0
? TimeSpan.FromTicks(Convert.ToInt64(item.RunTimeTicks.Value * .1))
: TimeSpan.FromSeconds(10);
stream = await _mediaEncoder.ExtractVideoImage(inputPath, protocol, item.Video3DFormat, imageOffset, cancellationToken).ConfigureAwait(false);
}
return new DynamicImageResponse
{

13
MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs
View file

@ -22,6 +22,7 @@ using System.Globalization;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Controller.Entities.TV;
namespace MediaBrowser.Server.Implementations.EntryPoints.Notifications
{
@ -393,6 +394,18 @@ namespace MediaBrowser.Server.Implementations.EntryPoints.Notifications
public static string GetItemName(BaseItem item)
{
var name = item.Name;
var episode = item as Episode;
if (episode != null)
{
if (episode.IndexNumber.HasValue)
{
name = string.Format("Ep{0} - {1}", episode.IndexNumber.Value.ToString(CultureInfo.InvariantCulture), name);
}
if (episode.ParentIndexNumber.HasValue)
{
name = string.Format("S{0}, {1}", episode.ParentIndexNumber.Value.ToString(CultureInfo.InvariantCulture), name);
}
}
var hasSeries = item as IHasSeries;

6
MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
View file

@ -85,8 +85,6 @@ namespace MediaBrowser.XbmcMetadata.Parsers
/// <param name="cancellationToken">The cancellation token.</param>
private void Fetch(MetadataResult<T> item, string metadataFile, XmlReaderSettings settings, CancellationToken cancellationToken)
{
item.ResetPeople();
if (!SupportsUrlAfterClosingXmlTag)
{
using (var streamReader = BaseNfoSaver.GetStreamReader(metadataFile))
@ -94,6 +92,8 @@ namespace MediaBrowser.XbmcMetadata.Parsers
// Use XmlReader for best performance
using (var reader = XmlReader.Create(streamReader, settings))
{
item.ResetPeople();
reader.MoveToContent();
// Loop through each element
@ -113,6 +113,8 @@ namespace MediaBrowser.XbmcMetadata.Parsers
using (var streamReader = BaseNfoSaver.GetStreamReader(metadataFile))
{
item.ResetPeople();
// Need to handle a url after the xml data
// http://kodi.wiki/view/NFO_files/movies