From d67e40180dbf15098b4ee7a59feeb6183d034436 Mon Sep 17 00:00:00 2001 From: bskjon Date: Sat, 20 Jul 2024 16:27:23 +0200 Subject: [PATCH] v3 41 - Adjusting directory/collection matching + error checking for metadata --- .../tasksV2/listeners/MediaOutInformationTaskListener.kt | 8 ++++++-- apps/pyMetadata/sources/anii.py | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/MediaOutInformationTaskListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/MediaOutInformationTaskListener.kt index 59d3b579..21871dd1 100644 --- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/MediaOutInformationTaskListener.kt +++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/MediaOutInformationTaskListener.kt @@ -101,12 +101,16 @@ class MediaOutInformationTaskListener: CoordinatorEventListener() { fun getAlreadyUsedForCollectionOrTitle(): String { val exisiting = getExistingCollections() - val existingMatch = exisiting.find { it.contains(baseInfo.title) } + val existingMatch = exisiting.find { it.lowercase().contains(baseInfo.title.lowercase()) } if (existingMatch != null) { return existingMatch } + val metaTitles = getTitlesFromMetadata() - return metaTitles.firstOrNull { it.contains(baseInfo.title) } + val existingMatchOnMeta = metaTitles.find { it.lowercase().contains(baseInfo.title.lowercase()) } + + + return existingMatchOnMeta ?: (getTitlesFromMetadata().firstOrNull { it in exisiting } ?: getTitlesFromMetadata().firstOrNull() ?: baseInfo.title) } diff --git a/apps/pyMetadata/sources/anii.py b/apps/pyMetadata/sources/anii.py index 7f09735d..5b191946 100644 --- a/apps/pyMetadata/sources/anii.py +++ b/apps/pyMetadata/sources/anii.py @@ -33,7 +33,7 @@ class Anii(SourceBase): except IndexError: pass except Exception as e: - if "Data post unsuccessful. (429)" in e: + if "Data post unsuccessful. (429)" in str(e): log.error("Failed to read Anii") else: log.exception(e)