aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Controller')
-rw-r--r--MediaBrowser.Controller/Entities/BaseItem.cs53
-rw-r--r--MediaBrowser.Controller/Entities/Folder.cs42
-rw-r--r--MediaBrowser.Controller/Entities/Trailer.cs1
-rw-r--r--MediaBrowser.Controller/Entities/UserView.cs3
-rw-r--r--MediaBrowser.Controller/Entities/Video.cs254
-rw-r--r--MediaBrowser.Controller/Library/ILibraryManager.cs13
6 files changed, 127 insertions, 239 deletions
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index ca08cf1a1..5f1d45fc8 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -893,6 +893,28 @@ namespace MediaBrowser.Controller.Entities
return Id.ToString();
}
+ internal virtual bool IsValidFromResolver(BaseItem newItem)
+ {
+ var current = this;
+
+ var currentAsPlaceHolder = current as ISupportsPlaceHolders;
+
+ if (currentAsPlaceHolder != null)
+ {
+ var newHasPlaceHolder = newItem as ISupportsPlaceHolders;
+
+ if (newHasPlaceHolder != null)
+ {
+ if (currentAsPlaceHolder.IsPlaceHolder != newHasPlaceHolder.IsPlaceHolder)
+ {
+ return false;
+ }
+ }
+ }
+
+ return current.IsInMixedFolder == newItem.IsInMixedFolder;
+ }
+
/// <summary>
/// Gets the preferred metadata language.
/// </summary>
@@ -1288,7 +1310,7 @@ namespace MediaBrowser.Controller.Entities
/// <param name="resetPosition">if set to <c>true</c> [reset position].</param>
/// <returns>Task.</returns>
/// <exception cref="System.ArgumentNullException"></exception>
- public virtual async Task MarkPlayed(User user,
+ public virtual async Task MarkPlayed(User user,
DateTime? datePlayed,
bool resetPosition)
{
@@ -1726,5 +1748,34 @@ namespace MediaBrowser.Controller.Entities
}
}
}
+
+ protected Task RefreshMetadataForOwnedVideo(MetadataRefreshOptions options, string path, CancellationToken cancellationToken)
+ {
+ var newOptions = new MetadataRefreshOptions(options.DirectoryService)
+ {
+ ImageRefreshMode = options.ImageRefreshMode,
+ MetadataRefreshMode = options.MetadataRefreshMode,
+ ReplaceAllMetadata = options.ReplaceAllMetadata
+ };
+
+ var id = LibraryManager.GetNewItemId(path, typeof(Video));
+
+ // Try to retrieve it from the db. If we don't find it, use the resolved version
+ var video = LibraryManager.GetItemById(id) as Video;
+
+ if (video == null)
+ {
+ video = LibraryManager.ResolvePath(new FileInfo(path)) as Video;
+
+ newOptions.ForceSave = true;
+ }
+
+ if (video == null)
+ {
+ return Task.FromResult(true);
+ }
+
+ return video.RefreshMetadata(newOptions, cancellationToken);
+ }
}
}
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index ad90027de..8afa376b3 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -363,47 +363,7 @@ namespace MediaBrowser.Controller.Entities
private bool IsValidFromResolver(BaseItem current, BaseItem newItem)
{
- var currentAsVideo = current as Video;
-
- if (currentAsVideo != null)
- {
- var newAsVideo = newItem as Video;
-
- if (newAsVideo != null)
- {
- if (currentAsVideo.IsPlaceHolder != newAsVideo.IsPlaceHolder)
- {
- return false;
- }
- if (currentAsVideo.IsMultiPart != newAsVideo.IsMultiPart)
- {
- return false;
- }
- if (currentAsVideo.HasLocalAlternateVersions != newAsVideo.HasLocalAlternateVersions)
- {
- return false;
- }
- }
- }
- else
- {
- var currentAsPlaceHolder = current as ISupportsPlaceHolders;
-
- if (currentAsPlaceHolder != null)
- {
- var newHasPlaceHolder = newItem as ISupportsPlaceHolders;
-
- if (newHasPlaceHolder != null)
- {
- if (currentAsPlaceHolder.IsPlaceHolder != newHasPlaceHolder.IsPlaceHolder)
- {
- return false;
- }
- }
- }
- }
-
- return current.IsInMixedFolder == newItem.IsInMixedFolder;
+ return current.IsValidFromResolver(newItem);
}
/// <summary>
diff --git a/MediaBrowser.Controller/Entities/Trailer.cs b/MediaBrowser.Controller/Entities/Trailer.cs
index bbbf2358f..07173d26f 100644
--- a/MediaBrowser.Controller/Entities/Trailer.cs
+++ b/MediaBrowser.Controller/Entities/Trailer.cs
@@ -12,6 +12,7 @@ namespace MediaBrowser.Controller.Entities
/// <summary>
/// Class Trailer
/// </summary>
+ [Obsolete]
public class Trailer : Video, IHasCriticRating, IHasSoundtracks, IHasProductionLocations, IHasBudget, IHasTrailers, IHasKeywords, IHasTaglines, IHasMetascore, IHasLookupInfo<TrailerInfo>
{
public List<Guid> SoundtrackIds { get; set; }
diff --git a/MediaBrowser.Controller/Entities/UserView.cs b/MediaBrowser.Controller/Entities/UserView.cs
index 7674dc1d3..926ffa19c 100644
--- a/MediaBrowser.Controller/Entities/UserView.cs
+++ b/MediaBrowser.Controller/Entities/UserView.cs
@@ -63,8 +63,7 @@ namespace MediaBrowser.Controller.Entities
{
CollectionType.Books,
CollectionType.HomeVideos,
- CollectionType.Photos,
- CollectionType.Trailers
+ CollectionType.Photos
};
var collectionFolder = folder as ICollectionFolder;
diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs
index 1c59b8bfb..d58ae7109 100644
--- a/MediaBrowser.Controller/Entities/Video.cs
+++ b/MediaBrowser.Controller/Entities/Video.cs
@@ -1,7 +1,6 @@
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Persistence;
using MediaBrowser.Controller.Providers;
-using MediaBrowser.Controller.Resolvers;
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.MediaInfo;
@@ -19,24 +18,23 @@ namespace MediaBrowser.Controller.Entities
/// <summary>
/// Class Video
/// </summary>
- public class Video : BaseItem,
- IHasAspectRatio,
- IHasTags,
+ public class Video : BaseItem,
+ IHasAspectRatio,
+ IHasTags,
ISupportsPlaceHolders,
IHasMediaSources,
IHasShortOverview,
IHasPreferredMetadataLanguage,
IThemeMedia
{
- public bool IsMultiPart { get; set; }
- public bool HasLocalAlternateVersions { get; set; }
public Guid? PrimaryVersionId { get; set; }
- public List<Guid> AdditionalPartIds { get; set; }
- public List<Guid> LocalAlternateVersionIds { get; set; }
+ public List<string> AdditionalParts { get; set; }
+ public List<string> LocalAlternateVersions { get; set; }
+ public List<LinkedChild> LinkedAlternateVersions { get; set; }
public bool IsThemeMedia { get; set; }
-
+
public string FormatName { get; set; }
public long? Size { get; set; }
public string Container { get; set; }
@@ -56,12 +54,12 @@ namespace MediaBrowser.Controller.Entities
/// </summary>
/// <value>The timestamp.</value>
public TransportStreamTimestamp? Timestamp { get; set; }
-
+
public Video()
{
PlayableStreamFileNames = new List<string>();
- AdditionalPartIds = new List<Guid>();
- LocalAlternateVersionIds = new List<Guid>();
+ AdditionalParts = new List<string>();
+ LocalAlternateVersions = new List<string>();
Tags = new List<string>();
SubtitleFiles = new List<string>();
LinkedAlternateVersions = new List<LinkedChild>();
@@ -78,11 +76,31 @@ namespace MediaBrowser.Controller.Entities
{
get
{
- return LinkedAlternateVersions.Count + LocalAlternateVersionIds.Count + 1;
+ return LinkedAlternateVersions.Count + LocalAlternateVersions.Count + 1;
}
}
- public List<LinkedChild> LinkedAlternateVersions { get; set; }
+ [IgnoreDataMember]
+ public bool IsStacked
+ {
+ get { return AdditionalParts.Count > 0; }
+ }
+
+ [IgnoreDataMember]
+ public bool HasLocalAlternateVersions
+ {
+ get { return LocalAlternateVersions.Count > 0; }
+ }
+
+ public IEnumerable<Guid> GetAdditionalPartIds()
+ {
+ return AdditionalParts.Select(i => LibraryManager.GetNewItemId(i, typeof(Video)));
+ }
+
+ public IEnumerable<Guid> GetLocalAlternateVersionIds()
+ {
+ return LocalAlternateVersions.Select(i => LibraryManager.GetNewItemId(i, typeof(Video)));
+ }
/// <summary>
/// Gets the linked children.
@@ -90,7 +108,7 @@ namespace MediaBrowser.Controller.Entities
/// <returns>IEnumerable{BaseItem}.</returns>
public IEnumerable<Video> GetAlternateVersions()
{
- var filesWithinSameDirectory = LocalAlternateVersionIds
+ var filesWithinSameDirectory = GetLocalAlternateVersionIds()
.Select(i => LibraryManager.GetItemById(i))
.Where(i => i != null)
.OfType<Video>();
@@ -116,7 +134,7 @@ namespace MediaBrowser.Controller.Entities
/// <returns>IEnumerable{Video}.</returns>
public IEnumerable<Video> GetAdditionalParts()
{
- return AdditionalPartIds
+ return GetAdditionalPartIds()
.Select(i => LibraryManager.GetItemById(i))
.Where(i => i != null)
.OfType<Video>()
@@ -200,7 +218,7 @@ namespace MediaBrowser.Controller.Entities
{
get
{
- if (IsMultiPart)
+ if (IsStacked)
{
return System.IO.Path.GetDirectoryName(Path);
}
@@ -218,6 +236,27 @@ namespace MediaBrowser.Controller.Entities
}
}
+ internal override bool IsValidFromResolver(BaseItem newItem)
+ {
+ var current = this;
+
+ var newAsVideo = newItem as Video;
+
+ if (newAsVideo != null)
+ {
+ if (!current.AdditionalParts.SequenceEqual(newAsVideo.AdditionalParts, StringComparer.OrdinalIgnoreCase))
+ {
+ return false;
+ }
+ if (!current.LocalAlternateVersions.SequenceEqual(newAsVideo.LocalAlternateVersions, StringComparer.OrdinalIgnoreCase))
+ {
+ return false;
+ }
+ }
+
+ return base.IsValidFromResolver(newItem);
+ }
+
public string MainFeaturePlaylistName { get; set; }
/// <summary>
@@ -263,37 +302,34 @@ namespace MediaBrowser.Controller.Entities
{
var hasChanges = await base.RefreshedOwnedItems(options, fileSystemChildren, cancellationToken).ConfigureAwait(false);
+ if (IsStacked)
+ {
+ var tasks = AdditionalParts
+ .Select(i => RefreshMetadataForOwnedVideo(options, i, cancellationToken));
+
+ await Task.WhenAll(tasks).ConfigureAwait(false);
+ }
+
// Must have a parent to have additional parts or alternate versions
// In other words, it must be part of the Parent/Child tree
// The additional parts won't have additional parts themselves
if (LocationType == LocationType.FileSystem && Parent != null)
{
- if (IsMultiPart)
- {
- var additionalPartsChanged = await RefreshAdditionalParts(options, fileSystemChildren, cancellationToken).ConfigureAwait(false);
-
- if (additionalPartsChanged)
- {
- hasChanges = true;
- }
- }
- else
+ if (!IsStacked)
{
RefreshLinkedAlternateVersions();
- var additionalPartsChanged = await RefreshAlternateVersionsWithinSameDirectory(options, fileSystemChildren, cancellationToken).ConfigureAwait(false);
+ var tasks = LocalAlternateVersions
+ .Select(i => RefreshMetadataForOwnedVideo(options, i, cancellationToken));
- if (additionalPartsChanged)
- {
- hasChanges = true;
- }
+ await Task.WhenAll(tasks).ConfigureAwait(false);
}
}
return hasChanges;
}
- private bool RefreshLinkedAlternateVersions()
+ private void RefreshLinkedAlternateVersions()
{
foreach (var child in LinkedAlternateVersions)
{
@@ -303,111 +339,13 @@ namespace MediaBrowser.Controller.Entities
child.ItemId = null;
}
}
-
- return false;
- }
-
- /// <summary>
- /// Refreshes the additional parts.
- /// </summary>
- /// <param name="options">The options.</param>
- /// <param name="fileSystemChildren">The file system children.</param>
- /// <param name="cancellationToken">The cancellation token.</param>
- /// <returns>Task{System.Boolean}.</returns>
- private async Task<bool> RefreshAdditionalParts(MetadataRefreshOptions options, IEnumerable<FileSystemInfo> fileSystemChildren, CancellationToken cancellationToken)
- {
- var newItems = LoadAdditionalParts(fileSystemChildren, options.DirectoryService).ToList();
-
- var newItemIds = newItems.Select(i => i.Id).ToList();
-
- var itemsChanged = !AdditionalPartIds.SequenceEqual(newItemIds);
-
- var tasks = newItems.Select(i => i.RefreshMetadata(options, cancellationToken));
-
- await Task.WhenAll(tasks).ConfigureAwait(false);
-
- AdditionalPartIds = newItemIds;
-
- return itemsChanged;
- }
-
- /// <summary>
- /// Loads the additional parts.
- /// </summary>
- /// <returns>IEnumerable{Video}.</returns>
- private IEnumerable<Video> LoadAdditionalParts(IEnumerable<FileSystemInfo> fileSystemChildren, IDirectoryService directoryService)
- {
- var files = LibraryManager.GetAdditionalParts(Path, VideoType, fileSystemChildren);
-
- return LibraryManager.ResolvePaths<Video>(files, directoryService, null).Select(video =>
- {
- // Try to retrieve it from the db. If we don't find it, use the resolved version
- var dbItem = LibraryManager.GetItemById(video.Id) as Video;
-
- if (dbItem != null)
- {
- video = dbItem;
- }
-
- return video;
-
- // Sort them so that the list can be easily compared for changes
- }).OrderBy(i => i.Path).ToList();
- }
-
- private async Task<bool> RefreshAlternateVersionsWithinSameDirectory(MetadataRefreshOptions options, IEnumerable<FileSystemInfo> fileSystemChildren, CancellationToken cancellationToken)
- {
- var newItems = HasLocalAlternateVersions ?
- LoadAlternateVersionsWithinSameDirectory(fileSystemChildren, options.DirectoryService).ToList() :
- new List<Video>();
-
- var newItemIds = newItems.Select(i => i.Id).ToList();
-
- var itemsChanged = !LocalAlternateVersionIds.SequenceEqual(newItemIds);
-
- var tasks = newItems.Select(i => RefreshAlternateVersion(options, i, cancellationToken));
-
- await Task.WhenAll(tasks).ConfigureAwait(false);
-
- LocalAlternateVersionIds = newItemIds;
-
- return itemsChanged;
- }
-
- private Task RefreshAlternateVersion(MetadataRefreshOptions options, Video video, CancellationToken cancellationToken)
- {
- var currentImagePath = video.GetImagePath(ImageType.Primary);
- var ownerImagePath = this.GetImagePath(ImageType.Primary);
-
- var newOptions = new MetadataRefreshOptions(options.DirectoryService)
- {
- ImageRefreshMode = options.ImageRefreshMode,
- MetadataRefreshMode = options.MetadataRefreshMode,
- ReplaceAllMetadata = options.ReplaceAllMetadata
- };
-
- if (!string.Equals(currentImagePath, ownerImagePath, StringComparison.OrdinalIgnoreCase))
- {
- newOptions.ForceSave = true;
-
- if (string.IsNullOrWhiteSpace(ownerImagePath))
- {
- video.ImageInfos.Clear();
- }
- else
- {
- video.SetImagePath(ImageType.Primary, ownerImagePath);
- }
- }
-
- return video.RefreshMetadata(newOptions, cancellationToken);
}
public override async Task UpdateToRepository(ItemUpdateType updateReason, CancellationToken cancellationToken)
{
await base.UpdateToRepository(updateReason, cancellationToken).ConfigureAwait(false);
- foreach (var item in LocalAlternateVersionIds.Select(i => LibraryManager.GetItemById(i)))
+ foreach (var item in GetLocalAlternateVersionIds().Select(i => LibraryManager.GetItemById(i)))
{
item.ImageInfos = ImageInfos;
item.Overview = Overview;
@@ -422,56 +360,6 @@ namespace MediaBrowser.Controller.Entities
}
}
- /// <summary>
- /// Loads the additional parts.
- /// </summary>
- /// <returns>IEnumerable{Video}.</returns>
- private IEnumerable<Video> LoadAlternateVersionsWithinSameDirectory(IEnumerable<FileSystemInfo> fileSystemChildren, IDirectoryService directoryService)
- {
- IEnumerable<FileSystemInfo> files;
-
- // Only support this for video files. For folder rips, they'll have to use the linking feature
- if (VideoType == VideoType.VideoFile || VideoType == VideoType.Iso)
- {
- var path = Path;
-
- var filenamePrefix = System.IO.Path.GetFileName(System.IO.Path.GetDirectoryName(path));
-
- files = fileSystemChildren.Where(i =>
- {
- if ((i.Attributes & FileAttributes.Directory) == FileAttributes.Directory)
- {
- return false;
- }
-
- return !string.Equals(i.FullName, path, StringComparison.OrdinalIgnoreCase) &&
- LibraryManager.IsVideoFile(i.FullName) &&
- i.Name.StartsWith(filenamePrefix + " - ", StringComparison.OrdinalIgnoreCase);
- });
- }
- else
- {
- files = new List<FileSystemInfo>();
- }
-
- return LibraryManager.ResolvePaths<Video>(files, directoryService, null).Select(video =>
- {
- // Try to retrieve it from the db. If we don't find it, use the resolved version
- var dbItem = LibraryManager.GetItemById(video.Id) as Video;
-
- if (dbItem != null)
- {
- video = dbItem;
- }
-
- video.PrimaryVersionId = Id;
-
- return video;
-
- // Sort them so that the list can be easily compared for changes
- }).OrderBy(i => i.Path).ToList();
- }
-
public override IEnumerable<string> GetDeletePaths()
{
if (!IsInMixedFolder)
@@ -539,7 +427,7 @@ namespace MediaBrowser.Controller.Entities
var mediaStreams = ItemRepository.GetMediaStreams(new MediaStreamQuery { ItemId = i.Id }).ToList();
var locationType = i.LocationType;
-
+
var info = new MediaSourceInfo
{
Id = i.Id.ToString("N"),
diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs
index 0b2df9974..d20c611ad 100644
--- a/MediaBrowser.Controller/Library/ILibraryManager.cs
+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs
@@ -365,17 +365,6 @@ namespace MediaBrowser.Controller.Library
ItemLookupInfo ParseName(string name);
/// <summary>
- /// Gets the additional parts.
- /// </summary>
- /// <param name="file">The file.</param>
- /// <param name="type">The type.</param>
- /// <param name="files">The files.</param>
- /// <returns>IEnumerable&lt;System.String&gt;.</returns>
- IEnumerable<FileSystemInfo> GetAdditionalParts(string file,
- VideoType type,
- IEnumerable<FileSystemInfo> files);
-
- /// <summary>
/// Gets the new item identifier.
/// </summary>
/// <param name="key">The key.</param>
@@ -390,7 +379,7 @@ namespace MediaBrowser.Controller.Library
/// <param name="fileSystemChildren">The file system children.</param>
/// <param name="directoryService">The directory service.</param>
/// <returns>IEnumerable&lt;Trailer&gt;.</returns>
- IEnumerable<Trailer> FindTrailers(BaseItem owner, List<FileSystemInfo> fileSystemChildren,
+ IEnumerable<Video> FindTrailers(BaseItem owner, List<FileSystemInfo> fileSystemChildren,
IDirectoryService directoryService);
/// <summary>
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-04 21:07:20 +0000