From f790196ac58ec47bbd817266f0e56e828d41218f Mon Sep 17 00:00:00 2001 From: ahmed Date: Wed, 11 Mar 2026 22:38:18 -0400 Subject: [PATCH] Improve edge case where clean songs are in an explicit album (e.g PARTYMOBILE) --- __init__.py | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/__init__.py b/__init__.py index a9c81c4..10a8f75 100644 --- a/__init__.py +++ b/__init__.py @@ -31,28 +31,33 @@ def process_track(_, metadata, track, __): stripped_disambiguation = disambiguation stripped_album_disambiguation = album_disambiguation - if explicit_match or album_explicit_match: + if explicit_match: metadata["itunesadvisory"] = iTunesAdvisory.EXPLICIT.value - if config.setting["ecd2itat_save_rtng"]: metadata["rtng"] = rtng.EXPLICIT.value - - if config.setting["ecd2itat_strip_keyword_from_disambiguation"]: - if explicit_match: - stripped_disambiguation = strip_keyword_from_disambiguation(disambiguation, explicit_match) - if album_explicit_match: - stripped_album_disambiguation = strip_keyword_from_disambiguation(album_disambiguation, album_explicit_match) - elif clean_match or album_clean_match: + elif clean_match: metadata["itunesadvisory"] = iTunesAdvisory.CLEAN.value - - if (config.setting["ecd2itat_save_rtng"]): + if config.setting["ecd2itat_save_rtng"]: + metadata["rtng"] = rtng.CLEAN.value + elif album_explicit_match: + metadata["itunesadvisory"] = iTunesAdvisory.EXPLICIT.value + if config.setting["ecd2itat_save_rtng"]: + metadata["rtng"] = rtng.EXPLICIT.value + elif album_clean_match: + metadata["itunesadvisory"] = iTunesAdvisory.CLEAN.value + if config.setting["ecd2itat_save_rtng"]: metadata["rtng"] = rtng.CLEAN.value - if config.setting["ecd2itat_strip_keyword_from_disambiguation"]: - if clean_match: - stripped_disambiguation = strip_keyword_from_disambiguation(disambiguation, clean_match) - if album_clean_match: - stripped_album_disambiguation = strip_keyword_from_disambiguation(album_disambiguation, album_clean_match) + if config.setting["ecd2itat_strip_keyword_from_disambiguation"]: + if explicit_match: + stripped_disambiguation = strip_keyword_from_disambiguation(disambiguation, explicit_match) + elif clean_match: + stripped_disambiguation = strip_keyword_from_disambiguation(disambiguation, clean_match) + + if album_explicit_match: + stripped_album_disambiguation = strip_keyword_from_disambiguation(album_disambiguation, album_explicit_match) + elif album_clean_match: + stripped_album_disambiguation = strip_keyword_from_disambiguation(album_disambiguation, album_clean_match) metadata["~recordingcomment"] = stripped_disambiguation metadata["~releasecomment"] = stripped_album_disambiguation