michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #1923 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2016-07-06 15:46:35 -04:00 committed by GitHub
commit ecdfb3ceff
25 changed files with 390 additions and 324 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MediaBrowser.Api/Images/ImageService.cs
View File

@ -273,7 +273,9 @@ namespace MediaBrowser.Api.Images
{ {
var list = new List<ImageInfo>(); var list = new List<ImageInfo>();
foreach (var image in item.ImageInfos.Where(i => !item.AllowsMultipleImages(i.Type))) var itemImages = item.ImageInfos;
foreach (var image in itemImages.Where(i => !item.AllowsMultipleImages(i.Type)))
{ {
var info = GetImageInfo(item, image, null); var info = GetImageInfo(item, image, null);
@ -283,14 +285,14 @@ namespace MediaBrowser.Api.Images
} }
} }
foreach (var imageType in item.ImageInfos.Select(i => i.Type).Distinct().Where(item.AllowsMultipleImages)) foreach (var imageType in itemImages.Select(i => i.Type).Distinct().Where(item.AllowsMultipleImages))
{ {
var index = 0; var index = 0;
// Prevent implicitly captured closure // Prevent implicitly captured closure
var currentImageType = imageType; var currentImageType = imageType;
foreach (var image in item.ImageInfos.Where(i => i.Type == currentImageType)) foreach (var image in itemImages.Where(i => i.Type == currentImageType))
{ {
var info = GetImageInfo(item, image, index); var info = GetImageInfo(item, image, index);

3
MediaBrowser.Api/StartupWizardService.cs
View File

@ -114,11 +114,10 @@ namespace MediaBrowser.Api
private void SetWizardFinishValues(ServerConfiguration config) private void SetWizardFinishValues(ServerConfiguration config)
{ {
config.EnableLocalizedGuids = true; config.EnableLocalizedGuids = true;
config.EnableCustomPathSubFolders = true;
config.EnableStandaloneMusicKeys = true; config.EnableStandaloneMusicKeys = true;
config.EnableCaseSensitiveItemIds = true; config.EnableCaseSensitiveItemIds = true;
//config.EnableFolderView = true; //config.EnableFolderView = true;
config.SchemaVersion = 97; config.SchemaVersion = 107;
} }
public void Post(UpdateStartupConfiguration request) public void Post(UpdateStartupConfiguration request)

2
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@ -1878,7 +1878,7 @@ namespace MediaBrowser.Controller.Entities
return new ItemImageInfo return new ItemImageInfo
{ {
Path = path, Path = path,
DateModified = FileSystem.GetLastWriteTimeUtc(path), DateModified = chapter.ImageDateModified,
Type = imageType Type = imageType
}; };
} }

15
MediaBrowser.Controller/Entities/Book.cs
View File

@ -1,4 +1,5 @@
using MediaBrowser.Controller.Providers; using System;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Configuration; using MediaBrowser.Model.Configuration;
using System.Linq; using System.Linq;
using System.Runtime.Serialization; using System.Runtime.Serialization;
@ -17,7 +18,19 @@ namespace MediaBrowser.Controller.Entities
} }
} }
[IgnoreDataMember]
public string SeriesName { get; set; } public string SeriesName { get; set; }
public Guid? SeriesId { get; set; }
public string FindSeriesName()
{
return SeriesName;
}
public Guid? FindSeriesId()
{
return SeriesId;
}
public override bool CanDownload() public override bool CanDownload()
{ {

7
MediaBrowser.Controller/Entities/IHasSeries.cs
View File

@ -1,4 +1,6 @@
 
using System;
namespace MediaBrowser.Controller.Entities namespace MediaBrowser.Controller.Entities
{ {
public interface IHasSeries public interface IHasSeries
@ -7,6 +9,9 @@ namespace MediaBrowser.Controller.Entities
/// Gets the name of the series. /// Gets the name of the series.
/// </summary> /// </summary>
/// <value>The name of the series.</value> /// <value>The name of the series.</value>
string SeriesName { get; } string SeriesName { get; set; }
string FindSeriesName();
Guid? SeriesId { get; set; }
Guid? FindSeriesId();
} }
} }

60
MediaBrowser.Controller/Entities/TV/Episode.cs
View File

@ -13,7 +13,6 @@ namespace MediaBrowser.Controller.Entities.TV
/// </summary> /// </summary>
public class Episode : Video, IHasTrailers, IHasLookupInfo<EpisodeInfo>, IHasSeries public class Episode : Video, IHasTrailers, IHasLookupInfo<EpisodeInfo>, IHasSeries
{ {
public Episode() public Episode()
{ {
RemoteTrailers = new List<MediaUrl>(); RemoteTrailers = new List<MediaUrl>();
@ -25,11 +24,11 @@ namespace MediaBrowser.Controller.Entities.TV
public List<Guid> RemoteTrailerIds { get; set; } public List<Guid> RemoteTrailerIds { get; set; }
public List<MediaUrl> RemoteTrailers { get; set; } public List<MediaUrl> RemoteTrailers { get; set; }
/// <summary> /// <summary>
/// Gets the season in which it aired. /// Gets the season in which it aired.
/// </summary> /// </summary>
/// <value>The aired season.</value> /// <value>The aired season.</value>
public int? AirsBeforeSeasonNumber { get; set; } public int? AirsBeforeSeasonNumber { get; set; }
public int? AirsAfterSeasonNumber { get; set; } public int? AirsAfterSeasonNumber { get; set; }
public int? AirsBeforeEpisodeNumber { get; set; } public int? AirsBeforeEpisodeNumber { get; set; }
@ -166,13 +165,27 @@ namespace MediaBrowser.Controller.Entities.TV
} }
[IgnoreDataMember] [IgnoreDataMember]
public string SeriesName public string SeriesName { get; set; }
{
get [IgnoreDataMember]
{ public string SeasonName { get; set; }
var series = Series;
return series == null ? null : series.Name; public string FindSeasonName()
} {
var season = Season;
return season == null ? SeasonName : season.Name;
}
public string FindSeriesName()
{
var series = Series;
return series == null ? SeriesName : series.Name;
}
public Guid? FindSeasonId()
{
var season = Season;
return season == null ? (Guid?)null : season.Id;
} }
/// <summary> /// <summary>
@ -235,20 +248,13 @@ namespace MediaBrowser.Controller.Entities.TV
} }
[IgnoreDataMember] [IgnoreDataMember]
public Guid? SeasonId public Guid? SeasonId { get; set; }
{ public Guid? SeriesId { get; set; }
get
{ public Guid? FindSeriesId()
// First see if the parent is a Season {
var season = Season; var series = Series;
return series == null ? (Guid?)null : series.Id;
if (season != null)
{
return season.Id;
}
return null;
}
} }
public override IEnumerable<Guid> GetAncestorIds() public override IEnumerable<Guid> GetAncestorIds()

19
MediaBrowser.Controller/Entities/TV/Season.cs
View File

@ -235,13 +235,20 @@ namespace MediaBrowser.Controller.Entities.TV
} }
[IgnoreDataMember] [IgnoreDataMember]
public string SeriesName public string SeriesName { get; set; }
public Guid? SeriesId { get; set; }
public string FindSeriesName()
{ {
get var series = Series;
{ return series == null ? SeriesName : series.Name;
var series = Series; }
return series == null ? null : series.Name;
} public Guid? FindSeriesId()
{
var series = Series;
return series == null ? (Guid?)null : series.Id;
} }
/// <summary> /// <summary>

6
MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
View File

@ -49,12 +49,6 @@ namespace MediaBrowser.Model.Configuration
/// </summary> /// </summary>
/// <value>The cache path.</value> /// <value>The cache path.</value>
public string CachePath { get; set; } public string CachePath { get; set; }
/// <summary>
/// Gets or sets a value indicating whether [enable custom path sub folders].
/// </summary>
/// <value><c>true</c> if [enable custom path sub folders]; otherwise, <c>false</c>.</value>
public bool EnableCustomPathSubFolders { get; set; }
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="BaseApplicationConfiguration" /> class. /// Initializes a new instance of the <see cref="BaseApplicationConfiguration" /> class.

1
MediaBrowser.Model/Configuration/ServerConfiguration.cs
View File

@ -214,7 +214,6 @@ namespace MediaBrowser.Model.Configuration
Migrations = new string[] { }; Migrations = new string[] { };
SqliteCacheSize = 0; SqliteCacheSize = 0;
EnableCustomPathSubFolders = true;
EnableLocalizedGuids = true; EnableLocalizedGuids = true;
DisplaySpecialsWithinSeasons = true; DisplaySpecialsWithinSeasons = true;

10
MediaBrowser.Model/Dto/BaseItemDto.cs
View File

@ -954,6 +954,16 @@ namespace MediaBrowser.Model.Dto
get { return ImageTags != null && ImageTags.ContainsKey(ImageType.Thumb); } get { return ImageTags != null && ImageTags.ContainsKey(ImageType.Thumb); }
} }
/// <summary>
/// Gets a value indicating whether this instance has thumb.
/// </summary>
/// <value><c>true</c> if this instance has thumb; otherwise, <c>false</c>.</value>
[IgnoreDataMember]
public bool HasBackdrop
{
get { return (BackdropImageTags != null && BackdropImageTags.Count > 0) || (ParentBackdropImageTags != null && ParentBackdropImageTags.Count > 0); }
}
/// <summary> /// <summary>
/// Gets a value indicating whether this instance has primary image. /// Gets a value indicating whether this instance has primary image.
/// </summary> /// </summary>

4
MediaBrowser.Model/Entities/ChapterInfo.cs
View File

@ -1,4 +1,5 @@
 using System;
namespace MediaBrowser.Model.Entities namespace MediaBrowser.Model.Entities
{ {
/// <summary> /// <summary>
@ -23,5 +24,6 @@ namespace MediaBrowser.Model.Entities
/// </summary> /// </summary>
/// <value>The image path.</value> /// <value>The image path.</value>
public string ImagePath { get; set; } public string ImagePath { get; set; }
public DateTime ImageDateModified { get; set; }
} }
} }

2
MediaBrowser.Model/Querying/ItemFields.cs
View File

@ -197,6 +197,8 @@
/// </summary> /// </summary>
SeriesGenres, SeriesGenres,
SeriesPrimaryImage,
/// <summary> /// <summary>
/// The series studio /// The series studio
/// </summary> /// </summary>

4
MediaBrowser.Providers/TV/MissingEpisodeProvider.cs
View File

@ -429,7 +429,9 @@ namespace MediaBrowser.Providers.TV
IndexNumber = episodeNumber, IndexNumber = episodeNumber,
ParentIndexNumber = seasonNumber, ParentIndexNumber = seasonNumber,
Id = _libraryManager.GetNewItemId((series.Id + seasonNumber.ToString(_usCulture) + name), typeof(Episode)), Id = _libraryManager.GetNewItemId((series.Id + seasonNumber.ToString(_usCulture) + name), typeof(Episode)),
IsVirtualItem = true IsVirtualItem = true,
SeasonId = season == null ? (Guid?)null : season.Id,
SeriesId = series.Id
}; };
episode.SetParent(season); episode.SetParent(season);

6
MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
View File

@ -95,13 +95,9 @@ namespace MediaBrowser.Server.Implementations.Configuration
{ {
metadataPath = GetInternalMetadataPath(); metadataPath = GetInternalMetadataPath();
} }
else if (Configuration.EnableCustomPathSubFolders)
{
metadataPath = Path.Combine(Configuration.MetadataPath, "metadata");
}
else else
{ {
metadataPath = Configuration.MetadataPath; metadataPath = Path.Combine(Configuration.MetadataPath, "metadata");
} }
((ServerApplicationPaths)ApplicationPaths).InternalMetadataPath = metadataPath; ((ServerApplicationPaths)ApplicationPaths).InternalMetadataPath = metadataPath;

275
MediaBrowser.Server.Implementations/Dto/DtoService.cs
View File

@ -663,19 +663,12 @@ namespace MediaBrowser.Server.Implementations.Dto
dto.GameSystem = item.GameSystemName; dto.GameSystem = item.GameSystemName;
} }
private List<string> GetBackdropImageTags(BaseItem item, int limit) private List<string> GetImageTags(BaseItem item, List<ItemImageInfo> images)
{ {
return GetCacheTags(item, ImageType.Backdrop, limit).ToList(); return images
} .Select(p => GetImageCacheTag(item, p))
.Where(i => i != null)
private List<string> GetScreenshotImageTags(BaseItem item, int limit) .ToList();
{
var hasScreenshots = item as IHasScreenshots;
if (hasScreenshots == null)
{
return new List<string>();
}
return GetCacheTags(item, ImageType.Screenshot, limit).ToList();
} }
private IEnumerable<string> GetCacheTags(BaseItem item, ImageType type, int limit) private IEnumerable<string> GetCacheTags(BaseItem item, ImageType type, int limit)
@ -850,53 +843,6 @@ namespace MediaBrowser.Server.Implementations.Dto
} }
} }
/// <summary>
/// If an item does not any backdrops, this can be used to find the first parent that does have one
/// </summary>
/// <param name="item">The item.</param>
/// <param name="owner">The owner.</param>
/// <returns>BaseItem.</returns>
private BaseItem GetParentBackdropItem(BaseItem item, BaseItem owner)
{
var parent = item.GetParent() ?? owner;
while (parent != null)
{
if (parent.GetImages(ImageType.Backdrop).Any())
{
return parent;
}
parent = parent.GetParent();
}
return null;
}
/// <summary>
/// If an item does not have a logo, this can be used to find the first parent that does have one
/// </summary>
/// <param name="item">The item.</param>
/// <param name="type">The type.</param>
/// <param name="owner">The owner.</param>
/// <returns>BaseItem.</returns>
private BaseItem GetParentImageItem(BaseItem item, ImageType type, BaseItem owner)
{
var parent = item.GetParent() ?? owner;
while (parent != null)
{
if (parent.HasImage(type))
{
return parent;
}
parent = parent.GetParent();
}
return null;
}
/// <summary> /// <summary>
/// Gets the chapter info dto. /// Gets the chapter info dto.
/// </summary> /// </summary>
@ -917,7 +863,7 @@ namespace MediaBrowser.Server.Implementations.Dto
{ {
Path = chapterInfo.ImagePath, Path = chapterInfo.ImagePath,
Type = ImageType.Chapter, Type = ImageType.Chapter,
DateModified = _fileSystem.GetLastWriteTimeUtc(chapterInfo.ImagePath) DateModified = chapterInfo.ImageDateModified
}); });
} }
@ -1027,7 +973,7 @@ namespace MediaBrowser.Server.Implementations.Dto
var backdropLimit = options.GetImageLimit(ImageType.Backdrop); var backdropLimit = options.GetImageLimit(ImageType.Backdrop);
if (backdropLimit > 0) if (backdropLimit > 0)
{ {
dto.BackdropImageTags = GetBackdropImageTags(item, backdropLimit); dto.BackdropImageTags = GetImageTags(item, item.GetImages(ImageType.Backdrop).Take(backdropLimit).ToList());
} }
if (fields.Contains(ItemFields.ScreenshotImageTags)) if (fields.Contains(ItemFields.ScreenshotImageTags))
@ -1035,7 +981,7 @@ namespace MediaBrowser.Server.Implementations.Dto
var screenshotLimit = options.GetImageLimit(ImageType.Screenshot); var screenshotLimit = options.GetImageLimit(ImageType.Screenshot);
if (screenshotLimit > 0) if (screenshotLimit > 0)
{ {
dto.ScreenshotImageTags = GetScreenshotImageTags(item, screenshotLimit); dto.ScreenshotImageTags = GetImageTags(item, item.GetImages(ImageType.Screenshot).Take(screenshotLimit).ToList());
} }
} }
@ -1064,6 +1010,7 @@ namespace MediaBrowser.Server.Implementations.Dto
dto.Id = GetDtoId(item); dto.Id = GetDtoId(item);
dto.IndexNumber = item.IndexNumber; dto.IndexNumber = item.IndexNumber;
dto.ParentIndexNumber = item.ParentIndexNumber;
dto.IsFolder = item.IsFolder; dto.IsFolder = item.IsFolder;
dto.MediaType = item.MediaType; dto.MediaType = item.MediaType;
dto.LocationType = item.LocationType; dto.LocationType = item.LocationType;
@ -1076,15 +1023,11 @@ namespace MediaBrowser.Server.Implementations.Dto
dto.PreferredMetadataCountryCode = item.PreferredMetadataCountryCode; dto.PreferredMetadataCountryCode = item.PreferredMetadataCountryCode;
dto.PreferredMetadataLanguage = item.PreferredMetadataLanguage; dto.PreferredMetadataLanguage = item.PreferredMetadataLanguage;
var hasCriticRating = item as IHasCriticRating; dto.CriticRating = item.CriticRating;
if (hasCriticRating != null)
{
dto.CriticRating = hasCriticRating.CriticRating;
if (fields.Contains(ItemFields.CriticRatingSummary)) if (fields.Contains(ItemFields.CriticRatingSummary))
{ {
dto.CriticRatingSummary = hasCriticRating.CriticRatingSummary; dto.CriticRatingSummary = item.CriticRatingSummary;
}
} }
var hasTrailers = item as IHasTrailers; var hasTrailers = item as IHasTrailers;
@ -1127,23 +1070,7 @@ namespace MediaBrowser.Server.Implementations.Dto
if (fields.Contains(ItemFields.ShortOverview)) if (fields.Contains(ItemFields.ShortOverview))
{ {
var hasShortOverview = item as IHasShortOverview; dto.ShortOverview = item.ShortOverview;
if (hasShortOverview != null)
{
dto.ShortOverview = hasShortOverview.ShortOverview;
}
}
// If there are no backdrops, indicate what parent has them in case the Ui wants to allow inheritance
if (backdropLimit > 0 && dto.BackdropImageTags.Count == 0)
{
var parentWithBackdrop = GetParentBackdropItem(item, owner);
if (parentWithBackdrop != null)
{
dto.ParentBackdropItemId = GetDtoId(parentWithBackdrop);
dto.ParentBackdropImageTags = GetBackdropImageTags(parentWithBackdrop, backdropLimit);
}
} }
if (fields.Contains(ItemFields.ParentId)) if (fields.Contains(ItemFields.ParentId))
@ -1155,46 +1082,7 @@ namespace MediaBrowser.Server.Implementations.Dto
} }
} }
dto.ParentIndexNumber = item.ParentIndexNumber; AddInheritedImages(dto, item, options, owner);
// If there is no logo, indicate what parent has one in case the Ui wants to allow inheritance
if (!dto.HasLogo && options.GetImageLimit(ImageType.Logo) > 0)
{
var parentWithLogo = GetParentImageItem(item, ImageType.Logo, owner);
if (parentWithLogo != null)
{
dto.ParentLogoItemId = GetDtoId(parentWithLogo);
dto.ParentLogoImageTag = GetImageCacheTag(parentWithLogo, ImageType.Logo);
}
}
// If there is no art, indicate what parent has one in case the Ui wants to allow inheritance
if (!dto.HasArtImage && options.GetImageLimit(ImageType.Art) > 0)
{
var parentWithImage = GetParentImageItem(item, ImageType.Art, owner);
if (parentWithImage != null)
{
dto.ParentArtItemId = GetDtoId(parentWithImage);
dto.ParentArtImageTag = GetImageCacheTag(parentWithImage, ImageType.Art);
}
}
// If there is no thumb, indicate what parent has one in case the Ui wants to allow inheritance
if (!dto.HasThumb && options.GetImageLimit(ImageType.Thumb) > 0)
{
var parentWithImage = GetParentImageItem(item, ImageType.Thumb, owner);
if (parentWithImage != null)
{
dto.ParentThumbItemId = GetDtoId(parentWithImage);
dto.ParentThumbImageTag = GetImageCacheTag(parentWithImage, ImageType.Thumb);
}
}
if (fields.Contains(ItemFields.Path)) if (fields.Contains(ItemFields.Path))
{ {
@ -1426,42 +1314,38 @@ namespace MediaBrowser.Server.Implementations.Dto
dto.SeasonId = seasonId.Value.ToString("N"); dto.SeasonId = seasonId.Value.ToString("N");
} }
var episodeSeason = episode.Season; dto.SeasonName = episode.SeasonName;
if (episodeSeason != null)
var seriesId = episode.SeriesId;
if (seriesId.HasValue)
{ {
if (fields.Contains(ItemFields.SeasonName)) dto.SeriesId = seriesId.Value.ToString("N");
{
dto.SeasonName = episodeSeason.Name;
}
} }
var episodeSeries = episode.Series; Series episodeSeries = null;
if (episodeSeries != null) if (fields.Contains(ItemFields.SeriesGenres))
{ {
if (fields.Contains(ItemFields.SeriesGenres)) episodeSeries = episodeSeries ?? episode.Series;
if (episodeSeries != null)
{ {
dto.SeriesGenres = episodeSeries.Genres.ToList(); dto.SeriesGenres = episodeSeries.Genres.ToList();
} }
}
dto.SeriesId = GetDtoId(episodeSeries); if (fields.Contains(ItemFields.SeriesPrimaryImage))
{
if (fields.Contains(ItemFields.AirTime)) episodeSeries = episodeSeries ?? episode.Series;
{ if (episodeSeries != null)
dto.AirTime = episodeSeries.AirTime;
}
if (options.GetImageLimit(ImageType.Thumb) > 0)
{
dto.SeriesThumbImageTag = GetImageCacheTag(episodeSeries, ImageType.Thumb);
}
if (options.GetImageLimit(ImageType.Primary) > 0)
{ {
dto.SeriesPrimaryImageTag = GetImageCacheTag(episodeSeries, ImageType.Primary); dto.SeriesPrimaryImageTag = GetImageCacheTag(episodeSeries, ImageType.Primary);
} }
}
if (fields.Contains(ItemFields.SeriesStudio)) if (fields.Contains(ItemFields.SeriesStudio))
{
episodeSeries = episodeSeries ?? episode.Series;
if (episodeSeries != null)
{ {
dto.SeriesStudio = episodeSeries.Studios.FirstOrDefault(); dto.SeriesStudio = episodeSeries.Studios.FirstOrDefault();
} }
@ -1483,16 +1367,29 @@ namespace MediaBrowser.Server.Implementations.Dto
var season = item as Season; var season = item as Season;
if (season != null) if (season != null)
{ {
series = season.Series; dto.SeriesName = season.SeriesName;
if (series != null) var seriesId = season.SeriesId;
if (seriesId.HasValue)
{ {
dto.SeriesId = GetDtoId(series); dto.SeriesId = seriesId.Value.ToString("N");
dto.SeriesName = series.Name; }
dto.AirTime = series.AirTime;
dto.SeriesStudio = series.Studios.FirstOrDefault();
if (options.GetImageLimit(ImageType.Primary) > 0) series = null;
if (fields.Contains(ItemFields.SeriesStudio))
{
series = series ?? season.Series;
if (series != null)
{
dto.SeriesStudio = series.Studios.FirstOrDefault();
}
}
if (fields.Contains(ItemFields.SeriesPrimaryImage))
{
series = series ?? season.Series;
if (series != null)
{ {
dto.SeriesPrimaryImageTag = GetImageCacheTag(series, ImageType.Primary); dto.SeriesPrimaryImageTag = GetImageCacheTag(series, ImageType.Primary);
} }
@ -1543,6 +1440,70 @@ namespace MediaBrowser.Server.Implementations.Dto
} }
} }
private void AddInheritedImages(BaseItemDto dto, BaseItem item, DtoOptions options, BaseItem owner)
{
var logoLimit = options.GetImageLimit(ImageType.Logo);
var artLimit = options.GetImageLimit(ImageType.Art);
var thumbLimit = options.GetImageLimit(ImageType.Thumb);
var backdropLimit = options.GetImageLimit(ImageType.Backdrop);
if (logoLimit == 0 && artLimit == 0 && thumbLimit == 0 && backdropLimit == 0)
{
return;
}
BaseItem parent = null;
var isFirst = true;
while (((!dto.HasLogo && logoLimit > 0) || (!dto.HasArtImage && artLimit > 0) || (!dto.HasThumb && thumbLimit > 0) || parent is Series) &&
(parent = parent ?? (isFirst ? item.GetParent() ?? owner : parent)) != null)
{
if (logoLimit > 0 && !dto.HasLogo && dto.ParentLogoItemId == null)
{
var image = parent.GetImageInfo(ImageType.Logo, 0);
if (image != null)
{
dto.ParentLogoItemId = GetDtoId(parent);
dto.ParentLogoImageTag = GetImageCacheTag(parent, image);
}
}
if (artLimit > 0 && !dto.HasArtImage && dto.ParentArtItemId == null)
{
var image = parent.GetImageInfo(ImageType.Art, 0);
if (image != null)
{
dto.ParentArtItemId = GetDtoId(parent);
dto.ParentArtImageTag = GetImageCacheTag(parent, image);
}
}
if (thumbLimit > 0 && !dto.HasThumb && (dto.ParentThumbItemId == null || parent is Series))
{
var image = parent.GetImageInfo(ImageType.Thumb, 0);
if (image != null)
{
dto.ParentThumbItemId = GetDtoId(parent);
dto.ParentThumbImageTag = GetImageCacheTag(parent, image);
}
}
if (backdropLimit > 0 && !dto.HasBackdrop)
{
var images = parent.GetImages(ImageType.Backdrop).Take(backdropLimit).ToList();
if (images.Count > 0)
{
dto.ParentBackdropItemId = GetDtoId(parent);
dto.ParentBackdropImageTags = GetImageTags(parent, images);
}
}
isFirst = false;
parent = parent.GetParent();
}
}
private string GetMappedPath(IHasMetadata item) private string GetMappedPath(IHasMetadata item)
{ {
var path = item.Path; var path = item.Path;

8
MediaBrowser.Server.Implementations/Library/LibraryManager.cs
View File

@ -368,10 +368,10 @@ namespace MediaBrowser.Server.Implementations.Library
{ {
return; return;
} }
//if (!(item is Folder)) if (!(item is Folder))
//{ {
// return; return;
//} }
LibraryItemsCache.AddOrUpdate(id, item, delegate { return item; }); LibraryItemsCache.AddOrUpdate(id, item, delegate { return item; });
} }

37
MediaBrowser.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs
View File

@ -30,21 +30,38 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV
return null; return null;
} }
var season = parent as Season;
// Just in case the user decided to nest episodes.
// Not officially supported but in some cases we can handle it.
if (season == null)
{
season = parent.GetParents().OfType<Season>().FirstOrDefault();
}
// If the parent is a Season or Series, then this is an Episode if the VideoResolver returns something // If the parent is a Season or Series, then this is an Episode if the VideoResolver returns something
// Also handle flat tv folders // Also handle flat tv folders
if (season != null || args.HasParent<Series>() || string.Equals(args.GetCollectionType(), CollectionType.TvShows, StringComparison.OrdinalIgnoreCase)) if (string.Equals(args.GetCollectionType(), CollectionType.TvShows, StringComparison.OrdinalIgnoreCase))
{ {
var episode = ResolveVideo<Episode>(args, false); var episode = ResolveVideo<Episode>(args, false);
if (episode != null)
{
var season = parent as Season;
// Just in case the user decided to nest episodes.
// Not officially supported but in some cases we can handle it.
if (season == null)
{
season = parent.GetParents().OfType<Season>().FirstOrDefault();
}
var series = parent as Series;
if (series == null)
{
series = parent.GetParents().OfType<Series>().FirstOrDefault();
}
if (series != null)
{
episode.SeriesId = series.Id;
}
if (season != null)
{
episode.SeasonId = season.Id;
}
}
return episode; return episode;
} }

2
MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
View File

@ -1214,8 +1214,6 @@ namespace MediaBrowser.Server.Implementations.LiveTv
var item = await GetChannel(channelInfo.Item2, channelInfo.Item1, parentFolderId, cancellationToken).ConfigureAwait(false); var item = await GetChannel(channelInfo.Item2, channelInfo.Item1, parentFolderId, cancellationToken).ConfigureAwait(false);
list.Add(item); list.Add(item);
_libraryManager.RegisterItem(item);
} }
catch (OperationCanceledException) catch (OperationCanceledException)
{ {

2
MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs
View File

@ -152,6 +152,7 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder
} }
chapter.ImagePath = path; chapter.ImagePath = path;
chapter.ImageDateModified = _fileSystem.GetLastWriteTimeUtc(path);
changesMade = true; changesMade = true;
} }
catch (Exception ex) catch (Exception ex)
@ -170,6 +171,7 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder
else if (!string.Equals(path, chapter.ImagePath, StringComparison.OrdinalIgnoreCase)) else if (!string.Equals(path, chapter.ImagePath, StringComparison.OrdinalIgnoreCase))
{ {
chapter.ImagePath = path; chapter.ImagePath = path;
chapter.ImageDateModified = _fileSystem.GetLastWriteTimeUtc(path);
changesMade = true; changesMade = true;
} }
} }

93
MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs
View File

@ -142,52 +142,77 @@ namespace MediaBrowser.Server.Implementations.Persistence
} }
} }
private async Task UpdateToLatestSchema(CancellationToken cancellationToken, IProgress<double> progress) private Task UpdateToLatestSchema(CancellationToken cancellationToken, IProgress<double> progress)
{ {
var itemIds = _libraryManager.GetItemIds(new InternalItemsQuery return UpdateToLatestSchema(0, 0, null, cancellationToken, progress);
{ }
IsCurrentSchema = false,
ExcludeItemTypes = new[] { typeof(LiveTvProgram).Name }
});
var numComplete = 0; private async Task UpdateToLatestSchema(int queryStartIndex, int progressStartIndex, int? totalRecordCount, CancellationToken cancellationToken, IProgress<double> progress)
var numItems = itemIds.Count; {
IEnumerable<BaseItem> items;
int numItemsToSave;
var pageSize = 1000;
if (totalRecordCount.HasValue)
{
var list = _libraryManager.GetItemList(new InternalItemsQuery
{
IsCurrentSchema = false,
ExcludeItemTypes = new[] { typeof(LiveTvProgram).Name },
StartIndex = queryStartIndex,
Limit = pageSize
}).ToList();
items = list;
numItemsToSave = list.Count;
}
else
{
var itemsResult = _libraryManager.GetItemsResult(new InternalItemsQuery
{
IsCurrentSchema = false,
ExcludeItemTypes = new[] { typeof(LiveTvProgram).Name },
StartIndex = queryStartIndex,
Limit = pageSize
});
totalRecordCount = itemsResult.TotalRecordCount;
items = itemsResult.Items;
numItemsToSave = itemsResult.Items.Length;
}
var numItems = totalRecordCount.Value;
_logger.Debug("Upgrading schema for {0} items", numItems); _logger.Debug("Upgrading schema for {0} items", numItems);
foreach (var itemId in itemIds) if (numItemsToSave > 0)
{ {
cancellationToken.ThrowIfCancellationRequested(); try
if (itemId != Guid.Empty)
{ {
// Somehow some invalid data got into the db. It probably predates the boundary checking await _itemRepo.SaveItems(items, cancellationToken).ConfigureAwait(false);
var item = _libraryManager.GetItemById(itemId); }
catch (OperationCanceledException)
if (item != null) {
{ throw;
try }
{ catch (Exception ex)
await _itemRepo.SaveItem(item, cancellationToken).ConfigureAwait(false); {
} _logger.ErrorException("Error saving item", ex);
catch (OperationCanceledException)
{
throw;
}
catch (Exception ex)
{
_logger.ErrorException("Error saving item", ex);
}
}
} }
numComplete++; progressStartIndex += pageSize;
double percent = numComplete; double percent = progressStartIndex;
percent /= numItems; percent /= numItems;
progress.Report(percent * 100); progress.Report(percent * 100);
}
progress.Report(100); var newStartIndex = queryStartIndex + (pageSize - numItemsToSave);
await UpdateToLatestSchema(newStartIndex, progressStartIndex, totalRecordCount, cancellationToken, progress).ConfigureAwait(false);
}
else
{
progress.Report(100);
}
} }
private async Task CleanDeadItems(CancellationToken cancellationToken, IProgress<double> progress) private async Task CleanDeadItems(CancellationToken cancellationToken, IProgress<double> progress)

82
MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
View File

@ -95,7 +95,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
private IDbCommand _updateInheritedRatingCommand; private IDbCommand _updateInheritedRatingCommand;
private IDbCommand _updateInheritedTagsCommand; private IDbCommand _updateInheritedTagsCommand;
public const int LatestSchemaVersion = 97; public const int LatestSchemaVersion = 107;
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="SqliteItemRepository"/> class. /// Initializes a new instance of the <see cref="SqliteItemRepository"/> class.
@ -271,10 +271,15 @@ namespace MediaBrowser.Server.Implementations.Persistence
_connection.AddColumn(Logger, "TypedBaseItems", "IsVirtualItem", "BIT"); _connection.AddColumn(Logger, "TypedBaseItems", "IsVirtualItem", "BIT");
_connection.AddColumn(Logger, "TypedBaseItems", "SeriesName", "Text"); _connection.AddColumn(Logger, "TypedBaseItems", "SeriesName", "Text");
_connection.AddColumn(Logger, "TypedBaseItems", "UserDataKey", "Text"); _connection.AddColumn(Logger, "TypedBaseItems", "UserDataKey", "Text");
_connection.AddColumn(Logger, "TypedBaseItems", "SeasonName", "Text");
_connection.AddColumn(Logger, "TypedBaseItems", "SeasonId", "GUID");
_connection.AddColumn(Logger, "TypedBaseItems", "SeriesId", "GUID");
_connection.AddColumn(Logger, "UserDataKeys", "Priority", "INT"); _connection.AddColumn(Logger, "UserDataKeys", "Priority", "INT");
_connection.AddColumn(Logger, "ItemValues", "CleanValue", "Text"); _connection.AddColumn(Logger, "ItemValues", "CleanValue", "Text");
_connection.AddColumn(Logger, ChaptersTableName, "ImageDateModified", "DATETIME");
string[] postQueries = string[] postQueries =
{ {
@ -402,7 +407,11 @@ namespace MediaBrowser.Server.Implementations.Persistence
"Album", "Album",
"CriticRating", "CriticRating",
"CriticRatingSummary", "CriticRatingSummary",
"IsVirtualItem" "IsVirtualItem",
"SeriesName",
"SeasonName",
"SeasonId",
"SeriesId"
}; };
private readonly string[] _mediaStreamSaveColumns = private readonly string[] _mediaStreamSaveColumns =
@ -522,7 +531,10 @@ namespace MediaBrowser.Server.Implementations.Persistence
"Album", "Album",
"IsVirtualItem", "IsVirtualItem",
"SeriesName", "SeriesName",
"UserDataKey" "UserDataKey",
"SeasonName",
"SeasonId",
"SeriesId"
}; };
_saveItemCommand = _connection.CreateCommand(); _saveItemCommand = _connection.CreateCommand();
_saveItemCommand.CommandText = "replace into TypedBaseItems (" + string.Join(",", saveColumns.ToArray()) + ") values ("; _saveItemCommand.CommandText = "replace into TypedBaseItems (" + string.Join(",", saveColumns.ToArray()) + ") values (";
@ -581,6 +593,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
_saveChapterCommand.Parameters.Add(_saveChapterCommand, "@StartPositionTicks"); _saveChapterCommand.Parameters.Add(_saveChapterCommand, "@StartPositionTicks");
_saveChapterCommand.Parameters.Add(_saveChapterCommand, "@Name"); _saveChapterCommand.Parameters.Add(_saveChapterCommand, "@Name");
_saveChapterCommand.Parameters.Add(_saveChapterCommand, "@ImagePath"); _saveChapterCommand.Parameters.Add(_saveChapterCommand, "@ImagePath");
_saveChapterCommand.Parameters.Add(_saveChapterCommand, "@ImageDateModified");
// MediaStreams // MediaStreams
_deleteStreamsCommand = _connection.CreateCommand(); _deleteStreamsCommand = _connection.CreateCommand();
@ -944,7 +957,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
var hasSeries = item as IHasSeries; var hasSeries = item as IHasSeries;
if (hasSeries != null) if (hasSeries != null)
{ {
_saveItemCommand.GetParameter(index++).Value = hasSeries.SeriesName; _saveItemCommand.GetParameter(index++).Value = hasSeries.FindSeriesName();
} }
else else
{ {
@ -953,6 +966,27 @@ namespace MediaBrowser.Server.Implementations.Persistence
_saveItemCommand.GetParameter(index++).Value = item.GetUserDataKeys().FirstOrDefault(); _saveItemCommand.GetParameter(index++).Value = item.GetUserDataKeys().FirstOrDefault();
var episode = item as Episode;
if (episode != null)
{
_saveItemCommand.GetParameter(index++).Value = episode.FindSeasonName();
_saveItemCommand.GetParameter(index++).Value = episode.FindSeasonId();
}
else
{
_saveItemCommand.GetParameter(index++).Value = null;
_saveItemCommand.GetParameter(index++).Value = null;
}
if (hasSeries != null)
{
_saveItemCommand.GetParameter(index++).Value = hasSeries.FindSeriesId();
}
else
{
_saveItemCommand.GetParameter(index++).Value = null;
}
_saveItemCommand.Transaction = transaction; _saveItemCommand.Transaction = transaction;
_saveItemCommand.ExecuteNonQuery(); _saveItemCommand.ExecuteNonQuery();
@ -1375,6 +1409,36 @@ namespace MediaBrowser.Server.Implementations.Persistence
item.IsVirtualItem = reader.GetBoolean(58); item.IsVirtualItem = reader.GetBoolean(58);
} }
var hasSeries = item as IHasSeries;
if (hasSeries != null)
{
if (!reader.IsDBNull(59))
{
hasSeries.SeriesName = reader.GetString(59);
}
}
var episode = item as Episode;
if (episode != null)
{
if (!reader.IsDBNull(60))
{
episode.SeasonName = reader.GetString(60);
}
if (!reader.IsDBNull(61))
{
episode.SeasonId = reader.GetGuid(61);
}
}
if (hasSeries != null)
{
if (!reader.IsDBNull(62))
{
hasSeries.SeriesId = reader.GetGuid(62);
}
}
return item; return item;
} }
@ -1436,7 +1500,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
using (var cmd = _connection.CreateCommand()) using (var cmd = _connection.CreateCommand())
{ {
cmd.CommandText = "select StartPositionTicks,Name,ImagePath from " + ChaptersTableName + " where ItemId = @ItemId order by ChapterIndex asc"; cmd.CommandText = "select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId order by ChapterIndex asc";
cmd.Parameters.Add(cmd, "@ItemId", DbType.Guid).Value = id; cmd.Parameters.Add(cmd, "@ItemId", DbType.Guid).Value = id;
@ -1469,7 +1533,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
using (var cmd = _connection.CreateCommand()) using (var cmd = _connection.CreateCommand())
{ {
cmd.CommandText = "select StartPositionTicks,Name,ImagePath from " + ChaptersTableName + " where ItemId = @ItemId and ChapterIndex=@ChapterIndex"; cmd.CommandText = "select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId and ChapterIndex=@ChapterIndex";
cmd.Parameters.Add(cmd, "@ItemId", DbType.Guid).Value = id; cmd.Parameters.Add(cmd, "@ItemId", DbType.Guid).Value = id;
cmd.Parameters.Add(cmd, "@ChapterIndex", DbType.Int32).Value = index; cmd.Parameters.Add(cmd, "@ChapterIndex", DbType.Int32).Value = index;
@ -1507,6 +1571,11 @@ namespace MediaBrowser.Server.Implementations.Persistence
chapter.ImagePath = reader.GetString(2); chapter.ImagePath = reader.GetString(2);
} }
if (!reader.IsDBNull(3))
{
chapter.ImageDateModified = reader.GetDateTime(3).ToUniversalTime();
}
return chapter; return chapter;
} }
@ -1566,6 +1635,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
_saveChapterCommand.GetParameter(2).Value = chapter.StartPositionTicks; _saveChapterCommand.GetParameter(2).Value = chapter.StartPositionTicks;
_saveChapterCommand.GetParameter(3).Value = chapter.Name; _saveChapterCommand.GetParameter(3).Value = chapter.Name;
_saveChapterCommand.GetParameter(4).Value = chapter.ImagePath; _saveChapterCommand.GetParameter(4).Value = chapter.ImagePath;
_saveChapterCommand.GetParameter(5).Value = chapter.ImageDateModified;
_saveChapterCommand.Transaction = transaction; _saveChapterCommand.Transaction = transaction;

13
MediaBrowser.Server.Implementations/TV/TVSeriesManager.cs
View File

@ -50,6 +50,11 @@ namespace MediaBrowser.Server.Implementations.TV
} }
} }
if (string.IsNullOrWhiteSpace(presentationUniqueKey) && limit.HasValue)
{
limit = limit.Value + 10;
}
var items = _libraryManager.GetItemList(new InternalItemsQuery(user) var items = _libraryManager.GetItemList(new InternalItemsQuery(user)
{ {
IncludeItemTypes = new[] { typeof(Series).Name }, IncludeItemTypes = new[] { typeof(Series).Name },
@ -89,6 +94,11 @@ namespace MediaBrowser.Server.Implementations.TV
} }
} }
if (string.IsNullOrWhiteSpace(presentationUniqueKey) && limit.HasValue)
{
limit = limit.Value + 10;
}
var items = _libraryManager.GetItemList(new InternalItemsQuery(user) var items = _libraryManager.GetItemList(new InternalItemsQuery(user)
{ {
IncludeItemTypes = new[] { typeof(Series).Name }, IncludeItemTypes = new[] { typeof(Series).Name },
@ -115,7 +125,8 @@ namespace MediaBrowser.Server.Implementations.TV
.Where(i => i.Item1 != null && (!i.Item3 || !string.IsNullOrWhiteSpace(request.SeriesId))) .Where(i => i.Item1 != null && (!i.Item3 || !string.IsNullOrWhiteSpace(request.SeriesId)))
.OrderByDescending(i => i.Item2) .OrderByDescending(i => i.Item2)
.ThenByDescending(i => i.Item1.PremiereDate ?? DateTime.MinValue) .ThenByDescending(i => i.Item1.PremiereDate ?? DateTime.MinValue)
.Select(i => i.Item1); .Select(i => i.Item1)
.Take(request.Limit ?? int.MaxValue);
} }
private string GetUniqueSeriesKey(BaseItem series) private string GetUniqueSeriesKey(BaseItem series)

5
MediaBrowser.Server.Implementations/UserViews/CollectionFolderImageProvider.cs
View File

@ -54,11 +54,6 @@ namespace MediaBrowser.Server.Implementations.UserViews
{ {
return series; return series;
} }
var episodeSeason = episode.Season;
if (episodeSeason != null)
{
return episodeSeason;
}
return episode; return episode;
} }

5
MediaBrowser.Server.Implementations/UserViews/DynamicImageProvider.cs
View File

@ -86,11 +86,6 @@ namespace MediaBrowser.Server.Implementations.UserViews
{ {
return series; return series;
} }
var episodeSeason = episode.Season;
if (episodeSeason != null)
{
return episodeSeason;
}
return episode; return episode;
} }

45
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@ -1043,42 +1043,6 @@
<Content Include="dashboard-ui\userpassword.html"> <Content Include="dashboard-ui\userpassword.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\voice\commands\controlcommands.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\voice\commands\disablecommands.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\voice\commands\enablecommands.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\voice\commands\playcommands.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\voice\commands\searchcommands.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\voice\commands\showcommands.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\voice\commands\togglecommands.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\voice\grammarprocessor.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\voice\voicedialog.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\voice\voice.css">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\voice\voice.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\voice\voicecommands.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\wizardagreement.html"> <Content Include="dashboard-ui\wizardagreement.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
@ -1674,15 +1638,6 @@
<Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.popup.js"> <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.popup.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<None Include="dashboard-ui\voice\grammar\en-US.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="dashboard-ui\voice\grammar\grammar.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="dashboard-ui\voice\Readme.md">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<ItemGroup /> <ItemGroup />