mirror of
https://github.com/Sonarr/Sonarr.git
synced 2026-04-17 21:26:13 -04:00
Compare commits
3 Commits
v4.0.14.29
...
v4.0.15.29
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7db7567c8e | ||
|
|
2b2b973b30 | ||
|
|
bb954a7424 |
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@@ -22,7 +22,7 @@ env:
|
||||
FRAMEWORK: net6.0
|
||||
RAW_BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
|
||||
SONARR_MAJOR_VERSION: 4
|
||||
VERSION: 4.0.14
|
||||
VERSION: 4.0.15
|
||||
|
||||
jobs:
|
||||
backend:
|
||||
|
||||
@@ -305,7 +305,7 @@ namespace NzbDrone.Core.ImportLists
|
||||
{
|
||||
var seriesExists = allListItems.Where(l =>
|
||||
l.TvdbId == series.TvdbId ||
|
||||
l.ImdbId == series.ImdbId ||
|
||||
(l.ImdbId.IsNotNullOrWhiteSpace() && series.ImdbId.IsNotNullOrWhiteSpace() && l.ImdbId == series.ImdbId) ||
|
||||
l.TmdbId == series.TmdbId ||
|
||||
series.MalIds.Contains(l.MalId) ||
|
||||
series.AniListIds.Contains(l.AniListId)).ToList();
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Text.Json.Serialization;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
namespace NzbDrone.Core.ImportLists.Trakt
|
||||
{
|
||||
@@ -17,7 +17,7 @@ namespace NzbDrone.Core.ImportLists.Trakt
|
||||
public string Title { get; set; }
|
||||
public int? Year { get; set; }
|
||||
public TraktSeriesIdsResource Ids { get; set; }
|
||||
[JsonPropertyName("aired_episodes")]
|
||||
[JsonProperty("aired_episodes")]
|
||||
public int AiredEpisodes { get; set; }
|
||||
}
|
||||
|
||||
@@ -44,11 +44,11 @@ namespace NzbDrone.Core.ImportLists.Trakt
|
||||
|
||||
public class RefreshRequestResponse
|
||||
{
|
||||
[JsonPropertyName("access_token")]
|
||||
[JsonProperty("access_token")]
|
||||
public string AccessToken { get; set; }
|
||||
[JsonPropertyName("expires_in")]
|
||||
[JsonProperty("expires_in")]
|
||||
public int ExpiresIn { get; set; }
|
||||
[JsonPropertyName("refresh_token")]
|
||||
[JsonProperty("refresh_token")]
|
||||
public string RefreshToken { get; set; }
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user