github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-14 10:47:08 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed: Handle Gazelle NullRef (#447)

Browse source
This commit is contained in:
Qstick 2018-08-13 19:48:26 -04:00 • committed by GitHub
commit ef7d54a412
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/NzbDrone.Core/Indexers/Gazelle/Gazelle.cs
View file

@ -5,6 +5,9 @@ using NzbDrone.Core.Configuration;
using NzbDrone.Core.Parser;
using NzbDrone.Core.ThingiProvider;
using System.Collections.Generic;
using System.Linq;
using FluentValidation.Results;
using NzbDrone.Common.Extensions;
namespace NzbDrone.Core.Indexers.Gazelle
{
@ -74,5 +77,12 @@ namespace NzbDrone.Core.Indexers.Gazelle
return settings;
}
protected override void Test(List<ValidationFailure> failures)
{
// Remove previous cookies when testing incase user or pwd change
_authCookieCache.Remove(Settings.BaseUrl.Trim().TrimEnd('/'));
base.Test(failures);
}
}
}

3
src/NzbDrone.Core/Indexers/Gazelle/GazelleApi.cs
View file

@ -1,5 +1,4 @@
using System;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
namespace NzbDrone.Core.Indexers.Gazelle

1
src/NzbDrone.Core/Indexers/Gazelle/GazelleParser.cs
View file

@ -1,6 +1,5 @@
using System.Collections.Generic;
using System.Net;
using Newtonsoft.Json;
using NzbDrone.Common.Http;
using NzbDrone.Core.Indexers.Exceptions;
using NzbDrone.Core.Parser.Model;

11
src/NzbDrone.Core/Indexers/Gazelle/GazelleRequestGenerator.cs
View file

@ -116,19 +116,16 @@ namespace NzbDrone.Core.Indexers.Gazelle
var response = HttpClient.Execute(authLoginRequest);
cookies = response.GetCookies();
AuthCookieCache.Set(authKey, cookies, new TimeSpan(7, 0, 0, 0, 0)); // re-auth every 7 days
requestBuilder.SetCookies(cookies);
}
else
{
requestBuilder.SetCookies(cookies);
AuthCookieCache.Set(authKey, cookies);
}
var index = GetIndex(cookies);
if (index.Status.IsNullOrWhiteSpace() || index.Status != "success")
if (index == null || index.Status.IsNullOrWhiteSpace() || index.Status != "success")
{
Logger.Debug("Gazelle authentication failed.");
AuthCookieCache.Remove(authKey);
throw new Exception("Failed to authenticate with Gazelle.");
}

1
src/NzbDrone.Core/Indexers/Gazelle/GazelleSettings.cs
View file

@ -1,7 +1,6 @@
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.Validation;
using System.Text.RegularExpressions;
namespace NzbDrone.Core.Indexers.Gazelle
{