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

comments

Browse Source
This commit is contained in:
Luke Pulverenti 2014-02-20 12:49:07 -05:00
parent 888b8d619a
commit 830c326c3e
2 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,6 @@
using MediaBrowser.Common.Extensions;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.Entities.Movies;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
@ -365,24 +364,23 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
/// <typeparam name="T"></typeparam>
/// <param name="movies">The movies.</param>
/// <returns>``0.</returns>
private T GetMultiFileMovie<T>(List<T> movies)
private T GetMultiFileMovie<T>(IEnumerable<T> movies)
where T : Video, new()
{
var multiPartMovies = movies.OrderBy(i => i.Path)
.Where(i => EntityResolutionHelper.IsMultiPartFile(i.Path))
.ToList();
var sortedMovies = movies.OrderBy(i => i.Path).ToList();
// They must all be part of the sequence
if (multiPartMovies.Count != movies.Count)
var firstMovie = sortedMovies[0];
// They must all be part of the sequence if we're going to consider it a multi-part movie
// Only support up to 8 (matches Plex), to help avoid incorrect detection
if (sortedMovies.All(i => EntityResolutionHelper.IsMultiPartFile(i.Path)) && sortedMovies.Count <= 8)
{
return null;
firstMovie.IsMultiPart = true;
return firstMovie;
}
var firstPart = multiPartMovies[0];
firstPart.IsMultiPart = true;
return firstPart;
return null;
}
/// <summary>

18
MediaBrowser.ServerApplication/ApplicationHost.cs
View File

@ -298,6 +298,24 @@ namespace MediaBrowser.ServerApplication
{
// Not there, no big deal
}
try
{
Directory.Delete(Path.Combine(ApplicationPaths.DataPath, "tmdb-tv"), true);
}
catch (IOException)
{
// Not there, no big deal
}
try
{
Directory.Delete(Path.Combine(ApplicationPaths.DataPath, "tmdb-collections"), true);
}
catch (IOException)
{
// Not there, no big deal
}
});
}