Add support for including/excluding artists and songs #8

Merged

spenser merged 8 commits from include-exclude-filtering into main

2026-05-07 03:49:46 +00:00

spenser commented

2026-05-07 03:47:25 +00:00

Owner

Adds four new template-only options that allow the player to further control the songs selected:

include_songs: Songs that MUST be included. Causes a generation failure if the song is excluded by setlist/instrument options.
include_artists: Include songs from a particular artist. Songs added to include_songs count for this.
exclude_songs: Songs that should NOT be included.
exclude_artists: Artists that no songs should be included.

There's a bit of interesting logic around putting similar values in include and exclude. For example, excluding an artist but including a song, or vice versa. We do our to resolve how the user probably wants them to be.

This wound up making tracks.py large enough that it justified splitting it up into multiple files. It also makes testing a bit cleaner, although there's not nearly enough tests in this currently.

Also includes some miscellaneous cleanup and bug fixes found by failing tests.

Adds four new template-only options that allow the player to further control the songs selected: * `include_songs`: Songs that MUST be included. Causes a generation failure if the song is excluded by setlist/instrument options. * `include_artists`: Include <n> songs from a particular artist. Songs added to `include_songs` count for this. * `exclude_songs`: Songs that should NOT be included. * `exclude_artists`: Artists that no songs should be included. There's a bit of interesting logic around putting similar values in include and exclude. For example, excluding an artist but including a song, or vice versa. We do our to resolve how the user probably wants them to be. This wound up making `tracks.py` large enough that it justified splitting it up into multiple files. It also makes testing a bit cleaner, although there's not nearly enough tests in this currently. Also includes some miscellaneous cleanup and bug fixes found by failing tests.

spenser added 7 commits

2026-05-07 03:47:25 +00:00

Add options for including/excluding artists and songs 73c7ef18fc

Add new helper method SongMeta.has_any_instrument 9113b97fda

Add song filtering logic based on new options 3f8111f393

Break up tracks code and move into submodule 10205a1ed9

Update world to use new options and add some error checks 7050f688bb

Formatting fixes aec6d3b3ba

Add filter tests, move track tests to submodule c76cd7b184

spenser added 1 commit

2026-05-07 03:49:21 +00:00

Reformat code b3365b650b