diff --git a/src/ytdl_sub/validators/string_formatter_validators.py b/src/ytdl_sub/validators/string_formatter_validators.py index 1581c702..21715c03 100644 --- a/src/ytdl_sub/validators/string_formatter_validators.py +++ b/src/ytdl_sub/validators/string_formatter_validators.py @@ -183,12 +183,13 @@ class DictFormatterValidator(LiteralDictValidator): super().__init__(name, value) for key in self._keys: - self._value[key] = self._validate_key(key=key, validator=self._key_validator) + # Gets stored in __validator_dict + _ = self._validate_key(key=key, validator=self._key_validator) @property def dict(self) -> Dict[str, StringFormatterValidator]: """Returns dict with string formatter values""" - return self._value + return self._validator_dict @property def dict_with_format_strings(self) -> Dict[str, str]: diff --git a/tests/resources/expected_json/music_video/inspect_full_overrides.json b/tests/resources/expected_json/music_video/inspect_full_overrides.json index 0ad15d9a..7325202e 100644 --- a/tests/resources/expected_json/music_video/inspect_full_overrides.json +++ b/tests/resources/expected_json/music_video/inspect_full_overrides.json @@ -10,7 +10,7 @@ "file_uid": "{ %sanitize_plex_episode( %map_get( entry_metadata, \"id\" ) ) }", "include_sibling_metadata": "{ %bool(False) }", "modified_webpage_url": "{ %map_get( entry_metadata, \"webpage_url\" ) }", - "music_video_album": "{ %get_url_field( \"category\", music_video_album_default ) }", + "music_video_album": "Music Videos", "music_video_album_default": "Music Videos", "music_video_artist": "Rick Astley", "music_video_date": "{ %elif( %contains_url_field( \"date\" ), %get_url_field( \"date\", upload_date_standardized ), %contains_url_field( \"year\" ), %concat( %get_url_field( \"date\", upload_year ), \"-01-01\" ), upload_date_standardized ) }", diff --git a/tests/resources/expected_json/music_video/inspect_full_variables.json b/tests/resources/expected_json/music_video/inspect_full_variables.json index fa8b5c85..34dc4392 100644 --- a/tests/resources/expected_json/music_video/inspect_full_variables.json +++ b/tests/resources/expected_json/music_video/inspect_full_variables.json @@ -59,10 +59,10 @@ "info_json_ext_sanitized": "info.json", "modified_webpage_url": "{ %map_get( entry_metadata, \"webpage_url\" ) }", "modified_webpage_url_sanitized": "{ %sanitize( %map_get( entry_metadata, \"webpage_url\" ) ) }", - "music_video_album": "{ %get_url_field( \"category\", music_video_album_default ) }", + "music_video_album": "Music Videos", "music_video_album_default": "Music Videos", "music_video_album_default_sanitized": "Music Videos", - "music_video_album_sanitized": "{ %sanitize( %get_url_field( \"category\", music_video_album_default ) ) }", + "music_video_album_sanitized": "Music Videos", "music_video_artist": "Rick Astley", "music_video_artist_sanitized": "Rick Astley", "music_video_date": "{ %elif( %contains_url_field( \"date\" ), %get_url_field( \"date\", upload_date_standardized ), %contains_url_field( \"year\" ), %concat( %get_url_field( \"date\", upload_year ), \"-01-01\" ), upload_date_standardized ) }", diff --git a/tests/resources/expected_json/music_video/inspect_overrides.json b/tests/resources/expected_json/music_video/inspect_overrides.json index a0b3c3a1..41e0f19d 100644 --- a/tests/resources/expected_json/music_video/inspect_overrides.json +++ b/tests/resources/expected_json/music_video/inspect_overrides.json @@ -10,7 +10,7 @@ "file_uid": "{ uid_sanitized_plex }", "include_sibling_metadata": "{ %bool(False) }", "modified_webpage_url": "{ webpage_url }", - "music_video_album": "{ %get_url_field( \"category\", music_video_album_default ) }", + "music_video_album": "{ %get_url_field( \"category\", \"Music Videos\" ) }", "music_video_album_default": "Music Videos", "music_video_artist": "Rick Astley", "music_video_date": "{ %elif( %contains_url_field( \"date\" ), %get_url_field( \"date\", upload_date_standardized ), %contains_url_field( \"year\" ), %concat( %get_url_field( \"date\", upload_year ), \"-01-01\" ), upload_date_standardized ) }", diff --git a/tests/resources/expected_json/music_video/inspect_variables.json b/tests/resources/expected_json/music_video/inspect_variables.json index 318f2685..41606b71 100644 --- a/tests/resources/expected_json/music_video/inspect_variables.json +++ b/tests/resources/expected_json/music_video/inspect_variables.json @@ -59,10 +59,10 @@ "info_json_ext_sanitized": "info.json", "modified_webpage_url": "{ webpage_url }", "modified_webpage_url_sanitized": "{ %sanitize( webpage_url ) }", - "music_video_album": "{ %get_url_field( \"category\", music_video_album_default ) }", + "music_video_album": "{ %get_url_field( \"category\", \"Music Videos\" ) }", "music_video_album_default": "Music Videos", "music_video_album_default_sanitized": "Music Videos", - "music_video_album_sanitized": "{ %sanitize( %get_url_field( \"category\", music_video_album_default ) ) }", + "music_video_album_sanitized": "{ %sanitize( %get_url_field( \"category\", \"Music Videos\" ) ) }", "music_video_artist": "Rick Astley", "music_video_artist_sanitized": "Rick Astley", "music_video_date": "{ %elif( %contains_url_field( \"date\" ), %get_url_field( \"date\", upload_date_standardized ), %contains_url_field( \"year\" ), %concat( %get_url_field( \"date\", upload_year ), \"-01-01\" ), upload_date_standardized ) }",