taiqane/UmlautAdaptarr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source 
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:
PCJones
2025-11-18 10:49:49 +01:00
parent 02cf2854e1 b94c6bc6ad
commit 6ef8cc3cd1
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
UmlautAdaptarr/Controllers/SearchController.cs
View File

@@ -13,7 +13,7 @@ namespace UmlautAdaptarr.Controllers
// 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 apiKey, 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)
@@ -30,8 +30,7 @@ namespace UmlautAdaptarr.Controllers
return NotFound($"{domain} is not a valid URL."); return NotFound($"{domain} is not a valid URL.");
} }
ContentResult? initialSearchResult = await PerformSingleSearchRequest(domain, queryParameters) as ContentResult; if (await PerformSingleSearchRequest(domain, queryParameters) is not ContentResult initialSearchResult)
if (initialSearchResult == null)
{ {
return null; return null;
} }

4
UmlautAdaptarr/Controllers/TitleLookupController.cs
View File

@@ -21,7 +21,9 @@ namespace UmlautAdaptarr.Controllers
if (string.IsNullOrWhiteSpace(changedTitle)) if (string.IsNullOrWhiteSpace(changedTitle))
return BadRequest("changedTitle is required."); return BadRequest("changedTitle is required.");
var originalTitle = cacheService.GetOriginalTitleFromRenamed(changedTitle); var cleanChangedTitle = changedTitle.Replace(":", "-");
var originalTitle = cacheService.GetOriginalTitleFromRenamed(cleanChangedTitle);
return originalTitle != null return originalTitle != null
? Ok(new { changedTitle, originalTitle }) ? Ok(new { changedTitle, originalTitle })

1
run_on_seedbox.sh
View File

@@ -43,6 +43,7 @@ export LIDARR__APIKEY=APIKEY
# Advanced Options # Advanced Options
#export IpLeakTest__Enabled=false #export IpLeakTest__Enabled=false
#export SETTINGS__IndexerRequestsCacheDurationInMinutes=12 #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__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 SETTINGS__ProxyPort=1234 # Port for Proxy
export Kestrel__Endpoints__Http__Url="http://[::]:1235" # Port for UmlautAdaptarr API export Kestrel__Endpoints__Http__Url="http://[::]:1235" # Port for UmlautAdaptarr API