alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-22 10:06:40 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

update media version naming convention

Browse Source
This commit is contained in:
Luke Pulverenti
2014-03-21 12:55:47 -04:00
parent 515d99721b
commit 9e82fc09ca
4 changed files with 47 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -725,7 +725,11 @@ namespace MediaBrowser.Server.Implementations.Dto
dto.DateCreated = item.DateCreated;
}
dto.DisplayMediaType = item.DisplayMediaType;
if (fields.Contains(ItemFields.DisplayMediaType))
{
dto.DisplayMediaType = item.DisplayMediaType;
}
dto.IsUnidentified = item.IsUnidentified;
if (fields.Contains(ItemFields.Settings))
@@ -1351,7 +1355,7 @@ namespace MediaBrowser.Server.Implementations.Dto
{
var name = "";
var stream = video.GetDefaultVideoStream();
var videoStream = video.GetDefaultVideoStream();
if (video.Video3DFormat.HasValue)
{
@@ -1393,44 +1397,42 @@ namespace MediaBrowser.Server.Implementations.Dto
}
name = name.Trim();
}
else if (video.VideoType == VideoType.VideoFile)
if (videoStream != null)
{
if (stream != null)
if (videoStream.Width.HasValue)
{
if (stream.Width.HasValue)
if (videoStream.Width.Value >= 3800)
{
if (stream.Width.Value >= 3800)
{
name = name + " " + "4K";
name = name.Trim();
}
else if (stream.Width.Value >= 1900)
{
name = name + " " + "1080P";
name = name.Trim();
}
else if (stream.Width.Value >= 1270)
{
name = name + " " + "720P";
name = name.Trim();
}
else if (stream.Width.Value >= 700)
{
name = name + " " + "480p";
name = name.Trim();
}
else
{
name = name + " " + "SD";
name = name.Trim();
}
name = name + " " + "4K";
name = name.Trim();
}
else if (videoStream.Width.Value >= 1900)
{
name = name + " " + "1080P";
name = name.Trim();
}
else if (videoStream.Width.Value >= 1270)
{
name = name + " " + "720P";
name = name.Trim();
}
else if (videoStream.Width.Value >= 700)
{
name = name + " " + "480p";
name = name.Trim();
}
else
{
name = name + " " + "SD";
name = name.Trim();
}
}
}
if (stream != null && !string.IsNullOrWhiteSpace(stream.Codec))
if (videoStream != null && !string.IsNullOrWhiteSpace(videoStream.Codec))
{
name = name + " " + stream.Codec.ToUpper();
name = name + " " + videoStream.Codec.ToUpper();
name = name.Trim();
}

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

@@ -396,7 +396,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
private T GetMovieWithAlternateVersions<T>(IEnumerable<T> movies)
where T : Video, new()
{
var sortedMovies = movies.OrderBy(i => i.Path.Length).ToList();
var sortedMovies = movies.OrderBy(i => i.Path).ToList();
// Cap this at five to help avoid incorrect matching
if (sortedMovies.Count > 5)
@@ -406,11 +406,11 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
var firstMovie = sortedMovies[0];
var filenamePrefix = Path.GetFileNameWithoutExtension(firstMovie.Path);
var filenamePrefix = Path.GetFileName(Path.GetDirectoryName(firstMovie.Path));
if (!string.IsNullOrWhiteSpace(filenamePrefix))
{
if (sortedMovies.Skip(1).All(i => Path.GetFileNameWithoutExtension(i.Path).StartsWith(filenamePrefix + " - ", StringComparison.OrdinalIgnoreCase)))
if (sortedMovies.All(i => Path.GetFileNameWithoutExtension(i.Path).StartsWith(filenamePrefix + " - ", StringComparison.OrdinalIgnoreCase)))
{
firstMovie.HasLocalAlternateVersions = true;