tedkulp/Readarr
1
0
Fork 0
mirror of https://github.com/Readarr/Readarr.git synced 2026-04-17 21:25:39 -04:00
Code Issues Projects Releases Wiki Activity

Method, Variable, Class Renames in Readarr.Api

Browse Source
This commit is contained in:
Qstick
2020-05-15 17:22:44 -04:00
committed by ta264
parent 8080d375d0
commit ee4e44b81a
91 changed files with 945 additions and 948 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Readarr.Api.V1/Queue/QueueDetailsModule.cs
View File

@@ -27,8 +27,8 @@ namespace Readarr.Api.V1.Queue
private List<QueueResource> GetQueue()
{
var includeArtist = Request.GetBooleanQueryParameter("includeArtist");
var includeAlbum = Request.GetBooleanQueryParameter("includeAlbum", true);
var includeAuthor = Request.GetBooleanQueryParameter("includeAuthor");
var includeBook = Request.GetBooleanQueryParameter("includeBook", true);
var queue = _queueService.GetQueue();
var pending = _pendingReleaseService.GetPendingQueue();
var fullQueue = queue.Concat(pending);
@@ -38,7 +38,7 @@ namespace Readarr.Api.V1.Queue
if (authorIdQuery.HasValue)
{
return fullQueue.Where(q => q.Author?.Id == (int)authorIdQuery).ToResource(includeArtist, includeAlbum);
return fullQueue.Where(q => q.Author?.Id == (int)authorIdQuery).ToResource(includeAuthor, includeBook);
}
if (bookIdsQuery.HasValue)
@@ -49,10 +49,10 @@ namespace Readarr.Api.V1.Queue
.Select(e => Convert.ToInt32(e))
.ToList();
return fullQueue.Where(q => q.Book != null && bookIds.Contains(q.Book.Id)).ToResource(includeArtist, includeAlbum);
return fullQueue.Where(q => q.Book != null && bookIds.Contains(q.Book.Id)).ToResource(includeAuthor, includeBook);
}
return fullQueue.ToResource(includeArtist, includeAlbum);
return fullQueue.ToResource(includeAuthor, includeBook);
}
public void Handle(QueueUpdatedEvent message)

22
src/Readarr.Api.V1/Queue/QueueModule.cs
View File

@@ -38,20 +38,20 @@ namespace Readarr.Api.V1.Queue
private PagingResource<QueueResource> GetQueue(PagingResource<QueueResource> pagingResource)
{
var pagingSpec = pagingResource.MapToPagingSpec<QueueResource, NzbDrone.Core.Queue.Queue>("timeleft", SortDirection.Ascending);
var includeUnknownArtistItems = Request.GetBooleanQueryParameter("includeUnknownArtistItems");
var includeArtist = Request.GetBooleanQueryParameter("includeArtist");
var includeAlbum = Request.GetBooleanQueryParameter("includeAlbum");
var includeUnknownAuthorItems = Request.GetBooleanQueryParameter("includeUnknownAuthorItems");
var includeAuthor = Request.GetBooleanQueryParameter("includeAuthor");
var includeBook = Request.GetBooleanQueryParameter("includeBook");
return ApplyToPage((spec) => GetQueue(spec, includeUnknownArtistItems), pagingSpec, (q) => MapToResource(q, includeArtist, includeAlbum));
return ApplyToPage((spec) => GetQueue(spec, includeUnknownAuthorItems), pagingSpec, (q) => MapToResource(q, includeAuthor, includeBook));
}
private PagingSpec<NzbDrone.Core.Queue.Queue> GetQueue(PagingSpec<NzbDrone.Core.Queue.Queue> pagingSpec, bool includeUnknownArtistItems)
private PagingSpec<NzbDrone.Core.Queue.Queue> GetQueue(PagingSpec<NzbDrone.Core.Queue.Queue> pagingSpec, bool includeUnknownAuthorItems)
{
var ascending = pagingSpec.SortDirection == SortDirection.Ascending;
var orderByFunc = GetOrderByFunc(pagingSpec);
var queue = _queueService.GetQueue();
var filteredQueue = includeUnknownArtistItems ? queue : queue.Where(q => q.Author != null);
var filteredQueue = includeUnknownAuthorItems ? queue : queue.Where(q => q.Author != null);
var pending = _pendingReleaseService.GetPendingQueue();
var fullQueue = filteredQueue.Concat(pending).ToList();
IOrderedEnumerable<NzbDrone.Core.Queue.Queue> ordered;
@@ -122,11 +122,11 @@ namespace Readarr.Api.V1.Queue
return q => q.Author?.SortName;
case "title":
return q => q.Title;
case "album":
case "book":
return q => q.Book;
case "books.title":
case "book.title":
return q => q.Book?.Title;
case "album.releaseDate":
case "book.releaseDate":
return q => q.Book?.ReleaseDate;
case "quality":
return q => q.Quality;
@@ -138,9 +138,9 @@ namespace Readarr.Api.V1.Queue
}
}
private QueueResource MapToResource(NzbDrone.Core.Queue.Queue queueItem, bool includeArtist, bool includeAlbum)
private QueueResource MapToResource(NzbDrone.Core.Queue.Queue queueItem, bool includeAuthor, bool includeBook)
{
return queueItem.ToResource(includeArtist, includeAlbum);
return queueItem.ToResource(includeAuthor, includeBook);
}
public void Handle(QueueUpdatedEvent message)

16
src/Readarr.Api.V1/Queue/QueueResource.cs
View File

@@ -5,8 +5,8 @@ using NzbDrone.Common.Extensions;
using NzbDrone.Core.Download.TrackedDownloads;
using NzbDrone.Core.Indexers;
using NzbDrone.Core.Qualities;
using Readarr.Api.V1.Albums;
using Readarr.Api.V1.Artist;
using Readarr.Api.V1.Author;
using Readarr.Api.V1.Books;
using Readarr.Http.REST;
namespace Readarr.Api.V1.Queue
@@ -15,8 +15,8 @@ namespace Readarr.Api.V1.Queue
{
public int? AuthorId { get; set; }
public int? BookId { get; set; }
public ArtistResource Artist { get; set; }
public AlbumResource Album { get; set; }
public AuthorResource Author { get; set; }
public BookResource Book { get; set; }
public QualityModel Quality { get; set; }
public decimal Size { get; set; }
public string Title { get; set; }
@@ -50,8 +50,8 @@ namespace Readarr.Api.V1.Queue
Id = model.Id,
AuthorId = model.Author?.Id,
BookId = model.Book?.Id,
Artist = includeArtist && model.Author != null ? model.Author.ToResource() : null,
Album = includeAlbum && model.Book != null ? model.Book.ToResource() : null,
Author = includeArtist && model.Author != null ? model.Author.ToResource() : null,
Book = includeAlbum && model.Book != null ? model.Book.ToResource() : null,
Quality = model.Quality,
Size = model.Size,
Title = model.Title,
@@ -72,9 +72,9 @@ namespace Readarr.Api.V1.Queue
};
}
public static List<QueueResource> ToResource(this IEnumerable<NzbDrone.Core.Queue.Queue> models, bool includeArtist, bool includeAlbum)
public static List<QueueResource> ToResource(this IEnumerable<NzbDrone.Core.Queue.Queue> models, bool includeAuthor, bool includeBook)
{
return models.Select((m) => ToResource(m, includeArtist, includeAlbum)).ToList();
return models.Select((m) => ToResource(m, includeAuthor, includeBook)).ToList();
}
}
}