From d4a347b2bab54d2ca8b13f8d116914b3a77c1285 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Sj=C3=B6berg?= <ga22be@live.se>
Date: Tue, 25 Apr 2023 06:54:12 +0200
Subject: [PATCH] Use BuildInfo.AppName for RARBG appId instead of hardcoded
 value

(cherry picked from commit 99c4f5b746bff6809c988f8b816e5135f5959ed7)

Closes #8387
---
 .../IndexerTests/RarbgTests/RarbgFixture.cs                 | 1 +
 src/NzbDrone.Core/Indexers/Rarbg/Rarbg.cs                   | 3 ++-
 src/NzbDrone.Core/Indexers/Rarbg/RarbgParser.cs             | 3 ++-
 src/NzbDrone.Core/Indexers/Rarbg/RarbgRequestGenerator.cs   | 2 +-
 src/NzbDrone.Core/Indexers/Rarbg/RarbgTokenProvider.cs      | 6 +++---
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/NzbDrone.Core.Test/IndexerTests/RarbgTests/RarbgFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/RarbgTests/RarbgFixture.cs
index fc4e6750e..22f6cd493 100644
--- a/src/NzbDrone.Core.Test/IndexerTests/RarbgTests/RarbgFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/RarbgTests/RarbgFixture.cs
@@ -5,6 +5,7 @@
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Indexers.Rarbg;
diff --git a/src/NzbDrone.Core/Indexers/Rarbg/Rarbg.cs b/src/NzbDrone.Core/Indexers/Rarbg/Rarbg.cs
index 6789050ad..be3a4a744 100644
--- a/src/NzbDrone.Core/Indexers/Rarbg/Rarbg.cs
+++ b/src/NzbDrone.Core/Indexers/Rarbg/Rarbg.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Net;
 using NLog;
+using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
@@ -47,7 +48,7 @@ public override object RequestAction(string action, IDictionary<string, string>
                 try
                 {
                     var request = new HttpRequestBuilder(Settings.BaseUrl.Trim('/'))
-                           .Resource("/pubapi_v2.php?get_token=get_token")
+                           .Resource($"/pubapi_v2.php?get_token=get_token&app_id={BuildInfo.AppName}")
                            .Accept(HttpAccept.Json)
                            .Build();
 
diff --git a/src/NzbDrone.Core/Indexers/Rarbg/RarbgParser.cs b/src/NzbDrone.Core/Indexers/Rarbg/RarbgParser.cs
index 249adf261..7a444d9f9 100644
--- a/src/NzbDrone.Core/Indexers/Rarbg/RarbgParser.cs
+++ b/src/NzbDrone.Core/Indexers/Rarbg/RarbgParser.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Net;
 using System.Text.RegularExpressions;
+using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Indexers.Exceptions;
 using NzbDrone.Core.Parser.Model;
@@ -66,7 +67,7 @@ public IList<ReleaseInfo> ParseResponse(IndexerResponse indexerResponse)
                 torrentInfo.Title = torrent.title;
                 torrentInfo.Size = torrent.size;
                 torrentInfo.DownloadUrl = torrent.download;
-                torrentInfo.InfoUrl = torrent.info_page + "&app_id=Radarr";
+                torrentInfo.InfoUrl = $"{torrent.info_page}&app_id={BuildInfo.AppName}";
                 torrentInfo.PublishDate = torrent.pubdate.ToUniversalTime();
                 torrentInfo.Seeders = torrent.seeders;
                 torrentInfo.Peers = torrent.leechers + torrent.seeders;
diff --git a/src/NzbDrone.Core/Indexers/Rarbg/RarbgRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Rarbg/RarbgRequestGenerator.cs
index de495fa02..53f13aaff 100644
--- a/src/NzbDrone.Core/Indexers/Rarbg/RarbgRequestGenerator.cs
+++ b/src/NzbDrone.Core/Indexers/Rarbg/RarbgRequestGenerator.cs
@@ -71,7 +71,7 @@ private IEnumerable<IndexerRequest> GetPagedRequests(string mode, int? imdbId, s
             requestBuilder.AddQueryParam("limit", "100");
             requestBuilder.AddQueryParam("token", _tokenProvider.GetToken(Settings));
             requestBuilder.AddQueryParam("format", "json_extended");
-            requestBuilder.AddQueryParam("app_id", "Radarr");
+            requestBuilder.AddQueryParam("app_id", BuildInfo.AppName);
 
             yield return new IndexerRequest(requestBuilder.Build());
         }
diff --git a/src/NzbDrone.Core/Indexers/Rarbg/RarbgTokenProvider.cs b/src/NzbDrone.Core/Indexers/Rarbg/RarbgTokenProvider.cs
index b4d84ff81..2efc0fd8c 100644
--- a/src/NzbDrone.Core/Indexers/Rarbg/RarbgTokenProvider.cs
+++ b/src/NzbDrone.Core/Indexers/Rarbg/RarbgTokenProvider.cs
@@ -2,6 +2,7 @@
 using Newtonsoft.Json.Linq;
 using NLog;
 using NzbDrone.Common.Cache;
+using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
 
@@ -32,7 +33,7 @@ public string GetToken(RarbgSettings settings)
                 {
                     var requestBuilder = new HttpRequestBuilder(settings.BaseUrl.Trim('/'))
                         .WithRateLimit(3.0)
-                        .Resource("/pubapi_v2.php?get_token=get_token&app_id=Radarr")
+                        .Resource($"/pubapi_v2.php?get_token=get_token&app_id={BuildInfo.AppName}")
                         .Accept(HttpAccept.Json);
 
                     if (settings.CaptchaToken.IsNotNullOrWhiteSpace())
@@ -44,8 +45,7 @@ public string GetToken(RarbgSettings settings)
                     var response = _httpClient.Get<JObject>(requestBuilder.Build());
 
                     return response.Resource["token"].ToString();
-                },
-                TimeSpan.FromMinutes(14.0));
+                }, TimeSpan.FromMinutes(14.0));
         }
     }
 }