Mirrors/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr.git synced 2024-09-17 15:02:34 +02:00
Code Issues Releases Wiki Activity

Fixed: Page Plex Watchlist results

Browse Source 
Fixes #8223
Fixes #8042
This commit is contained in:
Qstick 2023-03-29 18:43:28 -05:00
parent 15bafce8cc
commit ac26bcddd9
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/NzbDrone.Core/ImportLists/Plex/PlexImport.cs
View File

@ -28,6 +28,7 @@ public PlexImport(IPlexTvService plexTvService,
} }
public override string Name => "Plex Watchlist"; public override string Name => "Plex Watchlist";
public override int PageSize => 50;
public override bool Enabled => true; public override bool Enabled => true;
public override bool EnableAuto => false; public override bool EnableAuto => false;
@ -46,7 +47,7 @@ public override IParseImportListResponse GetParser()
public override IImportListRequestGenerator GetRequestGenerator() public override IImportListRequestGenerator GetRequestGenerator()
{ {
return new PlexListRequestGenerator(_plexTvService) return new PlexListRequestGenerator(_plexTvService, PageSize)
{ {
Settings = Settings Settings = Settings
}; };

11
src/NzbDrone.Core/ImportLists/Plex/PlexListRequestGenerator.cs
View File

@ -6,11 +6,13 @@ namespace NzbDrone.Core.ImportLists.Plex
public class PlexListRequestGenerator : IImportListRequestGenerator public class PlexListRequestGenerator : IImportListRequestGenerator
{ {
private readonly IPlexTvService _plexTvService; private readonly IPlexTvService _plexTvService;
private readonly int _pageSize;
public PlexListSettings Settings { get; set; } public PlexListSettings Settings { get; set; }
public PlexListRequestGenerator(IPlexTvService plexTvService) public PlexListRequestGenerator(IPlexTvService plexTvService, int pageSize)
{ {
_plexTvService = plexTvService; _plexTvService = plexTvService;
_pageSize = pageSize;
} }
public virtual ImportListPageableRequestChain GetMovies() public virtual ImportListPageableRequestChain GetMovies()
@ -24,9 +26,12 @@ public virtual ImportListPageableRequestChain GetMovies()
private IEnumerable<ImportListRequest> GetMoviesRequest() private IEnumerable<ImportListRequest> GetMoviesRequest()
{ {
var request = new ImportListRequest(_plexTvService.GetWatchlist(Settings.AccessToken)); var maxPages = 10;
yield return request; for (var page = 0; page < maxPages; page++)
{
yield return new ImportListRequest(_plexTvService.GetWatchlist(Settings.AccessToken, _pageSize, page * _pageSize));
}
} }
} }
} }

8
src/NzbDrone.Core/Notifications/Plex/PlexTv/PlexTvService.cs
View File

@ -15,7 +15,7 @@ public interface IPlexTvService
PlexTvSignInUrlResponse GetSignInUrl(string callbackUrl, int pinId, string pinCode); PlexTvSignInUrlResponse GetSignInUrl(string callbackUrl, int pinId, string pinCode);
string GetAuthToken(int pinId); string GetAuthToken(int pinId);
void Ping(string authToken); void Ping(string authToken);
HttpRequest GetWatchlist(string authToken); HttpRequest GetWatchlist(string authToken, int pageSize, int pageOffset);
} }
public class PlexTvService : IPlexTvService public class PlexTvService : IPlexTvService
@ -94,7 +94,7 @@ public void Ping(string authToken)
_cache.Get(authToken, () => _proxy.Ping(_configService.PlexClientIdentifier, authToken), TimeSpan.FromHours(24)); _cache.Get(authToken, () => _proxy.Ping(_configService.PlexClientIdentifier, authToken), TimeSpan.FromHours(24));
} }
public HttpRequest GetWatchlist(string authToken) public HttpRequest GetWatchlist(string authToken, int pageSize, int pageOffset)
{ {
Ping(authToken); Ping(authToken);
@ -110,7 +110,9 @@ public HttpRequest GetWatchlist(string authToken)
.AddQueryParam("includeFields", "title,type,year,ratingKey") .AddQueryParam("includeFields", "title,type,year,ratingKey")
.AddQueryParam("includeElements", "Guid") .AddQueryParam("includeElements", "Guid")
.AddQueryParam("sort", "watchlistedAt:desc") .AddQueryParam("sort", "watchlistedAt:desc")
.AddQueryParam("type", (int)PlexMediaType.Movie); .AddQueryParam("type", (int)PlexMediaType.Movie)
.AddQueryParam("X-Plex-Container-Size", pageSize)
.AddQueryParam("X-Plex-Container-Start", pageOffset);
if (!string.IsNullOrWhiteSpace(authToken)) if (!string.IsNullOrWhiteSpace(authToken))
{ {