alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-21 01:24:44 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

initial support of multiple movies in folder

Browse Source
This commit is contained in:
Luke Pulverenti
2013-08-15 12:00:39 -04:00
parent 612b7e55d2
commit e934783b95
5 changed files with 76 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
View File

@@ -85,6 +85,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
var collectionType = args.Parent == null ? null : _libraryManager.FindCollectionType(args.Parent);
// Find movies with their own folders
if (isDirectory)
{
if (args.Path.IndexOf("[trailers]", StringComparison.OrdinalIgnoreCase) != -1 ||
@@ -115,7 +116,41 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
return FindMovie<Movie>(args.Path, args.FileSystemChildren);
}
return null;
// Find movies that are mixed in the same folder
if (args.Path.IndexOf("[trailers]", StringComparison.OrdinalIgnoreCase) != -1 ||
string.Equals(collectionType, CollectionType.Trailers, StringComparison.OrdinalIgnoreCase))
{
return ResolveVideo<Trailer>(args);
}
Video item = null;
if (args.Path.IndexOf("[musicvideos]", StringComparison.OrdinalIgnoreCase) != -1 ||
string.Equals(collectionType, CollectionType.MusicVideos, StringComparison.OrdinalIgnoreCase))
{
item = ResolveVideo<MusicVideo>(args);
}
if (args.Path.IndexOf("[adultvideos]", StringComparison.OrdinalIgnoreCase) != -1 ||
string.Equals(collectionType, CollectionType.AdultVideos, StringComparison.OrdinalIgnoreCase))
{
item = ResolveVideo<AdultVideo>(args);
}
// To find a movie file, the collection type must be movies or boxsets
// Otherwise we'll consider it a plain video and let the video resolver handle it
if (string.Equals(collectionType, CollectionType.Movies, StringComparison.OrdinalIgnoreCase) ||
string.Equals(collectionType, CollectionType.BoxSets, StringComparison.OrdinalIgnoreCase))
{
item = ResolveVideo<Movie>(args);
}
if (item != null)
{
item.IsInMixedFolder = true;
}
return item;
}
/// <summary>

26
MediaBrowser.Server.Implementations/Providers/ImageSaver.cs
View File

@@ -238,9 +238,29 @@ namespace MediaBrowser.Server.Implementations.Providers
filename += "." + extension.ToLower();
var path = (saveLocally && !string.IsNullOrEmpty(item.MetaLocation)) ?
Path.Combine(item.MetaLocation, filename) :
_remoteImageCache.GetResourcePath(item.GetType().FullName + item.Id, filename);
string path = null;
if (saveLocally)
{
var video = item as Video;
if (video != null && video.IsInMixedFolder)
{
var folder = Path.GetDirectoryName(video.Path);
path = Path.Combine(folder, Path.GetFileNameWithoutExtension(video.Path) + "-" + filename);
}
if (string.IsNullOrEmpty(path) && !string.IsNullOrEmpty(item.MetaLocation))
{
path = Path.Combine(item.MetaLocation, filename);
}
}
if (string.IsNullOrEmpty(path))
{
path = _remoteImageCache.GetResourcePath(item.GetType().FullName + item.Id, filename);
}
var parentPath = Path.GetDirectoryName(path);