shpaq/Prowlarr-Prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr.git synced 2025-09-27 20:44:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: (FL) Improve error message for service unavailable

Browse Source
This commit is contained in:
Bogdan
2024-01-16 04:57:22 +02:00
parent 8bddf753bb
commit 2960fc37d9
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/NzbDrone.Core/Indexers/Definitions/FileList/FileListApi.cs
View File

@@ -38,3 +38,8 @@ public class FileListTorrent
[JsonPropertyName("small_description")] [JsonPropertyName("small_description")]
public string SmallDescription { get; set; } public string SmallDescription { get; set; }
} }
public class FileListErrorResponse
{
public string Error { get; set; }
}

7
src/NzbDrone.Core/Indexers/Definitions/FileList/FileListParser.cs
View File

@@ -28,9 +28,14 @@ public class FileListParser : IParseIndexerResponse
throw new IndexerException(indexerResponse, "Unexpected response status {0} code from indexer request", indexerResponse.HttpResponse.StatusCode); throw new IndexerException(indexerResponse, "Unexpected response status {0} code from indexer request", indexerResponse.HttpResponse.StatusCode);
} }
if (indexerResponse.Content.StartsWith("{\"error2\"") && STJson.TryDeserialize<FileListErrorResponse>(indexerResponse.Content, out var errorResponse))
{
throw new IndexerException(indexerResponse, "Unexpected response from indexer request: {0}", errorResponse.Error);
}
if (!indexerResponse.HttpResponse.Headers.ContentType.Contains(HttpAccept.Json.Value)) if (!indexerResponse.HttpResponse.Headers.ContentType.Contains(HttpAccept.Json.Value))
{ {
throw new IndexerException(indexerResponse, $"Unexpected response header {indexerResponse.HttpResponse.Headers.ContentType} from indexer request, expected {HttpAccept.Json.Value}"); throw new IndexerException(indexerResponse, "Unexpected response header {0} from indexer request, expected {1}", indexerResponse.HttpResponse.Headers.ContentType, HttpAccept.Json.Value);
} }
var releaseInfos = new List<ReleaseInfo>(); var releaseInfos = new List<ReleaseInfo>();