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

Set initial display media type at resolve time

Browse Source
This commit is contained in:
Luke Pulverenti
2013-06-13 14:17:42 -04:00
parent 7d0a478183
commit 8726b9ca95
10 changed files with 35 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
MediaBrowser.Server.Implementations/Library/LibraryManager.cs
View File

@@ -569,7 +569,19 @@ namespace MediaBrowser.Server.Implementations.Library
// Add in the plug-in folders
foreach (var child in PluginFolderCreators)
{
rootFolder.AddVirtualChild(child.GetFolder());
var folder = child.GetFolder();
if (string.IsNullOrEmpty(folder.DisplayMediaType))
{
folder.DisplayMediaType = "CollectionFolder";
}
if (folder.Id == Guid.Empty)
{
folder.Id = (folder.Path ?? folder.Name ?? folder.GetType().Name).GetMBId(folder.GetType());
}
rootFolder.AddVirtualChild(folder);
}
return rootFolder;

5
MediaBrowser.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
View File

@@ -30,7 +30,10 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
{
if (EntityResolutionHelper.IsAudioFile(args.Path))
{
return new Controller.Entities.Audio.Audio();
return new Controller.Entities.Audio.Audio
{
DisplayMediaType = "Song"
};
}
}

6
MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumDiscResolver.cs
View File

@@ -27,7 +27,11 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
{
if (!args.IsDirectory) return null;
return args.Parent is MusicAlbum ? new MusicAlbumDisc() : null;
return args.Parent is MusicAlbum ? new MusicAlbumDisc
{
DisplayMediaType = "Disc"
} : null;
}
}
}

6
MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
View File

@@ -35,7 +35,11 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
if (args.Parent.IsRoot) return null;
if (args.Parent is MusicAlbum) return null;
return IsMusicAlbum(args) ? new MusicAlbum() : null;
return IsMusicAlbum(args) ? new MusicAlbum
{
DisplayMediaType = "Album"
} : null;
}