Core: organize files on ingest via alpha, not ascii #3029
Conversation
github-actions
bot
added
affects: core
Generate.py
Outdated
| @@ -120,7 +120,7 @@ def main(args=None, callback=ERmain): | |||
| raise ValueError(f"File {fname} is invalid. Please fix your yaml.") from e | |||
|
|
|||
| # sort dict for consistent results across platforms: | |||
| weights_cache = {key: value for key, value in sorted(weights_cache.items())} | |||
| weights_cache = {key: value for key, value in sorted(weights_cache.items(), key=lambda k: k[0].lower())} | |||
There was a problem hiding this comment.
Is the idea here that we're doing case-insensitive sorting only on the first letter, because it's unlikely to matter on the other letters?
If so, I'd rather do the whole string; it seems unlikely that sorting the filenames is a hot path (if it was, we probably couldn't afford to log all of them). The Python docs suggest key=str.casefold as a way to do case-insensitive sorting, which seems more self-explanatory to me.
There was a problem hiding this comment.
The sort is operating on tuples, such as the below:
('user.yaml',
({'game': {'accessibility': 'items',
'progression_balancing': 0},
'game': 'game',
'name': 'user'},))
The filename (what we're trying to sort) is the zeroeth portion of that tuple. I wasn't able to use str.lower() because it's not a simple string, so had to use a lambda expression instead. I have made the change from lower() to casefold().
There was a problem hiding this comment.
Huh, I could've sworn I checked that this wasn't a tuple and that's why the [0] was confusing me. Oh well.
Exempt-Medic
added
is: enhancement
* organize files on ingest via alpha, not ascii * Change from lower() to casefold()
* organize files on ingest via alpha, not ascii * Change from lower() to casefold()
Please format your title with what portion of the project this pull request is
targeting and what it's changing.
ex. "MyGame4: implement new game" or "Docs: add new guide for customizing MyGame3"
What is this fixing or adding?
Use alphabetic rather than asciibetic sorting when ingesting files for generation (upper and lower case letters will be interspersed rather than upper case before lower case. This doesn't fully order names. It's unclear if that would make things easier or harder (having all seeds together from a single file may make them easier to find).
How was this tested?
Generated many seeds.
If this makes graphical changes, please attach screenshots.