Add workaround for (DE) titles
This commit is contained in:
@@ -54,6 +54,7 @@ namespace UmlautAdaptarr.Models
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
TitleSearchVariations = GenerateVariations(germanTitle, mediaType).ToArray();
|
TitleSearchVariations = GenerateVariations(germanTitle, mediaType).ToArray();
|
||||||
|
|
||||||
var allTitleVariations = new List<string>(TitleSearchVariations);
|
var allTitleVariations = new List<string>(TitleSearchVariations);
|
||||||
|
|
||||||
// If aliases are not null, generate variations for each and add them to the list
|
// If aliases are not null, generate variations for each and add them to the list
|
||||||
@@ -66,8 +67,22 @@ namespace UmlautAdaptarr.Models
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
TitleMatchVariations = allTitleVariations.Distinct().ToArray();
|
|
||||||
AuthorMatchVariations = [];
|
AuthorMatchVariations = [];
|
||||||
|
|
||||||
|
// if a german title ends with (DE) also add a search string that replaces (DE) with GERMAN
|
||||||
|
// also add a matching title without (DE)
|
||||||
|
if (germanTitle?.EndsWith("(DE)") ?? false)
|
||||||
|
{
|
||||||
|
TitleSearchVariations = [.. TitleSearchVariations, ..
|
||||||
|
GenerateVariations(
|
||||||
|
germanTitle.Replace("(DE)", " GERMAN").RemoveExtraWhitespaces(),
|
||||||
|
mediaType)];
|
||||||
|
|
||||||
|
allTitleVariations.AddRange(GenerateVariations(germanTitle.Replace("(DE)", "").Trim(), mediaType));
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
TitleMatchVariations = allTitleVariations.Distinct().ToArray();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -111,7 +126,7 @@ namespace UmlautAdaptarr.Models
|
|||||||
{
|
{
|
||||||
var cleanTitleWithoutArticle = germanTitle[3..].Trim();
|
var cleanTitleWithoutArticle = germanTitle[3..].Trim();
|
||||||
baseVariations.AddRange(GenerateVariations(cleanTitleWithoutArticle, mediaType));
|
baseVariations.AddRange(GenerateVariations(cleanTitleWithoutArticle, mediaType));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Remove multiple spaces
|
// Remove multiple spaces
|
||||||
var cleanedVariations = baseVariations.Select(variation => variation.RemoveExtraWhitespaces());
|
var cleanedVariations = baseVariations.Select(variation => variation.RemoveExtraWhitespaces());
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using System.Text.RegularExpressions;
|
using Microsoft.Extensions.FileSystemGlobbing.Internal;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
using System.Xml.Linq;
|
using System.Xml.Linq;
|
||||||
using UmlautAdaptarr.Models;
|
using UmlautAdaptarr.Models;
|
||||||
using UmlautAdaptarr.Utilities;
|
using UmlautAdaptarr.Utilities;
|
||||||
@@ -174,12 +175,6 @@ namespace UmlautAdaptarr.Services
|
|||||||
// Check if the originalTitle starts with the variation (ignoring case and separators)
|
// Check if the originalTitle starts with the variation (ignoring case and separators)
|
||||||
if (Regex.IsMatch(normalizedOriginalTitle, variationMatchPattern, RegexOptions.IgnoreCase))
|
if (Regex.IsMatch(normalizedOriginalTitle, variationMatchPattern, RegexOptions.IgnoreCase))
|
||||||
{
|
{
|
||||||
// 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))
|
|
||||||
{
|
|
||||||
logger.LogWarning($"TitleMatchingService - Didn't rename: '{originalTitle}' because the expected title '{expectedTitle}' starts with the variation '{variation}'");
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
var originalTitleMatchPattern = "^" + Regex.Escape(variation).Replace("\\ ", "[._ ]");
|
var originalTitleMatchPattern = "^" + Regex.Escape(variation).Replace("\\ ", "[._ ]");
|
||||||
|
|
||||||
// Find the first separator used in the original title for consistent replacement
|
// Find the first separator used in the original title for consistent replacement
|
||||||
@@ -191,6 +186,19 @@ namespace UmlautAdaptarr.Services
|
|||||||
var variationLength = variation.Length;
|
var variationLength = variation.Length;
|
||||||
var suffix = originalTitle[Math.Min(variationLength, originalTitle.Length)..];
|
var suffix = originalTitle[Math.Min(variationLength, originalTitle.Length)..];
|
||||||
|
|
||||||
|
// 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))
|
||||||
|
{
|
||||||
|
// See if we already matched the whole title by checking if S01E01 pattern is coming next to avoid false positives
|
||||||
|
// - that won't help with movies but with tv shows
|
||||||
|
var seasonMatchingPattern = $"^{separator}S\\d{{1,2}}E\\d{{1,2}}";
|
||||||
|
if (!Regex.IsMatch(suffix, seasonMatchingPattern))
|
||||||
|
{
|
||||||
|
logger.LogWarning($"TitleMatchingService - Didn't rename: '{originalTitle}' because the expected title '{expectedTitle}' starts with the variation '{variation}'");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Clean up any leading separators from the suffix
|
// Clean up any leading separators from the suffix
|
||||||
suffix = Regex.Replace(suffix, "^[._ ]+", "");
|
suffix = Regex.Replace(suffix, "^[._ ]+", "");
|
||||||
|
|
||||||
|
|||||||
18
build_and_push_docker_image.bat
Normal file
18
build_and_push_docker_image.bat
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
@echo off
|
||||||
|
SET IMAGE_NAME=pcjones/umlautadaptarr
|
||||||
|
|
||||||
|
echo Enter the version number for the Docker image:
|
||||||
|
set /p VERSION="Version: "
|
||||||
|
|
||||||
|
echo Building Docker image with version %VERSION%...
|
||||||
|
docker build -t %IMAGE_NAME%:%VERSION% .
|
||||||
|
docker tag %IMAGE_NAME%:%VERSION% %IMAGE_NAME%:latest
|
||||||
|
|
||||||
|
echo Pushing Docker image with version %VERSION%...
|
||||||
|
docker push %IMAGE_NAME%:%VERSION%
|
||||||
|
|
||||||
|
echo Pushing Docker image with tag latest...
|
||||||
|
docker push %IMAGE_NAME%:latest
|
||||||
|
|
||||||
|
echo Done.
|
||||||
|
pause
|
||||||
Reference in New Issue
Block a user