Merge branch 'master' into develop
Resolved conflict in TitleLookupController.cs by keeping the master version with colon handling fix. This brings develop up to date with master (v0.7.4), including the November bug fixes.
This commit is contained in:
@@ -13,7 +13,7 @@ namespace UmlautAdaptarr.Controllers
|
||||
// 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_GERMAN_TITLE = false;
|
||||
protected async Task<IActionResult> BaseSearch(string apiKey,
|
||||
protected async Task<IActionResult?> BaseSearch(string apiKey,
|
||||
string domain,
|
||||
IDictionary<string, string> queryParameters,
|
||||
SearchItem? searchItem = null)
|
||||
@@ -30,8 +30,7 @@ namespace UmlautAdaptarr.Controllers
|
||||
return NotFound($"{domain} is not a valid URL.");
|
||||
}
|
||||
|
||||
ContentResult? initialSearchResult = await PerformSingleSearchRequest(domain, queryParameters) as ContentResult;
|
||||
if (initialSearchResult == null)
|
||||
if (await PerformSingleSearchRequest(domain, queryParameters) is not ContentResult initialSearchResult)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -21,7 +21,9 @@ namespace UmlautAdaptarr.Controllers
|
||||
if (string.IsNullOrWhiteSpace(changedTitle))
|
||||
return BadRequest("changedTitle is required.");
|
||||
|
||||
var originalTitle = cacheService.GetOriginalTitleFromRenamed(changedTitle);
|
||||
var cleanChangedTitle = changedTitle.Replace(":", "-");
|
||||
|
||||
var originalTitle = cacheService.GetOriginalTitleFromRenamed(cleanChangedTitle);
|
||||
|
||||
return originalTitle != null
|
||||
? Ok(new { changedTitle, originalTitle })
|
||||
|
||||
@@ -43,6 +43,7 @@ export LIDARR__APIKEY=APIKEY
|
||||
# Advanced Options
|
||||
#export IpLeakTest__Enabled=false
|
||||
#export SETTINGS__IndexerRequestsCacheDurationInMinutes=12
|
||||
export ASPNETCORE_CONTENTROOT="./publish"
|
||||
export SETTINGS__ApiKey="apikey" # Change to something unique! Then in Prowlarr, in the proxy settings set any username and use this ApiKey as password.
|
||||
export SETTINGS__ProxyPort=1234 # Port for Proxy
|
||||
export Kestrel__Endpoints__Http__Url="http://[::]:1235" # Port for UmlautAdaptarr API
|
||||
|
||||
Reference in New Issue
Block a user