Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-21 21:20:39 +02:00
Code Issues 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
Show stats Download patch file Download diff file Expand all files Collapse all files

9
MediaBrowser.Controller/Entities/Video.cs
View file

@ -418,12 +418,13 @@ namespace MediaBrowser.Controller.Entities
{ {
IEnumerable<FileSystemInfo> files; IEnumerable<FileSystemInfo> files;
var path = Path;
var currentFilename = System.IO.Path.GetFileNameWithoutExtension(path) ?? string.Empty;
// Only support this for video files. For folder rips, they'll have to use the linking feature // Only support this for video files. For folder rips, they'll have to use the linking feature
if (VideoType == VideoType.VideoFile || VideoType == VideoType.Iso) 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 => files = fileSystemChildren.Where(i =>
{ {
if ((i.Attributes & FileAttributes.Directory) == FileAttributes.Directory) if ((i.Attributes & FileAttributes.Directory) == FileAttributes.Directory)
@ -433,7 +434,7 @@ namespace MediaBrowser.Controller.Entities
return !string.Equals(i.FullName, path, StringComparison.OrdinalIgnoreCase) && return !string.Equals(i.FullName, path, StringComparison.OrdinalIgnoreCase) &&
EntityResolutionHelper.IsVideoFile(i.FullName) && EntityResolutionHelper.IsVideoFile(i.FullName) &&
i.Name.StartsWith(currentFilename, StringComparison.OrdinalIgnoreCase); i.Name.StartsWith(filenamePrefix + " - ", StringComparison.OrdinalIgnoreCase);
}); });
} }
else else

5
MediaBrowser.Model/Querying/ItemFields.cs
View file

@ -51,6 +51,11 @@ namespace MediaBrowser.Model.Querying
/// </summary> /// </summary>
DisplayPreferencesId, DisplayPreferencesId,
/// <summary>
/// The display media type
/// </summary>
DisplayMediaType,
/// <summary> /// <summary>
/// The external urls /// The external urls
/// </summary> /// </summary>

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

@ -725,7 +725,11 @@ namespace MediaBrowser.Server.Implementations.Dto
dto.DateCreated = item.DateCreated; dto.DateCreated = item.DateCreated;
} }
dto.DisplayMediaType = item.DisplayMediaType; if (fields.Contains(ItemFields.DisplayMediaType))
{
dto.DisplayMediaType = item.DisplayMediaType;
}
dto.IsUnidentified = item.IsUnidentified; dto.IsUnidentified = item.IsUnidentified;
if (fields.Contains(ItemFields.Settings)) if (fields.Contains(ItemFields.Settings))
@ -1351,7 +1355,7 @@ namespace MediaBrowser.Server.Implementations.Dto
{ {
var name = ""; var name = "";
var stream = video.GetDefaultVideoStream(); var videoStream = video.GetDefaultVideoStream();
if (video.Video3DFormat.HasValue) if (video.Video3DFormat.HasValue)
{ {
@ -1393,44 +1397,42 @@ namespace MediaBrowser.Server.Implementations.Dto
} }
name = name.Trim(); 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();
name = name + " " + "4K"; }
name = name.Trim(); else if (videoStream.Width.Value >= 1900)
} {
else if (stream.Width.Value >= 1900) name = name + " " + "1080P";
{ name = name.Trim();
name = name + " " + "1080P"; }
name = name.Trim(); else if (videoStream.Width.Value >= 1270)
} {
else if (stream.Width.Value >= 1270) name = name + " " + "720P";
{ name = name.Trim();
name = name + " " + "720P"; }
name = name.Trim(); else if (videoStream.Width.Value >= 700)
} {
else if (stream.Width.Value >= 700) name = name + " " + "480p";
{ name = name.Trim();
name = name + " " + "480p"; }
name = name.Trim(); else
} {
else name = name + " " + "SD";
{ name = name.Trim();
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(); 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) private T GetMovieWithAlternateVersions<T>(IEnumerable<T> movies)
where T : Video, new() 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 // Cap this at five to help avoid incorrect matching
if (sortedMovies.Count > 5) if (sortedMovies.Count > 5)
@ -406,11 +406,11 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
var firstMovie = sortedMovies[0]; var firstMovie = sortedMovies[0];
var filenamePrefix = Path.GetFileNameWithoutExtension(firstMovie.Path); var filenamePrefix = Path.GetFileName(Path.GetDirectoryName(firstMovie.Path));
if (!string.IsNullOrWhiteSpace(filenamePrefix)) 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; firstMovie.HasLocalAlternateVersions = true;