diff --git a/docs/config.rst b/docs/config.rst index adb05693..273328e7 100644 --- a/docs/config.rst +++ b/docs/config.rst @@ -194,8 +194,6 @@ match_filters music_tags '''''''''' .. autoclass:: ytdl_sub.plugins.music_tags.MusicTagsOptions() - :members: - :exclude-members: partial_validate, embed_thumbnail ------------------------------------------------------------------------------- diff --git a/src/ytdl_sub/plugins/music_tags.py b/src/ytdl_sub/plugins/music_tags.py index 6eae0b1c..7266bb66 100644 --- a/src/ytdl_sub/plugins/music_tags.py +++ b/src/ytdl_sub/plugins/music_tags.py @@ -1,7 +1,7 @@ from collections import defaultdict -from typing import Any, Optional from typing import Dict from typing import List +from typing import Optional import mediafile @@ -65,8 +65,10 @@ class MusicTagsOptions(OptionsDictValidator): tags: artist: "{artist}" album: "{album}" - genre: "ytdl-sub" # Supports id3v2.4 multi-tags + genres: + - "{genre}" + - "ytdl-sub" albumartists: - "{artist}" - "ytdl-sub" @@ -93,7 +95,6 @@ class MusicTagsOptions(OptionsDictValidator): self._is_old_format = True self._tags = tags_validator or MusicTagsValidator(name=name, value={}) - @property def tags(self) -> MusicTagsValidator: """ @@ -126,6 +127,7 @@ class MusicTagsPlugin(Plugin[MusicTagsOptions]): f"to audio using the audio_extract plugin." ) + # pylint: disable=protected-access if self.plugin_options._is_old_format: logger.warning( "music_tags.tags is now deprecated. Place your tags directly under music_tags " diff --git a/tests/e2e/plugins/test_audio_extract.py b/tests/e2e/plugins/test_audio_extract.py index 136b0cec..d09ab6f0 100644 --- a/tests/e2e/plugins/test_audio_extract.py +++ b/tests/e2e/plugins/test_audio_extract.py @@ -24,6 +24,7 @@ def single_song_preset_dict_old_format(output_directory): }, } + @pytest.fixture def single_song_preset_dict(output_directory): return { @@ -43,6 +44,7 @@ def single_song_preset_dict(output_directory): }, } + @pytest.fixture def multiple_songs_preset_dict(output_directory): return {