Compare commits
50 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
aa3765bcf2 | ||
|
|
e81a956cc4 | ||
|
|
e7f838cd61 | ||
|
|
3764991e63 | ||
|
|
d2a3963006 | ||
|
|
270458a2a3 | ||
|
|
e3d4222f16 | ||
|
|
ed044e9a59 | ||
|
|
9cdf1950c6 | ||
|
|
5463794a4f | ||
|
|
dd6b4c9d3b | ||
|
|
02a6ec2548 | ||
|
|
275f29ec11 | ||
|
|
f916aa3761 | ||
|
|
b6390c15a1 | ||
|
|
e117826c6a | ||
|
|
83905622cb | ||
|
|
9207d6ec7c | ||
|
|
17456c6f90 | ||
|
|
c581233dbf | ||
|
|
6fc399131b | ||
|
|
31ac409d41 | ||
|
|
03b50a24fd | ||
|
|
7ed68f2b84 | ||
|
|
65847f34bc | ||
|
|
29da771484 | ||
|
|
cf3a5ab68a | ||
|
|
b8a1c64039 | ||
|
|
4ffdf9f53a | ||
|
|
4c582c7a6c | ||
|
|
46e1baf53c | ||
|
|
3f5d7bbef3 | ||
|
|
e95d18ed91 | ||
|
|
95f5054829 | ||
|
|
b8539b109e | ||
|
|
4e030168ee | ||
|
|
5487009306 | ||
|
|
fc7c0bde28 | ||
|
|
2085a28da2 | ||
|
|
0e38d5a0f3 | ||
|
|
ee329c23e5 | ||
|
|
c9ea74267b | ||
|
|
fde9b0a5de | ||
|
|
94b2cf94c4 | ||
|
|
4a628f7c66 | ||
|
|
30e1d3aa11 | ||
|
|
5e479661fb | ||
|
|
4be90e74b3 | ||
|
|
fcf85a5ad1 | ||
|
|
abff4953e8 |
11
Dockerfile.arm64
Normal file
11
Dockerfile.arm64
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
FROM --platform=linux/arm64 mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
COPY . ./
|
||||||
|
RUN dotnet restore
|
||||||
|
RUN dotnet publish -c Release -o out
|
||||||
|
|
||||||
|
FROM --platform=linux/arm64 mcr.microsoft.com/dotnet/aspnet:8.0
|
||||||
|
WORKDIR /app
|
||||||
|
COPY --from=build-env /app/out .
|
||||||
|
ENTRYPOINT ["dotnet", "UmlautAdaptarr.dll"]
|
||||||
36
README.md
36
README.md
@@ -1,15 +1,14 @@
|
|||||||
# UmlautAdaptarr
|
# UmlautAdaptarr
|
||||||
|
|
||||||
## English description coming soon
|
A tool to work around Sonarr, Radarr, Lidarr and Readarrs problems with foreign languages.
|
||||||
|
|
||||||
|
## Detailed English description coming soon
|
||||||
|
|
||||||
## Beschreibung
|
## Beschreibung
|
||||||
Wer möchte kann den UmlautAdaptarr jetzt gerne testen! Über Feedback würde ich mich sehr freuen!
|
|
||||||
|
|
||||||
Es sollte mit allen *arrs funktionieren, hat aber nur bei Sonarr, Readarr und Lidarr schon Auswirkungen (abgesehen vom Caching).
|
|
||||||
|
|
||||||
UmlautAdaptarr löst mehrere Probleme:
|
UmlautAdaptarr löst mehrere Probleme:
|
||||||
- Releases mit Umlauten werden grundsätzlich nicht korrekt von den *Arrs importiert
|
- Releases mit Umlauten werden grundsätzlich nicht korrekt von den *arrs importiert
|
||||||
- Releases mit Umlauten werden oft nicht korrekt gefunden (*Arrs suchen nach "o" statt "ö" & es fehlt häufig die korrekte Zuordnung zur Serie/zum Film beim Indexer)
|
- Releases mit Umlauten werden oft nicht korrekt gefunden (*arrs suchen nach "o" statt "ö" & es fehlt häufig die korrekte Zuordnung zur Serie/zum Film beim Indexer)
|
||||||
- Sonarr & Radarr erwarten immer den englischen Titel von https://thetvdb.com/ bzw. https://www.themoviedb.org/. Das führt bei deutschen Produktionen oder deutschen Übersetzungen oft zu Problemen - falls die *arrs schon mal etwas mit der Meldung `Found matching series/movie via grab history, but release was matched to series by ID. Automatic import is not possible/` nicht importiert haben, dann war das der Grund.
|
- Sonarr & Radarr erwarten immer den englischen Titel von https://thetvdb.com/ bzw. https://www.themoviedb.org/. Das führt bei deutschen Produktionen oder deutschen Übersetzungen oft zu Problemen - falls die *arrs schon mal etwas mit der Meldung `Found matching series/movie via grab history, but release was matched to series by ID. Automatic import is not possible/` nicht importiert haben, dann war das der Grund.
|
||||||
- Releases mit schlechtem Naming (z.B. von der Group TvR die kein "GERMAN" in den Releasename tun) werden korrigiert, so dass Sonarr&Radarr diese korrekt erkennen (optional)
|
- Releases mit schlechtem Naming (z.B. von der Group TvR die kein "GERMAN" in den Releasename tun) werden korrigiert, so dass Sonarr&Radarr diese korrekt erkennen (optional)
|
||||||
- Zusätzlich werden einige andere Fehler behoben, die häufig dazu führen, dass Titel nicht erfolgreich gefunden, geladen oder importiert werden.
|
- Zusätzlich werden einige andere Fehler behoben, die häufig dazu führen, dass Titel nicht erfolgreich gefunden, geladen oder importiert werden.
|
||||||
@@ -31,14 +30,13 @@ Einige Beispiele finden sich [weiter unten](https://github.com/PCJones/UmlautAda
|
|||||||
| Releases mit deutschem Titel werden erkannt |✓ |
|
| Releases mit deutschem Titel werden erkannt |✓ |
|
||||||
| Releases mit TVDB-Alias Titel werden erkannt |✓ |
|
| Releases mit TVDB-Alias Titel werden erkannt |✓ |
|
||||||
| Korrekte Suche und Erkennung von Titel mit Umlauten |✓ |
|
| Korrekte Suche und Erkennung von Titel mit Umlauten |✓ |
|
||||||
| Anfragen-Caching für 12 Minuten zur Reduzierung der API-Zugriffe | ✓ |
|
| Anfragen-Caching für 12 Minuten zur Reduzierung der API-Zugriff |✓ |
|
||||||
| Usenet (newznab) Support |✓ |
|
| Usenet (newznab) Support |✓ |
|
||||||
| Torrent (torznab) Support |✓ |
|
| Torrent (torznab) Support |✓ |
|
||||||
| Support von mehreren *arr-Instanzen des gleichen Typs (z.B. 2x Sonarr) | ✓
|
| Support von mehreren *arr-Instanzen des gleichen Typs (z.B. 2x Sonarr)|✓ |
|
||||||
| Releases mit mit schlechtem Naming werden korrekt umbenannt (optional) | in Arbeit|
|
| Releases mit mit schlechtem Naming werden korrekt umbenannt (optional) | in Arbeit|
|
||||||
| Radarr Support | in Arbeit |
|
| Radarr Support | in Arbeit |
|
||||||
| Webinterface | Geplant |
|
| Webinterface | Geplant |
|
||||||
| Prowlarr Unterstützung für "DE" SceneNZBs Kategorien | Geplant |
|
|
||||||
| Unterstützung weiterer Sprachen neben Deutsch | Geplant |
|
| Unterstützung weiterer Sprachen neben Deutsch | Geplant |
|
||||||
| Wünsche? | Vorschläge? |
|
| Wünsche? | Vorschläge? |
|
||||||
|
|
||||||
@@ -48,13 +46,14 @@ Momentan ist Docker dafür nötig, wer kein Docker nutzt muss sich noch etwas ge
|
|||||||
|
|
||||||
[Link zum Docker Image](https://hub.docker.com/r/pcjones/umlautadaptarr)
|
[Link zum Docker Image](https://hub.docker.com/r/pcjones/umlautadaptarr)
|
||||||
|
|
||||||
Nicht benötigte Umgebungsvariablen, z.B. wenn Readarr oder Lidarr nicht benötigt werden, können entfernt werden.
|
Nicht benötigte Umgebungsvariablen, z.B. falls Readarr oder Lidarr nicht genutzt werden, können entfernt werden.
|
||||||
|
|
||||||
### Konfiguration in Prowlarr (**empfohlen**)
|
### Konfiguration in Prowlarr (**empfohlen**)
|
||||||
Das ist die **empfohlene** Methode um den UmlautAdaptarr einzurichten. Sie hat den Vorteil, dass es, sofern man mehrere Indexer nutzt, keinen Geschwindigkeitsverlust bei der Suche geben sollte.
|
Das ist die **empfohlene** Methode um den UmlautAdaptarr einzurichten. Sie hat den Vorteil, dass es, sofern man mehrere Indexer nutzt, keinen Geschwindigkeitsverlust bei der Suche geben sollte.
|
||||||
|
|
||||||
1) In Prowlarr: Settings>Indexers bzw. Einstellungen>Indexer öffnen
|
1) Setze die benötigten [Docker Umgebungsvariablen](https://hub.docker.com/r/pcjones/umlautadaptarr) in deiner docker-compose Datei bzw. in deinem docker run Befehl
|
||||||
2) Lege einen neuen HTTP-Proxy an:
|
2) In Prowlarr: Settings>Indexers bzw. Einstellungen>Indexer öffnen
|
||||||
|
3) Lege einen neuen HTTP-Proxy an:
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
@@ -63,19 +62,20 @@ Das ist die **empfohlene** Methode um den UmlautAdaptarr einzurichten. Sie hat d
|
|||||||
- Tag: `umlautadaptarr`
|
- Tag: `umlautadaptarr`
|
||||||
- Host: Je nachdem, wie deine Docker-Konfiguration ist, kann es sein, dass du entweder `umlautadaptarr` oder `localhost`, oder ggf. die IP des Host setzen musst. Probiere es sonst einfach aus, indem du auf Test klickst.
|
- Host: Je nachdem, wie deine Docker-Konfiguration ist, kann es sein, dass du entweder `umlautadaptarr` oder `localhost`, oder ggf. die IP des Host setzen musst. Probiere es sonst einfach aus, indem du auf Test klickst.
|
||||||
- Die Username- und Passwort-Felder können leergelassen werden.
|
- Die Username- und Passwort-Felder können leergelassen werden.
|
||||||
3) Gehe zur Indexer-Übersichtsseite
|
4) Gehe zur Indexer-Übersichtsseite
|
||||||
4) Für alle Indexer/Tracker, die den UmlautAdaptarr nutzen sollen:
|
5) Für alle Indexer/Tracker, die den UmlautAdaptarr nutzen sollen:
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
- Füge den `umlautadaptarr` Tag hinzu
|
- Füge den `umlautadaptarr` Tag hinzu
|
||||||
- **Wichtig:** Ändere die URL von `https` zu `http`. (Dies ist erforderlich, damit der UmlautAdaptarr die Anfragen **lokal** abfangen kann. **Ausgehende** Anfragen an den Indexer verwenden natürlich weiterhin https).
|
- **Wichtig:** Ändere die URL von `https` zu `http`. (Dies ist erforderlich, damit der UmlautAdaptarr die Anfragen **lokal** abfangen kann. **Ausgehende** Anfragen an den Indexer verwenden natürlich weiterhin https).
|
||||||
5) Klicke danach auf `Test All Indexers` bzw `Alle Indexer Testen`. Falls du irgendwo noch `https` statt `http` stehen hast, sollte in den UmlautAdaptarr logs eine Warnung auftauchen. Mindestens solltest du aber noch ein zweites Mal alle Indexer durchgehen und überprüfen, ob überall `http` eingestellt ist - Indexer, bei denen noch `https` steht, werden nämlich einwandfrei funktionieren - allerdings ohne, dass der UmlautAdaptarr bei diesen wirken kann.
|
6) Klicke danach auf `Test All Indexers` bzw `Alle Indexer Testen`. Falls du irgendwo noch `https` statt `http` stehen hast, sollte in den UmlautAdaptarr logs eine Warnung auftauchen. Mindestens solltest du aber noch ein zweites Mal alle Indexer durchgehen und überprüfen, ob überall `http` eingestellt ist - Indexer, bei denen noch `https` steht, werden nämlich einwandfrei funktionieren - allerdings ohne, dass der UmlautAdaptarr bei diesen wirken kann.
|
||||||
|
|
||||||
### Konfiguration in Sonarr/Radarr oder Prowlarr ohne Proxy
|
### Konfiguration in Sonarr/Radarr oder Prowlarr ohne Proxy
|
||||||
Falls du kein Prowlarr nutzt oder nur 1-3 Indexer nutzt, kannst du diese alternative Konfigurationsmöglichkeit nutzen.
|
Falls du kein Prowlarr nutzt oder nur 1-3 Indexer nutzt, kannst du diese alternative Konfigurationsmöglichkeit nutzen.
|
||||||
|
|
||||||
Dafür musst du einfach nur alle Indexer, bei denen der UmlautAdaptarr greifen soll, bearbeiten:
|
1) Setze die benötigten [Docker Umgebungsvariablen](https://hub.docker.com/r/pcjones/umlautadaptarr) in deiner docker-compose Datei bzw. in deinem docker run Befehl
|
||||||
|
2) Bearbeite alle Indexer, bei denen der UmlautAdaptarr greifen soll, wie folgt:
|
||||||
|
|
||||||
Am Beispiel von sceneNZBs:
|
Am Beispiel von sceneNZBs:
|
||||||
|
|
||||||
@@ -132,3 +132,7 @@ Für andere Spendenmöglichkeiten gerne auf Discord oder Telegram melden - danke
|
|||||||
- TV Metadata source: https://thetvdb.com
|
- TV Metadata source: https://thetvdb.com
|
||||||
- Movie Metadata source: https://themoviedb.org
|
- Movie Metadata source: https://themoviedb.org
|
||||||
- Licenses: TODO
|
- Licenses: TODO
|
||||||
|
|
||||||
|
## Star History
|
||||||
|
|
||||||
|
[](https://star-history.com/#pcjones/umlautadaptarr&Date)
|
||||||
|
|||||||
@@ -1,19 +1,30 @@
|
|||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
using Microsoft.Extensions.Options;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Xml.Linq;
|
using System.Xml.Linq;
|
||||||
|
using UmlautAdaptarr.Options;
|
||||||
using UmlautAdaptarr.Services;
|
using UmlautAdaptarr.Services;
|
||||||
using UmlautAdaptarr.Utilities;
|
using UmlautAdaptarr.Utilities;
|
||||||
|
|
||||||
namespace UmlautAdaptarr.Controllers
|
namespace UmlautAdaptarr.Controllers
|
||||||
{
|
{
|
||||||
public class CapsController(ProxyRequestService proxyRequestService) : ControllerBase
|
public class CapsController(ProxyRequestService proxyRequestService, IOptions<GlobalOptions> options, ILogger<CapsController> logger) : ControllerBase
|
||||||
{
|
{
|
||||||
private readonly ProxyRequestService _proxyRequestService = proxyRequestService;
|
private readonly ProxyRequestService _proxyRequestService = proxyRequestService;
|
||||||
|
private readonly GlobalOptions _options = options.Value;
|
||||||
|
private readonly ILogger<CapsController> _logger = logger;
|
||||||
|
|
||||||
|
|
||||||
[HttpGet]
|
[HttpGet]
|
||||||
public async Task<IActionResult> Caps([FromRoute] string options, [FromRoute] string domain, [FromQuery] string? apikey)
|
public async Task<IActionResult> Caps([FromRoute] string apiKey, [FromRoute] string domain, [FromQuery] string? apikey)
|
||||||
{
|
{
|
||||||
if (!UrlUtilities.IsValidDomain(domain))
|
if (_options.ApiKey != null && !apiKey.Equals(apiKey))
|
||||||
|
{
|
||||||
|
_logger.LogWarning("Invalid or missing API key for request.");
|
||||||
|
return Unauthorized("Unauthorized: Invalid or missing API key.");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!domain.StartsWith("localhost") && !UrlUtilities.IsValidDomain(domain))
|
||||||
{
|
{
|
||||||
return NotFound($"{domain} is not a valid URL.");
|
return NotFound($"{domain} is not a valid URL.");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,23 +1,31 @@
|
|||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
using Microsoft.Extensions.Options;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using UmlautAdaptarr.Models;
|
using UmlautAdaptarr.Models;
|
||||||
|
using UmlautAdaptarr.Options;
|
||||||
|
using UmlautAdaptarr.Providers;
|
||||||
using UmlautAdaptarr.Services;
|
using UmlautAdaptarr.Services;
|
||||||
using UmlautAdaptarr.Utilities;
|
using UmlautAdaptarr.Utilities;
|
||||||
|
|
||||||
namespace UmlautAdaptarr.Controllers
|
namespace UmlautAdaptarr.Controllers
|
||||||
{
|
{
|
||||||
public abstract class SearchControllerBase(ProxyRequestService proxyRequestService, TitleMatchingService titleMatchingService) : ControllerBase
|
public abstract class SearchControllerBase(ProxyRequestService proxyRequestService, TitleMatchingService titleMatchingService, IOptions<GlobalOptions> options, ILogger<SearchControllerBase> logger) : ControllerBase
|
||||||
{
|
{
|
||||||
// TODO evaluate if this should be set to true by default
|
// TODO evaluate if this should be set to true by default
|
||||||
private readonly bool TODO_FORCE_TEXT_SEARCH_ORIGINAL_TITLE = true;
|
private readonly bool TODO_FORCE_TEXT_SEARCH_ORIGINAL_TITLE = true;
|
||||||
private readonly bool TODO_FORCE_TEXT_SEARCH_GERMAN_TITLE = false;
|
private readonly bool TODO_FORCE_TEXT_SEARCH_GERMAN_TITLE = false;
|
||||||
protected async Task<IActionResult> BaseSearch(string options,
|
protected async Task<IActionResult> BaseSearch(string apiKey,
|
||||||
string domain,
|
string domain,
|
||||||
IDictionary<string, string> queryParameters,
|
IDictionary<string, string> queryParameters,
|
||||||
SearchItem? searchItem = null)
|
SearchItem? searchItem = null)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
if (!AssureApiKey(apiKey))
|
||||||
|
{
|
||||||
|
return Unauthorized("Unauthorized: Invalid or missing API key.");
|
||||||
|
}
|
||||||
|
|
||||||
if (!UrlUtilities.IsValidDomain(domain))
|
if (!UrlUtilities.IsValidDomain(domain))
|
||||||
{
|
{
|
||||||
return NotFound($"{domain} is not a valid URL.");
|
return NotFound($"{domain} is not a valid URL.");
|
||||||
@@ -109,9 +117,17 @@ namespace UmlautAdaptarr.Controllers
|
|||||||
|
|
||||||
|
|
||||||
private string ProcessContent(string content, SearchItem? searchItem)
|
private string ProcessContent(string content, SearchItem? searchItem)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
return titleMatchingService.RenameTitlesInContent(content, searchItem);
|
return titleMatchingService.RenameTitlesInContent(content, searchItem);
|
||||||
}
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogError($"Error at ProcessContent: {ex.Message}{Environment.NewLine}Content:{Environment.NewLine}{content}");
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
public async Task<AggregatedSearchResult> AggregateSearchResults(
|
public async Task<AggregatedSearchResult> AggregateSearchResults(
|
||||||
string domain,
|
string domain,
|
||||||
@@ -150,27 +166,48 @@ namespace UmlautAdaptarr.Controllers
|
|||||||
|
|
||||||
return aggregatedResult;
|
return aggregatedResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
internal bool AssureApiKey(string apiKey)
|
||||||
|
{
|
||||||
|
if (options.Value.ApiKey != null && !apiKey.Equals(options.Value.ApiKey))
|
||||||
|
{
|
||||||
|
logger.LogWarning("Invalid or missing API key for request.");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class SearchController(ProxyRequestService proxyRequestService,
|
public class SearchController(ProxyRequestService proxyRequestService,
|
||||||
TitleMatchingService titleMatchingService,
|
TitleMatchingService titleMatchingService,
|
||||||
SearchItemLookupService searchItemLookupService) : SearchControllerBase(proxyRequestService, titleMatchingService)
|
SearchItemLookupService searchItemLookupService,
|
||||||
|
IOptions<GlobalOptions> options,
|
||||||
|
ILogger<SearchControllerBase> logger) : SearchControllerBase(proxyRequestService, titleMatchingService, options, logger)
|
||||||
{
|
{
|
||||||
public readonly string[] LIDARR_CATEGORY_IDS = ["3000", "3010", "3020", "3040", "3050"];
|
public readonly string[] LIDARR_CATEGORY_IDS = ["3000", "3010", "3020", "3040", "3050"];
|
||||||
public readonly string[] READARR_CATEGORY_IDS = ["3030", "3130", "7000", "7010", "7020", "7030", "7100", "7110", "7120", "7130"];
|
public readonly string[] READARR_CATEGORY_IDS = ["3030", "3130", "7000", "7010", "7020", "7030", "7100", "7110", "7120", "7130"];
|
||||||
|
|
||||||
[HttpGet]
|
[HttpGet]
|
||||||
public async Task<IActionResult> MovieSearch([FromRoute] string options, [FromRoute] string domain)
|
public async Task<IActionResult> MovieSearch([FromRoute] string apiKey, [FromRoute] string domain)
|
||||||
{
|
{
|
||||||
|
if (!AssureApiKey(apiKey))
|
||||||
|
{
|
||||||
|
return Unauthorized("Unauthorized: Invalid or missing API key.");
|
||||||
|
}
|
||||||
|
|
||||||
var queryParameters = HttpContext.Request.Query.ToDictionary(
|
var queryParameters = HttpContext.Request.Query.ToDictionary(
|
||||||
q => q.Key,
|
q => q.Key,
|
||||||
q => string.Join(",", q.Value));
|
q => string.Join(",", q.Value));
|
||||||
return await BaseSearch(options, domain, queryParameters);
|
return await BaseSearch(apiKey, domain, queryParameters);
|
||||||
}
|
}
|
||||||
|
|
||||||
[HttpGet]
|
[HttpGet]
|
||||||
public async Task<IActionResult> GenericSearch([FromRoute] string options, [FromRoute] string domain)
|
public async Task<IActionResult> GenericSearch([FromRoute] string apiKey, [FromRoute] string domain)
|
||||||
{
|
{
|
||||||
|
if (!AssureApiKey(apiKey))
|
||||||
|
{
|
||||||
|
return Unauthorized("Unauthorized: Invalid or missing API key.");
|
||||||
|
}
|
||||||
|
|
||||||
var queryParameters = HttpContext.Request.Query.ToDictionary(
|
var queryParameters = HttpContext.Request.Query.ToDictionary(
|
||||||
q => q.Key,
|
q => q.Key,
|
||||||
@@ -198,21 +235,31 @@ namespace UmlautAdaptarr.Controllers
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return await BaseSearch(options, domain, queryParameters, searchItem);
|
return await BaseSearch(apiKey, domain, queryParameters, searchItem);
|
||||||
}
|
}
|
||||||
|
|
||||||
[HttpGet]
|
[HttpGet]
|
||||||
public async Task<IActionResult> BookSearch([FromRoute] string options, [FromRoute] string domain)
|
public async Task<IActionResult> BookSearch([FromRoute] string apiKey, [FromRoute] string domain)
|
||||||
{
|
{
|
||||||
|
if (!AssureApiKey(apiKey))
|
||||||
|
{
|
||||||
|
return Unauthorized("Unauthorized: Invalid or missing API key.");
|
||||||
|
}
|
||||||
|
|
||||||
var queryParameters = HttpContext.Request.Query.ToDictionary(
|
var queryParameters = HttpContext.Request.Query.ToDictionary(
|
||||||
q => q.Key,
|
q => q.Key,
|
||||||
q => string.Join(",", q.Value));
|
q => string.Join(",", q.Value));
|
||||||
return await BaseSearch(options, domain, queryParameters);
|
return await BaseSearch(apiKey, domain, queryParameters);
|
||||||
}
|
}
|
||||||
|
|
||||||
[HttpGet]
|
[HttpGet]
|
||||||
public async Task<IActionResult> TVSearch([FromRoute] string options, [FromRoute] string domain)
|
public async Task<IActionResult> TVSearch([FromRoute] string apiKey, [FromRoute] string domain)
|
||||||
{
|
{
|
||||||
|
if (!AssureApiKey(apiKey))
|
||||||
|
{
|
||||||
|
return Unauthorized("Unauthorized: Invalid or missing API key.");
|
||||||
|
}
|
||||||
|
|
||||||
var queryParameters = HttpContext.Request.Query.ToDictionary(
|
var queryParameters = HttpContext.Request.Query.ToDictionary(
|
||||||
q => q.Key,
|
q => q.Key,
|
||||||
q => string.Join(",", q.Value));
|
q => string.Join(",", q.Value));
|
||||||
@@ -229,16 +276,21 @@ namespace UmlautAdaptarr.Controllers
|
|||||||
searchItem = await searchItemLookupService.GetOrFetchSearchItemByTitle(mediaType, title);
|
searchItem = await searchItemLookupService.GetOrFetchSearchItemByTitle(mediaType, title);
|
||||||
}
|
}
|
||||||
|
|
||||||
return await BaseSearch(options, domain, queryParameters, searchItem);
|
return await BaseSearch(apiKey, domain, queryParameters, searchItem);
|
||||||
}
|
}
|
||||||
|
|
||||||
[HttpGet]
|
[HttpGet]
|
||||||
public async Task<IActionResult> MusicSearch([FromRoute] string options, [FromRoute] string domain)
|
public async Task<IActionResult> MusicSearch([FromRoute] string apiKey, [FromRoute] string domain)
|
||||||
{
|
{
|
||||||
|
if (!AssureApiKey(apiKey))
|
||||||
|
{
|
||||||
|
return Unauthorized("Unauthorized: Invalid or missing API key.");
|
||||||
|
}
|
||||||
|
|
||||||
var queryParameters = HttpContext.Request.Query.ToDictionary(
|
var queryParameters = HttpContext.Request.Query.ToDictionary(
|
||||||
q => q.Key,
|
q => q.Key,
|
||||||
q => string.Join(",", q.Value));
|
q => string.Join(",", q.Value));
|
||||||
return await BaseSearch(options, domain, queryParameters);
|
return await BaseSearch(apiKey, domain, queryParameters);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,5 +14,18 @@
|
|||||||
/// The User-Agent string used in HTTP requests.
|
/// The User-Agent string used in HTTP requests.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string UserAgent { get; set; }
|
public string UserAgent { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The duration in minutes to cache the indexer requests.
|
||||||
|
/// </summary>
|
||||||
|
public int IndexerRequestsCacheDurationInMinutes { get; set; } = 12;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// API key for requests to the UmlautAdaptarr. Optional.
|
||||||
|
public string? ApiKey { get; set; } = null;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Proxy port for the internal UmlautAdaptarr proxy.
|
||||||
|
public int ProxyPort { get; set; } = 5006;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
using System.Net;
|
using System.Net;
|
||||||
using Serilog;
|
using Serilog;
|
||||||
using Serilog.Filters;
|
using Serilog.Filters;
|
||||||
using UmlautAdaptarr.Options;
|
|
||||||
using UmlautAdaptarr.Routing;
|
using UmlautAdaptarr.Routing;
|
||||||
using UmlautAdaptarr.Services;
|
using UmlautAdaptarr.Services;
|
||||||
using UmlautAdaptarr.Services.Factory;
|
using UmlautAdaptarr.Services.Factory;
|
||||||
@@ -11,22 +10,16 @@ internal class Program
|
|||||||
{
|
{
|
||||||
private static void Main(string[] args)
|
private static void Main(string[] args)
|
||||||
{
|
{
|
||||||
Helper.ShowLogo();
|
MainAsync(args).Wait();
|
||||||
Helper.ShowInformation();
|
}
|
||||||
|
|
||||||
|
private static async Task MainAsync(string[] args)
|
||||||
|
{
|
||||||
// TODO:
|
// TODO:
|
||||||
// add option to sort by nzb age
|
// add option to sort by nzb age
|
||||||
var builder = WebApplication.CreateBuilder(args);
|
var builder = WebApplication.CreateBuilder(args);
|
||||||
var configuration = builder.Configuration;
|
var configuration = builder.Configuration;
|
||||||
|
ConfigureLogger(configuration);
|
||||||
// TODO workaround to not log api keys
|
|
||||||
Log.Logger = new LoggerConfiguration()
|
|
||||||
.ReadFrom.Configuration(configuration)
|
|
||||||
.WriteTo.Console(outputTemplate: "[{Timestamp:yyyy-MM-dd HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}")
|
|
||||||
.Filter.ByExcluding(Matching.FromSource("System.Net.Http.HttpClient"))
|
|
||||||
.Filter.ByExcluding(Matching.FromSource("Microsoft.Extensions.Http.DefaultHttpClientFactory"))
|
|
||||||
//.Enrich.With(new ApiKeyMaskingEnricher("appsettings.json")) // TODO - Not working currently
|
|
||||||
.CreateLogger();
|
|
||||||
|
|
||||||
|
|
||||||
builder.Services.AddSerilog();
|
builder.Services.AddSerilog();
|
||||||
|
|
||||||
@@ -53,9 +46,9 @@ internal class Program
|
|||||||
builder.AddTitleLookupService();
|
builder.AddTitleLookupService();
|
||||||
builder.Services.AddSingleton<SearchItemLookupService>();
|
builder.Services.AddSingleton<SearchItemLookupService>();
|
||||||
builder.Services.AddSingleton<TitleMatchingService>();
|
builder.Services.AddSingleton<TitleMatchingService>();
|
||||||
builder.AddSonarrSupport();
|
await builder.AddSonarrSupport();
|
||||||
builder.AddLidarrSupport();
|
await builder.AddLidarrSupport();
|
||||||
builder.AddReadarrSupport();
|
await builder.AddReadarrSupport();
|
||||||
builder.Services.AddSingleton<CacheService>();
|
builder.Services.AddSingleton<CacheService>();
|
||||||
builder.Services.AddSingleton<ProxyRequestService>();
|
builder.Services.AddSingleton<ProxyRequestService>();
|
||||||
builder.Services.AddSingleton<ArrApplicationFactory>();
|
builder.Services.AddSingleton<ArrApplicationFactory>();
|
||||||
@@ -64,39 +57,66 @@ internal class Program
|
|||||||
|
|
||||||
var app = builder.Build();
|
var app = builder.Build();
|
||||||
|
|
||||||
|
Helper.ShowLogo();
|
||||||
|
|
||||||
|
if (app.Configuration.GetValue<bool>("IpLeakTest:Enabled"))
|
||||||
|
{
|
||||||
|
await Helper.ShowInformation();
|
||||||
|
}
|
||||||
|
|
||||||
GlobalStaticLogger.Initialize(app.Services.GetService<ILoggerFactory>()!);
|
GlobalStaticLogger.Initialize(app.Services.GetService<ILoggerFactory>()!);
|
||||||
app.UseHttpsRedirection();
|
app.UseHttpsRedirection();
|
||||||
app.UseAuthorization();
|
app.UseAuthorization();
|
||||||
|
|
||||||
app.MapControllerRoute("caps",
|
app.MapControllerRoute("caps",
|
||||||
"{options}/{*domain}",
|
"{apiKey}/{*domain}",
|
||||||
new { controller = "Caps", action = "Caps" },
|
new { controller = "Caps", action = "Caps" },
|
||||||
new { t = new TRouteConstraint("caps") });
|
new { t = new TRouteConstraint("caps") });
|
||||||
|
|
||||||
app.MapControllerRoute("movie-search",
|
app.MapControllerRoute("movie-search",
|
||||||
"{options}/{*domain}",
|
"{apiKey}/{*domain}",
|
||||||
new { controller = "Search", action = "MovieSearch" },
|
new { controller = "Search", action = "MovieSearch" },
|
||||||
new { t = new TRouteConstraint("movie") });
|
new { t = new TRouteConstraint("movie") });
|
||||||
|
|
||||||
app.MapControllerRoute("tv-search",
|
app.MapControllerRoute("tv-search",
|
||||||
"{options}/{*domain}",
|
"{apiKey}/{*domain}",
|
||||||
new { controller = "Search", action = "TVSearch" },
|
new { controller = "Search", action = "TVSearch" },
|
||||||
new { t = new TRouteConstraint("tvsearch") });
|
new { t = new TRouteConstraint("tvsearch") });
|
||||||
|
|
||||||
app.MapControllerRoute("music-search",
|
app.MapControllerRoute("music-search",
|
||||||
"{options}/{*domain}",
|
"{apiKey}/{*domain}",
|
||||||
new { controller = "Search", action = "MusicSearch" },
|
new { controller = "Search", action = "MusicSearch" },
|
||||||
new { t = new TRouteConstraint("music") });
|
new { t = new TRouteConstraint("music") });
|
||||||
|
|
||||||
app.MapControllerRoute("book-search",
|
app.MapControllerRoute("book-search",
|
||||||
"{options}/{*domain}",
|
"{apiKey}/{*domain}",
|
||||||
new { controller = "Search", action = "BookSearch" },
|
new { controller = "Search", action = "BookSearch" },
|
||||||
new { t = new TRouteConstraint("book") });
|
new { t = new TRouteConstraint("book") });
|
||||||
|
|
||||||
app.MapControllerRoute("generic-search",
|
app.MapControllerRoute("generic-search",
|
||||||
"{options}/{*domain}",
|
"{apiKey}/{*domain}",
|
||||||
new { controller = "Search", action = "GenericSearch" },
|
new { controller = "Search", action = "GenericSearch" },
|
||||||
new { t = new TRouteConstraint("search") });
|
new { t = new TRouteConstraint("search") });
|
||||||
app.Run();
|
app.Run();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static void ConfigureLogger(ConfigurationManager configuration)
|
||||||
|
{
|
||||||
|
Log.Logger = new LoggerConfiguration()
|
||||||
|
.ReadFrom.Configuration(configuration)
|
||||||
|
.WriteTo.Console(outputTemplate: "[{Timestamp:yyyy-MM-dd HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}")
|
||||||
|
|
||||||
|
#if RELEASE
|
||||||
|
.Filter.ByExcluding(Matching.FromSource("Microsoft.AspNetCore.Mvc"))
|
||||||
|
.Filter.ByExcluding(Matching.FromSource("Microsoft.AspNetCore.Routing"))
|
||||||
|
.Filter.ByExcluding(Matching.FromSource("Microsoft.AspNetCore.Diagnostics"))
|
||||||
|
.Filter.ByExcluding(Matching.FromSource("Microsoft.AspNetCore.Hosting"))
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// TODO workaround to not log api keys
|
||||||
|
.Filter.ByExcluding(Matching.FromSource("System.Net.Http.HttpClient"))
|
||||||
|
.Filter.ByExcluding(Matching.FromSource("Microsoft.Extensions.Http.DefaultHttpClientFactory"))
|
||||||
|
//.Enrich.With(new ApiKeyMaskingEnricher("appsettings.json")) // TODO - Not working currently
|
||||||
|
.CreateLogger();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -48,6 +48,21 @@ public class SonarrClient : ArrClientBase
|
|||||||
if (shows != null)
|
if (shows != null)
|
||||||
{
|
{
|
||||||
_logger.LogInformation($"Successfully fetched {shows.Count} items from Sonarr ({InstanceName}).");
|
_logger.LogInformation($"Successfully fetched {shows.Count} items from Sonarr ({InstanceName}).");
|
||||||
|
// Bulk request (germanTitle, aliases) for all shows
|
||||||
|
var tvdbIds = new List<string>();
|
||||||
|
foreach (var show in shows)
|
||||||
|
{
|
||||||
|
if ((string)show.tvdbId is not string tvdbId)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
tvdbIds.Add(tvdbId);
|
||||||
|
}
|
||||||
|
|
||||||
|
var bulkTitleData = await _titleService.FetchGermanTitlesAndAliasesByExternalIdBulkAsync(tvdbIds);
|
||||||
|
string? germanTitle;
|
||||||
|
string[]? aliases;
|
||||||
|
|
||||||
foreach (var show in shows)
|
foreach (var show in shows)
|
||||||
{
|
{
|
||||||
var tvdbId = (string)show.tvdbId;
|
var tvdbId = (string)show.tvdbId;
|
||||||
@@ -57,8 +72,16 @@ public class SonarrClient : ArrClientBase
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
var (germanTitle, aliases) =
|
if (bulkTitleData.TryGetValue(tvdbId, out var titleData))
|
||||||
|
{
|
||||||
|
(germanTitle, aliases) = titleData;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
(germanTitle, aliases) =
|
||||||
await _titleService.FetchGermanTitleAndAliasesByExternalIdAsync(_mediaType, tvdbId);
|
await _titleService.FetchGermanTitleAndAliasesByExternalIdAsync(_mediaType, tvdbId);
|
||||||
|
}
|
||||||
|
|
||||||
var searchItem = new SearchItem
|
var searchItem = new SearchItem
|
||||||
(
|
(
|
||||||
(int)show.id,
|
(int)show.id,
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ using UmlautAdaptarr.Providers;
|
|||||||
namespace UmlautAdaptarr.Services.Factory
|
namespace UmlautAdaptarr.Services.Factory
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Factory for creating RrApplication instances.
|
/// Factory for creating ArrApplication instances.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class ArrApplicationFactory
|
public class ArrApplicationFactory
|
||||||
{
|
{
|
||||||
@@ -33,26 +33,26 @@ namespace UmlautAdaptarr.Services.Factory
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Constructor for the ArrApplicationFactory.
|
/// Constructor for the ArrApplicationFactory.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="rrArrApplications">A dictionary of IArrApplication instances.</param>
|
/// <param name="arrApplications">A dictionary of IArrApplication instances.</param>
|
||||||
/// <param name="logger">Logger Instanz</param>
|
/// <param name="logger">Logger Instanz</param>
|
||||||
public ArrApplicationFactory(IDictionary<string, IArrApplication> rrArrApplications, ILogger<ArrApplicationFactory> logger)
|
public ArrApplicationFactory(IDictionary<string, IArrApplication> arrApplications, ILogger<ArrApplicationFactory> logger)
|
||||||
{
|
{
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
SonarrInstances = rrArrApplications.Values.OfType<SonarrClient>();
|
SonarrInstances = arrApplications.Values.OfType<SonarrClient>();
|
||||||
LidarrInstances = rrArrApplications.Values.OfType<LidarrClient>();
|
LidarrInstances = arrApplications.Values.OfType<LidarrClient>();
|
||||||
ReadarrInstances = rrArrApplications.Values.OfType<ReadarrClient>();
|
ReadarrInstances = arrApplications.Values.OfType<ReadarrClient>();
|
||||||
AllInstances = rrArrApplications;
|
AllInstances = arrApplications;
|
||||||
|
|
||||||
if (!AllInstances.Values.Any())
|
if (AllInstances.Values.Count == 0)
|
||||||
{
|
{
|
||||||
throw new Exception("No RrApplication could be successfully initialized. This could be due to a faulty configuration");
|
throw new Exception("No ArrApplication could be successfully initialized. This could be due to a faulty configuration");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
_logger.LogError("Error while Register ArrFactory. This might be a Config Problem", e.Message);
|
_logger.LogError("Error while registering ArrFactory. This is most likely a config problem, please check your environment variables.", e.Message);
|
||||||
throw;
|
throw;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
using System.Net;
|
using Microsoft.Extensions.Options;
|
||||||
|
using System.Net;
|
||||||
using System.Net.Sockets;
|
using System.Net.Sockets;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
using UmlautAdaptarr.Options;
|
||||||
|
|
||||||
namespace UmlautAdaptarr.Services
|
namespace UmlautAdaptarr.Services
|
||||||
{
|
{
|
||||||
@@ -8,15 +10,18 @@ namespace UmlautAdaptarr.Services
|
|||||||
{
|
{
|
||||||
private TcpListener _listener;
|
private TcpListener _listener;
|
||||||
private readonly ILogger<HttpProxyService> _logger;
|
private readonly ILogger<HttpProxyService> _logger;
|
||||||
private readonly int _proxyPort = 5006; // TODO move to appsettings.json
|
|
||||||
private readonly IHttpClientFactory _clientFactory;
|
private readonly IHttpClientFactory _clientFactory;
|
||||||
|
private readonly GlobalOptions _options;
|
||||||
private readonly HashSet<string> _knownHosts = [];
|
private readonly HashSet<string> _knownHosts = [];
|
||||||
private readonly object _hostsLock = new();
|
private readonly object _hostsLock = new();
|
||||||
|
private readonly IConfiguration _configuration;
|
||||||
private static readonly string[] newLineSeparator = ["\r\n"];
|
private static readonly string[] newLineSeparator = ["\r\n"];
|
||||||
|
|
||||||
public HttpProxyService(ILogger<HttpProxyService> logger, IHttpClientFactory clientFactory)
|
public HttpProxyService(ILogger<HttpProxyService> logger, IHttpClientFactory clientFactory, IConfiguration configuration, IOptions<GlobalOptions> options)
|
||||||
{
|
{
|
||||||
|
_options = options.Value;
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
|
_configuration = configuration;
|
||||||
_clientFactory = clientFactory;
|
_clientFactory = clientFactory;
|
||||||
_knownHosts.Add("prowlarr.servarr.com");
|
_knownHosts.Add("prowlarr.servarr.com");
|
||||||
}
|
}
|
||||||
@@ -37,6 +42,24 @@ namespace UmlautAdaptarr.Services
|
|||||||
var bytesRead = await clientStream.ReadAsync(buffer);
|
var bytesRead = await clientStream.ReadAsync(buffer);
|
||||||
var requestString = Encoding.ASCII.GetString(buffer, 0, bytesRead);
|
var requestString = Encoding.ASCII.GetString(buffer, 0, bytesRead);
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(_options.ApiKey))
|
||||||
|
{
|
||||||
|
var headers = ParseHeaders(buffer, bytesRead);
|
||||||
|
|
||||||
|
if (!headers.TryGetValue("Proxy-Authorization", out var proxyAuthorizationHeader) ||
|
||||||
|
!ValidateApiKey(proxyAuthorizationHeader))
|
||||||
|
{
|
||||||
|
var isFirstRequest = !headers.ContainsKey("Proxy-Authorization");
|
||||||
|
if (!isFirstRequest)
|
||||||
|
{
|
||||||
|
_logger.LogWarning("Unauthorized access attempt.");
|
||||||
|
}
|
||||||
|
await clientStream.WriteAsync(Encoding.ASCII.GetBytes("HTTP/1.1 407 Proxy Authentication Required\r\nProxy-Authenticate: Basic realm=\"Proxy\"\r\n\r\n"));
|
||||||
|
clientSocket.Close();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (requestString.StartsWith("CONNECT"))
|
if (requestString.StartsWith("CONNECT"))
|
||||||
{
|
{
|
||||||
// Handle HTTPS CONNECT request
|
// Handle HTTPS CONNECT request
|
||||||
@@ -49,6 +72,19 @@ namespace UmlautAdaptarr.Services
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private bool ValidateApiKey(string proxyAuthorizationHeader)
|
||||||
|
{
|
||||||
|
// Expect the header to be in the format: "Basic <base64encodedApiKey>"
|
||||||
|
if (proxyAuthorizationHeader.StartsWith("Basic ", StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
var encodedKey = proxyAuthorizationHeader["Basic ".Length..].Trim();
|
||||||
|
var decodedKey = Encoding.ASCII.GetString(Convert.FromBase64String(encodedKey));
|
||||||
|
var password = decodedKey.Split(':')[^1];
|
||||||
|
return password == _options.ApiKey;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
private async Task HandleHttpsConnect(string requestString, NetworkStream clientStream, Socket clientSocket)
|
private async Task HandleHttpsConnect(string requestString, NetworkStream clientStream, Socket clientSocket)
|
||||||
{
|
{
|
||||||
var (host, port) = ParseTargetInfo(requestString);
|
var (host, port) = ParseTargetInfo(requestString);
|
||||||
@@ -91,7 +127,12 @@ namespace UmlautAdaptarr.Services
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var modifiedUri = $"http://localhost:5005/_/{uri.Host}{uri.PathAndQuery}"; // TODO read port from appsettings?
|
var url = _configuration["Kestrel:Endpoints:Http:Url"];
|
||||||
|
var port = new Uri(url).Port;
|
||||||
|
|
||||||
|
var apiKey = _options.ApiKey == null ? "_" : _options.ApiKey;
|
||||||
|
|
||||||
|
var modifiedUri = $"http://localhost:{port}/{apiKey}/{uri.Host}{uri.PathAndQuery}";
|
||||||
using var client = _clientFactory.CreateClient();
|
using var client = _clientFactory.CreateClient();
|
||||||
var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, modifiedUri);
|
var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, modifiedUri);
|
||||||
httpRequestMessage.Headers.Add("User-Agent", userAgent);
|
httpRequestMessage.Headers.Add("User-Agent", userAgent);
|
||||||
@@ -163,7 +204,7 @@ namespace UmlautAdaptarr.Services
|
|||||||
|
|
||||||
public Task StartAsync(CancellationToken cancellationToken)
|
public Task StartAsync(CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
_listener = new TcpListener(IPAddress.Any, _proxyPort);
|
_listener = new TcpListener(IPAddress.Any, _options.ProxyPort);
|
||||||
_listener.Start();
|
_listener.Start();
|
||||||
Task.Run(() => HandleRequests(cancellationToken), cancellationToken);
|
Task.Run(() => HandleRequests(cancellationToken), cancellationToken);
|
||||||
return Task.CompletedTask;
|
return Task.CompletedTask;
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ namespace UmlautAdaptarr.Services
|
|||||||
|
|
||||||
if (responseMessage.IsSuccessStatusCode)
|
if (responseMessage.IsSuccessStatusCode)
|
||||||
{
|
{
|
||||||
_cache.Set(targetUri, responseMessage, TimeSpan.FromMinutes(12));
|
_cache.Set(targetUri, responseMessage, TimeSpan.FromMinutes(_options.IndexerRequestsCacheDurationInMinutes));
|
||||||
}
|
}
|
||||||
|
|
||||||
return responseMessage;
|
return responseMessage;
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
using Microsoft.Extensions.Options;
|
using Microsoft.Extensions.Options;
|
||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
using Newtonsoft.Json.Linq;
|
using Newtonsoft.Json.Linq;
|
||||||
|
using System.Text;
|
||||||
using UmlautAdaptarr.Options;
|
using UmlautAdaptarr.Options;
|
||||||
using UmlautAdaptarr.Utilities;
|
using UmlautAdaptarr.Utilities;
|
||||||
|
|
||||||
@@ -22,7 +23,7 @@ namespace UmlautAdaptarr.Services
|
|||||||
lastRequestTime = DateTime.Now;
|
lastRequestTime = DateTime.Now;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO add cache, TODO add bulk request
|
// TODO add caching
|
||||||
public async Task<(string? germanTitle, string[]? aliases)> FetchGermanTitleAndAliasesByExternalIdAsync(string mediaType, string externalId)
|
public async Task<(string? germanTitle, string[]? aliases)> FetchGermanTitleAndAliasesByExternalIdAsync(string mediaType, string externalId)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
@@ -68,6 +69,68 @@ namespace UmlautAdaptarr.Services
|
|||||||
return (null, null);
|
return (null, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async Task<Dictionary<string, (string? germanTitle, string[]? aliases)>> FetchGermanTitlesAndAliasesByExternalIdBulkAsync(IEnumerable<string> tvdbIds)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await EnsureMinimumDelayAsync();
|
||||||
|
|
||||||
|
var httpClient = clientFactory.CreateClient();
|
||||||
|
var bulkApiUrl = $"{Options.UmlautAdaptarrApiHost}/tvshow_german.php?bulk=true";
|
||||||
|
logger.LogInformation($"TitleApiService POST {UrlUtilities.RedactApiKey(bulkApiUrl)}");
|
||||||
|
|
||||||
|
// Prepare POST request payload
|
||||||
|
var payload = new { tvdbIds = tvdbIds.ToArray() };
|
||||||
|
var jsonPayload = JsonConvert.SerializeObject(payload);
|
||||||
|
var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json");
|
||||||
|
|
||||||
|
// Send POST request
|
||||||
|
var response = await httpClient.PostAsync(bulkApiUrl, content);
|
||||||
|
if (!response.IsSuccessStatusCode)
|
||||||
|
{
|
||||||
|
logger.LogError($"Failed to fetch German titles via bulk API. Status Code: {response.StatusCode}");
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
var responseContent = await response.Content.ReadAsStringAsync();
|
||||||
|
var bulkApiResponseData = JsonConvert.DeserializeObject<dynamic>(responseContent);
|
||||||
|
|
||||||
|
if (bulkApiResponseData == null || bulkApiResponseData.status != "success")
|
||||||
|
{
|
||||||
|
logger.LogError($"Parsing UmlautAdaptarr Bulk API response resulted in null or an error status.");
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
// Process response data
|
||||||
|
var results = new Dictionary<string, (string? germanTitle, string[]? aliases)>();
|
||||||
|
foreach (var entry in bulkApiResponseData.data)
|
||||||
|
{
|
||||||
|
string tvdbId = entry.tvdbId;
|
||||||
|
string? germanTitle = entry.germanTitle;
|
||||||
|
|
||||||
|
string[]? aliases = null;
|
||||||
|
if (entry.aliases != null)
|
||||||
|
{
|
||||||
|
JArray aliasesArray = JArray.FromObject(entry.aliases);
|
||||||
|
aliases = aliasesArray.Children<JObject>()
|
||||||
|
.Select(alias => alias["name"].ToString())
|
||||||
|
.ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
results[tvdbId] = (germanTitle, aliases);
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.LogInformation($"Successfully fetched German titles for {results.Count} TVDB IDs via bulk API.");
|
||||||
|
|
||||||
|
return results;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogError($"Error fetching German titles in bulk: {ex.Message}");
|
||||||
|
return new Dictionary<string, (string? germanTitle, string[]? aliases)>();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public async Task<(string? germanTitle, string? externalId, string[]? aliases)> FetchGermanTitleAndExternalIdAndAliasesByTitle(string mediaType, string title)
|
public async Task<(string? germanTitle, string? externalId, string[]? aliases)> FetchGermanTitleAndExternalIdAndAliasesByTitle(string mediaType, string title)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
|||||||
@@ -196,9 +196,9 @@ namespace UmlautAdaptarr.Services
|
|||||||
// Workaround for the rare case of e.g. "Frieren: Beyond Journey's End" that also has the alias "Frieren"
|
// Workaround for the rare case of e.g. "Frieren: Beyond Journey's End" that also has the alias "Frieren"
|
||||||
if (expectedTitle!.StartsWith(variation, StringComparison.OrdinalIgnoreCase))
|
if (expectedTitle!.StartsWith(variation, StringComparison.OrdinalIgnoreCase))
|
||||||
{
|
{
|
||||||
// See if we already matched the whole title by checking if S01E01 pattern is coming next to avoid false positives
|
// See if we already matched the whole title by checking if S01E01/S2024E123 pattern is coming next to avoid false positives
|
||||||
// - that won't help with movies but with tv shows
|
// - that won't help with movies but with tv shows
|
||||||
var seasonMatchingPattern = $"^{separator}S\\d{{1,2}}E\\d{{1,2}}";
|
var seasonMatchingPattern = $"^{separator}S\\d{{1,4}}E\\d{{1,4}}";
|
||||||
if (!Regex.IsMatch(suffix, seasonMatchingPattern))
|
if (!Regex.IsMatch(suffix, seasonMatchingPattern))
|
||||||
{
|
{
|
||||||
logger.LogWarning($"TitleMatchingService - Didn't rename: '{originalTitle}' because the expected title '{expectedTitle}' starts with the variation '{variation}'");
|
logger.LogWarning($"TitleMatchingService - Didn't rename: '{originalTitle}' because the expected title '{expectedTitle}' starts with the variation '{variation}'");
|
||||||
@@ -314,7 +314,7 @@ namespace UmlautAdaptarr.Services
|
|||||||
{
|
{
|
||||||
return "book";
|
return "book";
|
||||||
}
|
}
|
||||||
else if (category == "3000" || category.StartsWith("Audio"))
|
else if (category == "3000" || category.StartsWith("Audio", StringComparison.OrdinalIgnoreCase))
|
||||||
{
|
{
|
||||||
return "audio";
|
return "audio";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,13 +9,13 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.9.2" />
|
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="12.0.0-preview1" />
|
||||||
<PackageReference Include="IL.FluentValidation.Extensions.Options" Version="11.0.2" />
|
<PackageReference Include="IL.FluentValidation.Extensions.Options" Version="11.0.2" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
|
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
||||||
<PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
|
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
|
||||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.3" />
|
<PackageReference Include="Swashbuckle.AspNetCore" Version="7.2.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -11,10 +11,10 @@ public static class Helper
|
|||||||
"\r\n _ _ _ _ ___ _ _ \r\n| | | | | | | | / _ \\ | | | | \r\n| | | |_ __ ___ | | __ _ _ _| |_/ /_\\ \\ __| | __ _ _ __ | |_ __ _ _ __ _ __ \r\n| | | | '_ ` _ \\| |/ _` | | | | __| _ |/ _` |/ _` | '_ \\| __/ _` | '__| '__|\r\n| |_| | | | | | | | (_| | |_| | |_| | | | (_| | (_| | |_) | || (_| | | | | \r\n \\___/|_| |_| |_|_|\\__,_|\\__,_|\\__\\_| |_/\\__,_|\\__,_| .__/ \\__\\__,_|_| |_| \r\n | | \r\n |_| \r\n");
|
"\r\n _ _ _ _ ___ _ _ \r\n| | | | | | | | / _ \\ | | | | \r\n| | | |_ __ ___ | | __ _ _ _| |_/ /_\\ \\ __| | __ _ _ __ | |_ __ _ _ __ _ __ \r\n| | | | '_ ` _ \\| |/ _` | | | | __| _ |/ _` |/ _` | '_ \\| __/ _` | '__| '__|\r\n| |_| | | | | | | | (_| | |_| | |_| | | | (_| | (_| | |_) | || (_| | | | | \r\n \\___/|_| |_| |_|_|\\__,_|\\__,_|\\__\\_| |_/\\__,_|\\__,_| .__/ \\__\\__,_|_| |_| \r\n | | \r\n |_| \r\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void ShowInformation()
|
public static async Task ShowInformation()
|
||||||
{
|
{
|
||||||
Console.WriteLine("--------------------------[IP Leak Test]-----------------------------");
|
Console.WriteLine("--------------------------[IP Leak Test]-----------------------------");
|
||||||
var ipInfo = GetPublicIpAddressInfoAsync().GetAwaiter().GetResult();
|
var ipInfo = await GetPublicIpAddressInfoAsync();
|
||||||
|
|
||||||
if (ipInfo != null)
|
if (ipInfo != null)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ public static class ServicesExtensions
|
|||||||
/// <param name="builder">The <see cref="WebApplicationBuilder" /> to configure the service collection.</param>
|
/// <param name="builder">The <see cref="WebApplicationBuilder" /> to configure the service collection.</param>
|
||||||
/// <param name="sectionName">The name of the configuration section containing service options.</param>
|
/// <param name="sectionName">The name of the configuration section containing service options.</param>
|
||||||
/// <returns>The configured <see cref="WebApplicationBuilder" />.</returns>
|
/// <returns>The configured <see cref="WebApplicationBuilder" />.</returns>
|
||||||
private static WebApplicationBuilder AddServicesWithOptions<TOptions, TService, TInterface>(
|
private static async Task<WebApplicationBuilder> AddServicesWithOptions<TOptions, TService, TInterface>(
|
||||||
this WebApplicationBuilder builder, string sectionName)
|
this WebApplicationBuilder builder, string sectionName)
|
||||||
where TOptions : class, new()
|
where TOptions : class, new()
|
||||||
where TService : class, TInterface
|
where TService : class, TInterface
|
||||||
@@ -57,9 +57,9 @@ public static class ServicesExtensions
|
|||||||
|
|
||||||
foreach (var option in optionsArray)
|
foreach (var option in optionsArray)
|
||||||
{
|
{
|
||||||
GlobalInstanceOptionsValidator validator = new GlobalInstanceOptionsValidator();
|
GlobalInstanceOptionsValidator validator = new();
|
||||||
|
|
||||||
var results = validator.Validate(option as GlobalInstanceOptions);
|
var results = await validator.ValidateAsync(option as GlobalInstanceOptions);
|
||||||
|
|
||||||
if (!results.IsValid)
|
if (!results.IsValid)
|
||||||
{
|
{
|
||||||
@@ -68,7 +68,7 @@ public static class ServicesExtensions
|
|||||||
Console.WriteLine(($"Property {failure.PropertyName } failed validation. Error was: {failure.ErrorMessage}"));
|
Console.WriteLine(($"Property {failure.PropertyName } failed validation. Error was: {failure.ErrorMessage}"));
|
||||||
}
|
}
|
||||||
|
|
||||||
throw new Exception("Please fix first you config and then Start UmlautAdaptarr again");
|
throw new Exception("Please fix cour environment variables and then Start UmlautAdaptarr again");
|
||||||
}
|
}
|
||||||
|
|
||||||
var instanceState = (bool)(typeof(TOptions).GetProperty("Enabled")?.GetValue(option, null) ?? false);
|
var instanceState = (bool)(typeof(TOptions).GetProperty("Enabled")?.GetValue(option, null) ?? false);
|
||||||
@@ -143,7 +143,7 @@ public static class ServicesExtensions
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="builder">The <see cref="WebApplicationBuilder" /> to configure the service collection.</param>
|
/// <param name="builder">The <see cref="WebApplicationBuilder" /> to configure the service collection.</param>
|
||||||
/// <returns>The configured <see cref="WebApplicationBuilder" />.</returns>
|
/// <returns>The configured <see cref="WebApplicationBuilder" />.</returns>
|
||||||
public static WebApplicationBuilder AddSonarrSupport(this WebApplicationBuilder builder)
|
public static Task<WebApplicationBuilder> AddSonarrSupport(this WebApplicationBuilder builder)
|
||||||
{
|
{
|
||||||
// builder.Serviceses.AddSingleton<IOptionsMonitoSonarrInstanceOptionsns>, OptionsMonitoSonarrInstanceOptionsns>>();
|
// builder.Serviceses.AddSingleton<IOptionsMonitoSonarrInstanceOptionsns>, OptionsMonitoSonarrInstanceOptionsns>>();
|
||||||
return builder.AddServicesWithOptions<SonarrInstanceOptions, SonarrClient, IArrApplication>("Sonarr");
|
return builder.AddServicesWithOptions<SonarrInstanceOptions, SonarrClient, IArrApplication>("Sonarr");
|
||||||
@@ -154,7 +154,7 @@ public static class ServicesExtensions
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="builder">The <see cref="WebApplicationBuilder" /> to configure the service collection.</param>
|
/// <param name="builder">The <see cref="WebApplicationBuilder" /> to configure the service collection.</param>
|
||||||
/// <returns>The configured <see cref="WebApplicationBuilder" />.</returns>
|
/// <returns>The configured <see cref="WebApplicationBuilder" />.</returns>
|
||||||
public static WebApplicationBuilder AddLidarrSupport(this WebApplicationBuilder builder)
|
public static Task<WebApplicationBuilder> AddLidarrSupport(this WebApplicationBuilder builder)
|
||||||
{
|
{
|
||||||
return builder.AddServicesWithOptions<LidarrInstanceOptions, LidarrClient, IArrApplication>("Lidarr");
|
return builder.AddServicesWithOptions<LidarrInstanceOptions, LidarrClient, IArrApplication>("Lidarr");
|
||||||
}
|
}
|
||||||
@@ -164,7 +164,7 @@ public static class ServicesExtensions
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="builder">The <see cref="WebApplicationBuilder" /> to configure the service collection.</param>
|
/// <param name="builder">The <see cref="WebApplicationBuilder" /> to configure the service collection.</param>
|
||||||
/// <returns>The configured <see cref="WebApplicationBuilder" />.</returns>
|
/// <returns>The configured <see cref="WebApplicationBuilder" />.</returns>
|
||||||
public static WebApplicationBuilder AddReadarrSupport(this WebApplicationBuilder builder)
|
public static Task<WebApplicationBuilder> AddReadarrSupport(this WebApplicationBuilder builder)
|
||||||
{
|
{
|
||||||
return builder.AddServicesWithOptions<ReadarrInstanceOptions, ReadarrClient, IArrApplication>("Readarr");
|
return builder.AddServicesWithOptions<ReadarrInstanceOptions, ReadarrClient, IArrApplication>("Readarr");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,8 @@ namespace UmlautAdaptarr.Utilities
|
|||||||
{
|
{
|
||||||
public partial class UrlUtilities
|
public partial class UrlUtilities
|
||||||
{
|
{
|
||||||
[GeneratedRegex(@"^(?!http:\/\/)([a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+.*)$")]
|
[GeneratedRegex(@"^(?!http:\/\/)([a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+(:\d+)?(/.*)?)$")]
|
||||||
|
|
||||||
private static partial Regex UrlMatchingRegex();
|
private static partial Regex UrlMatchingRegex();
|
||||||
public static bool IsValidDomain(string domain)
|
public static bool IsValidDomain(string domain)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,11 +1,15 @@
|
|||||||
using System.Net;
|
using FluentValidation;
|
||||||
using FluentValidation;
|
|
||||||
using UmlautAdaptarr.Options.ArrOptions.InstanceOptions;
|
using UmlautAdaptarr.Options.ArrOptions.InstanceOptions;
|
||||||
|
|
||||||
namespace UmlautAdaptarr.Validator;
|
namespace UmlautAdaptarr.Validator;
|
||||||
|
|
||||||
public class GlobalInstanceOptionsValidator : AbstractValidator<GlobalInstanceOptions>
|
public class GlobalInstanceOptionsValidator : AbstractValidator<GlobalInstanceOptions>
|
||||||
{
|
{
|
||||||
|
private readonly static HttpClient httpClient = new()
|
||||||
|
{
|
||||||
|
Timeout = TimeSpan.FromSeconds(3)
|
||||||
|
};
|
||||||
|
|
||||||
public GlobalInstanceOptionsValidator()
|
public GlobalInstanceOptionsValidator()
|
||||||
{
|
{
|
||||||
RuleFor(x => x.Enabled).NotNull();
|
RuleFor(x => x.Enabled).NotNull();
|
||||||
@@ -14,12 +18,14 @@ public class GlobalInstanceOptionsValidator : AbstractValidator<GlobalInstanceOp
|
|||||||
{
|
{
|
||||||
RuleFor(x => x.Host)
|
RuleFor(x => x.Host)
|
||||||
.NotEmpty().WithMessage("Host is required when Enabled is true.")
|
.NotEmpty().WithMessage("Host is required when Enabled is true.")
|
||||||
.Must(BeAValidUrl).WithMessage("Host/Url must start with http:// or https:// and be a valid address.")
|
.Must(BeAValidUrl).WithMessage("Host/Url must start with http:// or https:// and be a valid address.");
|
||||||
.Must(BeReachable)
|
|
||||||
.WithMessage("Host/Url is not reachable. Please check your Host or your UmlautAdaptrr Settings");
|
|
||||||
|
|
||||||
RuleFor(x => x.ApiKey)
|
RuleFor(x => x.ApiKey)
|
||||||
.NotEmpty().WithMessage("ApiKey is required when Enabled is true.");
|
.NotEmpty().WithMessage("ApiKey is required when Enabled is true.");
|
||||||
|
|
||||||
|
RuleFor(x => x)
|
||||||
|
.MustAsync(BeReachable)
|
||||||
|
.WithMessage("Host/Url is not reachable. Please check your Host or your UmlautAdaptrr Settings");
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -29,33 +35,37 @@ public class GlobalInstanceOptionsValidator : AbstractValidator<GlobalInstanceOp
|
|||||||
&& (uriResult.Scheme == Uri.UriSchemeHttp || uriResult.Scheme == Uri.UriSchemeHttps);
|
&& (uriResult.Scheme == Uri.UriSchemeHttp || uriResult.Scheme == Uri.UriSchemeHttps);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static bool BeReachable(string url)
|
private static async Task<bool> BeReachable(GlobalInstanceOptions opts, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
var endTime = DateTime.Now.AddMinutes(3);
|
var endTime = DateTime.Now.AddMinutes(3);
|
||||||
var reachable = false;
|
var reachable = false;
|
||||||
|
var url = $"{opts.Host}/api?apikey={opts.ApiKey}";
|
||||||
|
|
||||||
while (DateTime.Now < endTime)
|
while (DateTime.Now < endTime)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var request = WebRequest.Create(url);
|
using var response = await httpClient.GetAsync(url, cancellationToken);
|
||||||
request.Timeout = 3000;
|
if (response.IsSuccessStatusCode)
|
||||||
using var response = (HttpWebResponse)request.GetResponse();
|
{
|
||||||
reachable = response.StatusCode == HttpStatusCode.OK;
|
reachable = true;
|
||||||
if (reachable)
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
catch
|
else
|
||||||
{
|
{
|
||||||
|
Console.WriteLine($"Reachable check got unexpected status code {response.StatusCode}.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Console.WriteLine(ex.Message);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Wait for 15 seconds for next try
|
// Wait for 15 seconds for next try
|
||||||
Console.WriteLine($"The URL \"{url}\" is not reachable. Next attempt in 15 seconds...");
|
Console.WriteLine($"The URL \"{opts.Host}/api?apikey=[REDACTED]\" is not reachable. Next attempt in 15 seconds...");
|
||||||
Thread.Sleep(15000);
|
Thread.Sleep(15000);
|
||||||
}
|
}
|
||||||
|
|
||||||
return reachable;
|
return reachable;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -20,7 +20,10 @@
|
|||||||
// Settings__UmlautAdaptarrApiHost=https://umlautadaptarr.pcjones.de/api/v1
|
// Settings__UmlautAdaptarrApiHost=https://umlautadaptarr.pcjones.de/api/v1
|
||||||
"Settings": {
|
"Settings": {
|
||||||
"UserAgent": "UmlautAdaptarr/1.0",
|
"UserAgent": "UmlautAdaptarr/1.0",
|
||||||
"UmlautAdaptarrApiHost": "https://umlautadaptarr.pcjones.de/api/v1"
|
"UmlautAdaptarrApiHost": "https://umlautadaptarr.pcjones.de/api/v1",
|
||||||
|
"IndexerRequestsCacheDurationInMinutes": 12,
|
||||||
|
"ApiKey": null,
|
||||||
|
"ProxyPort": 5006
|
||||||
},
|
},
|
||||||
"Sonarr": [
|
"Sonarr": [
|
||||||
{
|
{
|
||||||
@@ -64,5 +67,10 @@
|
|||||||
"Enabled": false,
|
"Enabled": false,
|
||||||
"Host": "your_readarr_host_url",
|
"Host": "your_readarr_host_url",
|
||||||
"ApiKey": "your_readarr_api_key"
|
"ApiKey": "your_readarr_api_key"
|
||||||
|
},
|
||||||
|
"IpLeakTest": {
|
||||||
|
// Docker Environment Variables:
|
||||||
|
// - IpLeakTest__Enabled: false (set to true to enable)
|
||||||
|
"Enabled": false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,3 +23,20 @@ services:
|
|||||||
- LIDARR__ENABLED=false
|
- LIDARR__ENABLED=false
|
||||||
- LIDARR__HOST=http://localhost:8686
|
- LIDARR__HOST=http://localhost:8686
|
||||||
- LIDARR__APIKEY=APIKEY
|
- LIDARR__APIKEY=APIKEY
|
||||||
|
### example for multiple instances of same type
|
||||||
|
#- SONARR__0__NAME=NAME 1 (optional)
|
||||||
|
#- SONARR__0__ENABLED=false
|
||||||
|
#- SONARR__0__HOST=http://localhost:8989
|
||||||
|
#- SONARR__0__APIKEY=APIKEY
|
||||||
|
#- SONARR__1__NAME=NAME 2 (optional)
|
||||||
|
#- SONARR__1__ENABLED=false
|
||||||
|
#- SONARR__1__HOST=http://localhost:8989
|
||||||
|
#- SONARR__1__APIKEY=APIKEY
|
||||||
|
|
||||||
|
### Advanced options (with default values))
|
||||||
|
#- IpLeakTest__Enabled=false
|
||||||
|
#- SETTINGS__IndexerRequestsCacheDurationInMinutes=12 # How long to cache indexer requests for. Default is 12 minutes.
|
||||||
|
#- SETTINGS__ApiKey= # API key for requests to the UmlautAdaptarr. Optional, probably only needed for seedboxes.
|
||||||
|
#- SETTINGS__ProxyPort=5006 # Proxy port for the internal UmlautAdaptarr proxy used for Prowlarr.
|
||||||
|
#- Kestrel__Endpoints__Http__Url=http://[::]:5005 # HTTP port for the UmlautAdaptarr
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user