mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-05 21:33:02 +02:00
3.2.28.2
This commit is contained in:
parent
f4765a87cc
commit
2e5db767f3
|
@ -149,12 +149,17 @@ namespace Emby.Server.Implementations.Collections
|
||||||
return GetCollectionsFolder(string.Empty);
|
return GetCollectionsFolder(string.Empty);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Task AddToCollection(Guid collectionId, string[] ids)
|
public Task AddToCollection(Guid collectionId, IEnumerable<string> ids)
|
||||||
{
|
{
|
||||||
return AddToCollection(collectionId, ids, true, new MetadataRefreshOptions(_fileSystem));
|
return AddToCollection(collectionId, ids, true, new MetadataRefreshOptions(_fileSystem));
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task AddToCollection(Guid collectionId, string[] ids, bool fireEvent, MetadataRefreshOptions refreshOptions)
|
public Task AddToCollection(Guid collectionId, IEnumerable<Guid> ids)
|
||||||
|
{
|
||||||
|
return AddToCollection(collectionId, ids.Select(i => i.ToString("N")), true, new MetadataRefreshOptions(_fileSystem));
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task AddToCollection(Guid collectionId, IEnumerable<string> ids, bool fireEvent, MetadataRefreshOptions refreshOptions)
|
||||||
{
|
{
|
||||||
var collection = _libraryManager.GetItemById(collectionId) as BoxSet;
|
var collection = _libraryManager.GetItemById(collectionId) as BoxSet;
|
||||||
|
|
||||||
|
@ -167,9 +172,9 @@ namespace Emby.Server.Implementations.Collections
|
||||||
var itemList = new List<BaseItem>();
|
var itemList = new List<BaseItem>();
|
||||||
var currentLinkedChildrenIds = collection.GetLinkedChildren().Select(i => i.Id).ToList();
|
var currentLinkedChildrenIds = collection.GetLinkedChildren().Select(i => i.Id).ToList();
|
||||||
|
|
||||||
foreach (var itemId in ids)
|
foreach (var id in ids)
|
||||||
{
|
{
|
||||||
var guidId = new Guid(itemId);
|
var guidId = new Guid(id);
|
||||||
var item = _libraryManager.GetItemById(guidId);
|
var item = _libraryManager.GetItemById(guidId);
|
||||||
|
|
||||||
if (string.IsNullOrWhiteSpace(item.Path))
|
if (string.IsNullOrWhiteSpace(item.Path))
|
||||||
|
@ -214,7 +219,12 @@ namespace Emby.Server.Implementations.Collections
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task RemoveFromCollection(Guid collectionId, string[] itemIds)
|
public Task RemoveFromCollection(Guid collectionId, IEnumerable<string> itemIds)
|
||||||
|
{
|
||||||
|
return RemoveFromCollection(collectionId, itemIds.Select(i => new Guid(i)));
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task RemoveFromCollection(Guid collectionId, IEnumerable<Guid> itemIds)
|
||||||
{
|
{
|
||||||
var collection = _libraryManager.GetItemById(collectionId) as BoxSet;
|
var collection = _libraryManager.GetItemById(collectionId) as BoxSet;
|
||||||
|
|
||||||
|
@ -226,9 +236,8 @@ namespace Emby.Server.Implementations.Collections
|
||||||
var list = new List<LinkedChild>();
|
var list = new List<LinkedChild>();
|
||||||
var itemList = new List<BaseItem>();
|
var itemList = new List<BaseItem>();
|
||||||
|
|
||||||
foreach (var itemId in itemIds)
|
foreach (var guidId in itemIds)
|
||||||
{
|
{
|
||||||
var guidId = new Guid(itemId);
|
|
||||||
var childItem = _libraryManager.GetItemById(guidId);
|
var childItem = _libraryManager.GetItemById(guidId);
|
||||||
|
|
||||||
var child = collection.LinkedChildren.FirstOrDefault(i => (i.ItemId.HasValue && i.ItemId.Value == guidId) || (childItem != null && string.Equals(childItem.Path, i.Path, StringComparison.OrdinalIgnoreCase)));
|
var child = collection.LinkedChildren.FirstOrDefault(i => (i.ItemId.HasValue && i.ItemId.Value == guidId) || (childItem != null && string.Equals(childItem.Path, i.Path, StringComparison.OrdinalIgnoreCase)));
|
||||||
|
|
|
@ -290,6 +290,7 @@ namespace Emby.Server.Implementations.Updates
|
||||||
|
|
||||||
protected PackageInfo[] FilterPackages(List<PackageInfo> packages)
|
protected PackageInfo[] FilterPackages(List<PackageInfo> packages)
|
||||||
{
|
{
|
||||||
|
|
||||||
foreach (var package in packages)
|
foreach (var package in packages)
|
||||||
{
|
{
|
||||||
package.versions = package.versions.Where(v => !string.IsNullOrWhiteSpace(v.sourceUrl))
|
package.versions = package.versions.Where(v => !string.IsNullOrWhiteSpace(v.sourceUrl))
|
||||||
|
|
|
@ -36,7 +36,7 @@ namespace MediaBrowser.Controller.Collections
|
||||||
/// <param name="collectionId">The collection identifier.</param>
|
/// <param name="collectionId">The collection identifier.</param>
|
||||||
/// <param name="itemIds">The item ids.</param>
|
/// <param name="itemIds">The item ids.</param>
|
||||||
/// <returns>Task.</returns>
|
/// <returns>Task.</returns>
|
||||||
Task AddToCollection(Guid collectionId, string[] itemIds);
|
Task AddToCollection(Guid collectionId, IEnumerable<string> itemIds);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Removes from collection.
|
/// Removes from collection.
|
||||||
|
@ -44,7 +44,10 @@ namespace MediaBrowser.Controller.Collections
|
||||||
/// <param name="collectionId">The collection identifier.</param>
|
/// <param name="collectionId">The collection identifier.</param>
|
||||||
/// <param name="itemIds">The item ids.</param>
|
/// <param name="itemIds">The item ids.</param>
|
||||||
/// <returns>Task.</returns>
|
/// <returns>Task.</returns>
|
||||||
Task RemoveFromCollection(Guid collectionId, string[] itemIds);
|
Task RemoveFromCollection(Guid collectionId, IEnumerable<string> itemIds);
|
||||||
|
|
||||||
|
Task AddToCollection(Guid collectionId, IEnumerable<Guid> itemIds);
|
||||||
|
Task RemoveFromCollection(Guid collectionId, IEnumerable<Guid> itemIds);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Collapses the items within box sets.
|
/// Collapses the items within box sets.
|
||||||
|
|
|
@ -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.735</version>
|
<version>3.0.736</version>
|
||||||
<title>Emby.Common</title>
|
<title>Emby.Common</title>
|
||||||
<authors>Emby Team</authors>
|
<authors>Emby 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.735</version>
|
<version>3.0.736</version>
|
||||||
<title>Emby.Server.Core</title>
|
<title>Emby.Server.Core</title>
|
||||||
<authors>Emby Team</authors>
|
<authors>Emby 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 Emby Server.</description>
|
<description>Contains core components required to build plugins for Emby Server.</description>
|
||||||
<copyright>Copyright © Emby 2013</copyright>
|
<copyright>Copyright © Emby 2013</copyright>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency id="MediaBrowser.Common" version="3.0.735" />
|
<dependency id="MediaBrowser.Common" version="3.0.736" />
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</metadata>
|
</metadata>
|
||||||
<files>
|
<files>
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
[assembly: AssemblyVersion("3.2.28.1")]
|
[assembly: AssemblyVersion("3.2.28.2")]
|
||||||
|
|
Loading…
Reference in a new issue