Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New: Add Watched filter type to Trakt User Import List

This commit is contained in:
Daniel Martin Gonzalez 2023-10-17 08:58:05 +02:00 committed by GitHub
parent 03f5174a4b
commit a131c88d5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 133 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/NzbDrone.Core/ImportLists/Trakt/Popular/TraktPopularParser.cs
View File

@ -26,24 +26,24 @@ namespace NzbDrone.Core.ImportLists.Trakt.Popular
return listItems;
}
var jsonResponse = new List<TraktSeriesResource>();
var traktSeries = new List<TraktSeriesResource>();
if (_settings.TraktListType == (int)TraktPopularListType.Popular)
{
jsonResponse = STJson.Deserialize<List<TraktSeriesResource>>(_importResponse.Content);
traktSeries = STJson.Deserialize<List<TraktSeriesResource>>(_importResponse.Content);
}
else
{
jsonResponse = STJson.Deserialize<List<TraktResponse>>(_importResponse.Content).SelectList(c => c.Show);
traktSeries = STJson.Deserialize<List<TraktResponse>>(_importResponse.Content).SelectList(c => c.Show);
}
// no movies were return
if (jsonResponse == null)
// no series were returned
if (traktSeries == null)
{
return listItems;
}
foreach (var series in jsonResponse)
foreach (var series in traktSeries)
{
listItems.AddIfNotNull(new ImportListItemInfo()
{

27
src/NzbDrone.Core/ImportLists/Trakt/TraktAPI.cs
View File

@ -1,4 +1,5 @@
using Newtonsoft.Json;
using System.Collections.Generic;
using System.Text.Json.Serialization;
namespace NzbDrone.Core.ImportLists.Trakt
{
@ -16,6 +17,8 @@ namespace NzbDrone.Core.ImportLists.Trakt
public string Title { get; set; }
public int? Year { get; set; }
public TraktSeriesIdsResource Ids { get; set; }
[JsonPropertyName("aired_episodes")]
public int AiredEpisodes { get; set; }
}
public class TraktResponse
@ -23,13 +26,29 @@ namespace NzbDrone.Core.ImportLists.Trakt
public TraktSeriesResource Show { get; set; }
}
public class TraktWatchedEpisodeResource
{
public int? Plays { get; set; }
}
public class TraktWatchedSeasonResource
{
public int? Number { get; set; }
public List<TraktWatchedEpisodeResource> Episodes { get; set; }
}
public class TraktWatchedResponse : TraktResponse
{
public List<TraktWatchedSeasonResource> Seasons { get; set; }
}
public class RefreshRequestResponse
{
[JsonProperty("access_token")]
[JsonPropertyName("access_token")]
public string AccessToken { get; set; }
[JsonProperty("expires_in")]
[JsonPropertyName("expires_in")]
public int ExpiresIn { get; set; }
[JsonProperty("refresh_token")]
[JsonPropertyName("refresh_token")]
public string RefreshToken { get; set; }
}

12
src/NzbDrone.Core/ImportLists/Trakt/TraktParser.cs
View File

@ -22,20 +22,20 @@ namespace NzbDrone.Core.ImportLists.Trakt
return series;
}
var jsonResponse = STJson.Deserialize<List<TraktResponse>>(_importResponse.Content);
var traktResponses = STJson.Deserialize<List<TraktResponse>>(_importResponse.Content);
// no series were return
if (jsonResponse == null)
// no series were returned
if (traktResponses == null)
{
return series;
}
foreach (var show in jsonResponse)
foreach (var traktResponse in traktResponses)
{
series.AddIfNotNull(new ImportListItemInfo()
{
Title = show.Show.Title,
TvdbId = show.Show.Ids.Tvdb.GetValueOrDefault()
Title = traktResponse.Show.Title,
TvdbId = traktResponse.Show.Ids.Tvdb.GetValueOrDefault()
});
}

5
src/NzbDrone.Core/ImportLists/Trakt/User/TraktUserImport.cs
View File

@ -19,6 +19,11 @@ namespace NzbDrone.Core.ImportLists.Trakt.User
public override string Name => "Trakt User";
public override IParseImportListResponse GetParser()
{
return new TraktUserParser(Settings);
}
public override IImportListRequestGenerator GetRequestGenerator()
{
return new TraktUserRequestGenerator()

72
src/NzbDrone.Core/ImportLists/Trakt/User/TraktUserParser.cs Normal file
View File

@ -0,0 +1,72 @@
using System.Collections.Generic;
using System.Linq;
using NzbDrone.Common.Extensions;
using NzbDrone.Common.Serializer;
using NzbDrone.Core.Parser.Model;
namespace NzbDrone.Core.ImportLists.Trakt.User
{
public class TraktUserParser : TraktParser
{
private readonly TraktUserSettings _settings;
private ImportListResponse _importResponse;
public TraktUserParser(TraktUserSettings settings)
{
_settings = settings;
}
public override IList<ImportListItemInfo> ParseResponse(ImportListResponse importResponse)
{
_importResponse = importResponse;
var listItems = new List<ImportListItemInfo>();
if (!PreProcess(_importResponse))
{
return listItems;
}
var traktSeries = new List<TraktSeriesResource>();
if (_settings.TraktListType == (int)TraktUserListType.UserWatchedList)
{
var jsonWatchedResponse = STJson.Deserialize<List<TraktWatchedResponse>>(_importResponse.Content);
switch (_settings.TraktWatchedListType)
{
case (int)TraktUserWatchedListType.InProgress:
traktSeries = jsonWatchedResponse.Where(c => c.Seasons.Where(s => s.Number > 0).Sum(s => s.Episodes.Count) < c.Show.AiredEpisodes).SelectList(c => c.Show);
break;
case (int)TraktUserWatchedListType.CompletelyWatched:
traktSeries = jsonWatchedResponse.Where(c => c.Seasons.Where(s => s.Number > 0).Sum(s => s.Episodes.Count) == c.Show.AiredEpisodes).SelectList(c => c.Show);
break;
default:
traktSeries = jsonWatchedResponse.SelectList(c => c.Show);
break;
}
}
else
{
traktSeries = STJson.Deserialize<List<TraktResponse>>(_importResponse.Content).SelectList(c => c.Show);
}
// no series were returned
if (traktSeries == null)
{
return listItems;
}
foreach (var series in traktSeries)
{
listItems.AddIfNotNull(new ImportListItemInfo()
{
Title = series.Title,
TvdbId = series.Ids.Tvdb.GetValueOrDefault(),
});
}
return listItems;
}
}
}

2
src/NzbDrone.Core/ImportLists/Trakt/User/TraktUserRequestGenerator.cs
View File

@ -30,7 +30,7 @@ namespace NzbDrone.Core.ImportLists.Trakt.User
link += $"/users/{userName}/watchlist/shows?limit={Settings.Limit}";
break;
case (int)TraktUserListType.UserWatchedList:
link += $"/users/{userName}/watched/shows?limit={Settings.Limit}";
link += $"/users/{userName}/watched/shows?extended=full&limit={Settings.Limit}";
break;
case (int)TraktUserListType.UserCollectionList:
link += $"/users/{userName}/collection/shows?limit={Settings.Limit}";

7
src/NzbDrone.Core/ImportLists/Trakt/User/TraktUserSettings.cs
View File

@ -9,6 +9,7 @@ namespace NzbDrone.Core.ImportLists.Trakt.User
: base()
{
RuleFor(c => c.TraktListType).NotNull();
RuleFor(c => c.TraktWatchedListType).NotNull();
RuleFor(c => c.AuthUser).NotEmpty();
}
}
@ -20,12 +21,16 @@ namespace NzbDrone.Core.ImportLists.Trakt.User
public TraktUserSettings()
{
TraktListType = (int)TraktUserListType.UserWatchList;
TraktWatchedListType = (int)TraktUserWatchedListType.All;
}
[FieldDefinition(1, Label = "List Type", Type = FieldType.Select, SelectOptions = typeof(TraktUserListType), HelpText = "Type of list you're seeking to import from")]
public int TraktListType { get; set; }
[FieldDefinition(2, Label = "Username", HelpText = "Username for the List to import from (empty to use Auth User)")]
[FieldDefinition(2, Label = "Watched List Filter", Type = FieldType.Select, SelectOptions = typeof(TraktUserWatchedListType), HelpText = "If List Type is Watched. Series do you want to import from")]
public int TraktWatchedListType { get; set; }
[FieldDefinition(3, Label = "Username", HelpText = "Username for the List to import from (empty to use Auth User)")]
public string Username { get; set; }
}
}

14
src/NzbDrone.Core/ImportLists/Trakt/User/TraktUserWatchedListType.cs Normal file
View File

@ -0,0 +1,14 @@
using System.Runtime.Serialization;
namespace NzbDrone.Core.ImportLists.Trakt.User
{
public enum TraktUserWatchedListType
{
[EnumMember(Value = "All")]
All = 0,
[EnumMember(Value = "In Progress")]
InProgress = 1,
[EnumMember(Value = "100% Watched")]
CompletelyWatched = 2
}
}