updated nuget
This commit is contained in:
parent
cf989d6b26
commit
8b85a7bab1
|
@ -1,11 +0,0 @@
|
||||||
|
|
||||||
namespace MediaBrowser.Controller.Entities.Audio
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Class MusicAlbumDisc
|
|
||||||
/// </summary>
|
|
||||||
public class MusicAlbumDisc : Folder
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -75,7 +75,6 @@
|
||||||
<Compile Include="Entities\Book.cs" />
|
<Compile Include="Entities\Book.cs" />
|
||||||
<Compile Include="Notifications\Configuration\IServerConfigurationManager.cs" />
|
<Compile Include="Notifications\Configuration\IServerConfigurationManager.cs" />
|
||||||
<Compile Include="Dto\SessionInfoDtoBuilder.cs" />
|
<Compile Include="Dto\SessionInfoDtoBuilder.cs" />
|
||||||
<Compile Include="Entities\Audio\MusicAlbumDisc.cs" />
|
|
||||||
<Compile Include="Entities\Audio\MusicGenre.cs" />
|
<Compile Include="Entities\Audio\MusicGenre.cs" />
|
||||||
<Compile Include="Entities\Game.cs" />
|
<Compile Include="Entities\Game.cs" />
|
||||||
<Compile Include="Entities\GameGenre.cs" />
|
<Compile Include="Entities\GameGenre.cs" />
|
||||||
|
|
|
@ -21,6 +21,8 @@ namespace MediaBrowser.Model.ApiClient
|
||||||
{
|
{
|
||||||
public interface IApiClient : IDisposable
|
public interface IApiClient : IDisposable
|
||||||
{
|
{
|
||||||
|
event EventHandler ServerLocationChanged;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Occurs when [HTTP response received].
|
/// Occurs when [HTTP response received].
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -145,7 +145,7 @@ namespace MediaBrowser.Server.Implementations.Library
|
||||||
}
|
}
|
||||||
|
|
||||||
// Find genres, from non-audio items
|
// Find genres, from non-audio items
|
||||||
var genres = items.Where(i => !(i is Audio) && !(i is MusicAlbum) && !(i is MusicAlbumDisc) && !(i is MusicArtist) && !(i is MusicVideo) && !(i is Game))
|
var genres = items.Where(i => !(i is Audio) && !(i is MusicAlbum) && !(i is MusicArtist) && !(i is MusicVideo) && !(i is Game))
|
||||||
.SelectMany(i => i.Genres)
|
.SelectMany(i => i.Genres)
|
||||||
.Where(i => !string.IsNullOrEmpty(i))
|
.Where(i => !string.IsNullOrEmpty(i))
|
||||||
.Distinct(StringComparer.OrdinalIgnoreCase)
|
.Distinct(StringComparer.OrdinalIgnoreCase)
|
||||||
|
@ -171,7 +171,7 @@ namespace MediaBrowser.Server.Implementations.Library
|
||||||
}
|
}
|
||||||
|
|
||||||
// Find music genres
|
// Find music genres
|
||||||
var musicGenres = items.Where(i => (i is Audio) || (i is MusicAlbum) || (i is MusicAlbumDisc) || (i is MusicArtist) || (i is MusicVideo))
|
var musicGenres = items.Where(i => (i is Audio) || (i is MusicAlbum) || (i is MusicArtist) || (i is MusicVideo))
|
||||||
.SelectMany(i => i.Genres)
|
.SelectMany(i => i.Genres)
|
||||||
.Where(i => !string.IsNullOrEmpty(i))
|
.Where(i => !string.IsNullOrEmpty(i))
|
||||||
.Distinct(StringComparer.OrdinalIgnoreCase)
|
.Distinct(StringComparer.OrdinalIgnoreCase)
|
||||||
|
|
|
@ -1,37 +0,0 @@
|
||||||
using MediaBrowser.Controller.Entities.Audio;
|
|
||||||
using MediaBrowser.Controller.Library;
|
|
||||||
using MediaBrowser.Controller.Resolvers;
|
|
||||||
|
|
||||||
namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Class MusicAlbumDiscResolver
|
|
||||||
/// </summary>
|
|
||||||
public class MusicAlbumDiscResolver : ItemResolver<MusicAlbumDisc>
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Gets the priority.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The priority.</value>
|
|
||||||
public override ResolverPriority Priority
|
|
||||||
{
|
|
||||||
get { return ResolverPriority.Second; } // we need to be ahead of the generic folder resolver but behind the movie one
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Resolves the specified args.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="args">The args.</param>
|
|
||||||
/// <returns>MusicAlbum.</returns>
|
|
||||||
protected override MusicAlbumDisc Resolve(ItemResolveArgs args)
|
|
||||||
{
|
|
||||||
if (!args.IsDirectory) return null;
|
|
||||||
|
|
||||||
return args.Parent is MusicAlbum ? new MusicAlbumDisc
|
|
||||||
{
|
|
||||||
DisplayMediaType = "Disc"
|
|
||||||
|
|
||||||
} : null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -133,7 +133,6 @@
|
||||||
<Compile Include="Library\LuceneSearchEngine.cs" />
|
<Compile Include="Library\LuceneSearchEngine.cs" />
|
||||||
<Compile Include="Library\ResolverHelper.cs" />
|
<Compile Include="Library\ResolverHelper.cs" />
|
||||||
<Compile Include="Library\Resolvers\Audio\AudioResolver.cs" />
|
<Compile Include="Library\Resolvers\Audio\AudioResolver.cs" />
|
||||||
<Compile Include="Library\Resolvers\Audio\MusicAlbumDiscResolver.cs" />
|
|
||||||
<Compile Include="Library\Resolvers\Audio\MusicAlbumResolver.cs" />
|
<Compile Include="Library\Resolvers\Audio\MusicAlbumResolver.cs" />
|
||||||
<Compile Include="Library\Resolvers\Audio\MusicArtistResolver.cs" />
|
<Compile Include="Library\Resolvers\Audio\MusicArtistResolver.cs" />
|
||||||
<Compile Include="Library\Resolvers\BaseItemResolver.cs" />
|
<Compile Include="Library\Resolvers\BaseItemResolver.cs" />
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
|
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
|
||||||
<metadata>
|
<metadata>
|
||||||
<id>MediaBrowser.Common.Internal</id>
|
<id>MediaBrowser.Common.Internal</id>
|
||||||
<version>3.0.189</version>
|
<version>3.0.190</version>
|
||||||
<title>MediaBrowser.Common.Internal</title>
|
<title>MediaBrowser.Common.Internal</title>
|
||||||
<authors>Luke</authors>
|
<authors>Luke</authors>
|
||||||
<owners>ebr,Luke,scottisafool</owners>
|
<owners>ebr,Luke,scottisafool</owners>
|
||||||
|
@ -12,7 +12,7 @@
|
||||||
<description>Contains common components shared by Media Browser Theater and Media Browser Server. Not intended for plugin developer consumption.</description>
|
<description>Contains common components shared by Media Browser Theater and Media Browser Server. Not intended for plugin developer consumption.</description>
|
||||||
<copyright>Copyright © Media Browser 2013</copyright>
|
<copyright>Copyright © Media Browser 2013</copyright>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency id="MediaBrowser.Common" version="3.0.189" />
|
<dependency id="MediaBrowser.Common" version="3.0.190" />
|
||||||
<dependency id="NLog" version="2.0.1.2" />
|
<dependency id="NLog" version="2.0.1.2" />
|
||||||
<dependency id="ServiceStack.Text" version="3.9.55" />
|
<dependency id="ServiceStack.Text" version="3.9.55" />
|
||||||
<dependency id="SimpleInjector" version="2.3.0" />
|
<dependency id="SimpleInjector" version="2.3.0" />
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
|
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
|
||||||
<metadata>
|
<metadata>
|
||||||
<id>MediaBrowser.Common</id>
|
<id>MediaBrowser.Common</id>
|
||||||
<version>3.0.189</version>
|
<version>3.0.190</version>
|
||||||
<title>MediaBrowser.Common</title>
|
<title>MediaBrowser.Common</title>
|
||||||
<authors>Media Browser Team</authors>
|
<authors>Media Browser Team</authors>
|
||||||
<owners>ebr,Luke,scottisafool</owners>
|
<owners>ebr,Luke,scottisafool</owners>
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
|
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
|
||||||
<metadata>
|
<metadata>
|
||||||
<id>MediaBrowser.Server.Core</id>
|
<id>MediaBrowser.Server.Core</id>
|
||||||
<version>3.0.189</version>
|
<version>3.0.190</version>
|
||||||
<title>Media Browser.Server.Core</title>
|
<title>Media Browser.Server.Core</title>
|
||||||
<authors>Media Browser Team</authors>
|
<authors>Media Browser Team</authors>
|
||||||
<owners>ebr,Luke,scottisafool</owners>
|
<owners>ebr,Luke,scottisafool</owners>
|
||||||
|
@ -12,7 +12,7 @@
|
||||||
<description>Contains core components required to build plugins for Media Browser Server.</description>
|
<description>Contains core components required to build plugins for Media Browser Server.</description>
|
||||||
<copyright>Copyright © Media Browser 2013</copyright>
|
<copyright>Copyright © Media Browser 2013</copyright>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency id="MediaBrowser.Common" version="3.0.189" />
|
<dependency id="MediaBrowser.Common" version="3.0.190" />
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</metadata>
|
</metadata>
|
||||||
<files>
|
<files>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user