diff --git a/MediaBrowser.Api/Library/LibraryService.cs b/MediaBrowser.Api/Library/LibraryService.cs
index 0476927d7f..10a3117a13 100644
--- a/MediaBrowser.Api/Library/LibraryService.cs
+++ b/MediaBrowser.Api/Library/LibraryService.cs
@@ -466,11 +466,13 @@ namespace MediaBrowser.Api.Library
/// Deletes the specified request.
///
/// The request.
- public Task Delete(DeleteItem request)
+ public void Delete(DeleteItem request)
{
var item = _libraryManager.GetItemById(request.Id);
- return _libraryManager.DeleteItem(item);
+ var task = _libraryManager.DeleteItem(item);
+
+ Task.WaitAll(task);
}
///
diff --git a/MediaBrowser.Api/Music/InstantMixService.cs b/MediaBrowser.Api/Music/InstantMixService.cs
index ff029d5b52..f342422426 100644
--- a/MediaBrowser.Api/Music/InstantMixService.cs
+++ b/MediaBrowser.Api/Music/InstantMixService.cs
@@ -34,6 +34,20 @@ namespace MediaBrowser.Api.Music
public string Name { get; set; }
}
+ [Route("/Artists/InstantMix", "GET", Summary = "Creates an instant playlist based on a given artist")]
+ public class GetInstantMixFromArtistId : BaseGetSimilarItems
+ {
+ [ApiMember(Name = "Id", Description = "The artist Id", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "GET")]
+ public string Id { get; set; }
+ }
+
+ [Route("/MusicGenres/InstantMix", "GET", Summary = "Creates an instant playlist based on a music genre")]
+ public class GetInstantMixFromMusicGenreId : BaseGetSimilarItems
+ {
+ [ApiMember(Name = "Id", Description = "The genre Id", IsRequired = true, DataType = "string", ParameterType = "querypath", Verb = "GET")]
+ public string Id { get; set; }
+ }
+
[Authenticated]
public class InstantMixService : BaseApiService
{
@@ -51,6 +65,28 @@ namespace MediaBrowser.Api.Music
_libraryManager = libraryManager;
}
+ public object Get(GetInstantMixFromArtistId request)
+ {
+ var item = (MusicArtist)_libraryManager.GetItemById(request.Id);
+
+ var user = _userManager.GetUserById(request.UserId.Value);
+
+ var items = _musicManager.GetInstantMixFromArtist(item.Name, user);
+
+ return GetResult(items, user, request);
+ }
+
+ public object Get(GetInstantMixFromMusicGenreId request)
+ {
+ var item = (MusicGenre)_libraryManager.GetItemById(request.Id);
+
+ var user = _userManager.GetUserById(request.UserId.Value);
+
+ var items = _musicManager.GetInstantMixFromGenres(new[] { item.Name }, user);
+
+ return GetResult(items, user, request);
+ }
+
public object Get(GetInstantMixFromSong request)
{
var item = (Audio)_libraryManager.GetItemById(request.Id);
diff --git a/MediaBrowser.Api/Sync/SyncService.cs b/MediaBrowser.Api/Sync/SyncService.cs
index 591b1abadd..9cf19d160b 100644
--- a/MediaBrowser.Api/Sync/SyncService.cs
+++ b/MediaBrowser.Api/Sync/SyncService.cs
@@ -87,9 +87,11 @@ namespace MediaBrowser.Api.Sync
return ToOptimizedResult(result);
}
- public Task Delete(CancelSyncJob request)
+ public void Delete(CancelSyncJob request)
{
- return _syncManager.CancelJob(request.Id);
+ var task = _syncManager.CancelJob(request.Id);
+
+ Task.WaitAll(task);
}
public async Task
/// The request.
- public async Task