APE: Properly convert track/disk number pairs when writing #216
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This also changes the default track/disk number to `DEFAULT_NUMBER_IN_PAIR`. closes #159
uklotzde
suggested changes
Jul 3, 2023
| @@ -18,7 +18,7 @@ byteorder = "1.4.3" | |||
| # ID3 compressed frames | |||
| flate2 = { version = "1.0.26", optional = true } | |||
| # Proc macros | |||
| lofty_attr = "0.8.0" | |||
| lofty_attr = { path = "lofty_attr" } | |||
There was a problem hiding this comment.
Yes, it used ape::tag::tagitems_into_ape, which was changed.
src/id3/v2/util/pairs.rs
Outdated
| /// Attempts to convert a `TagItem` to a number, passing it to `setter` | ||
| pub(crate) fn set_number<F: FnMut(u32)>(item: &TagItem, mut setter: F) { | ||
| let text = item.value().text(); | ||
| let number = text.map(str::parse::<u32>); |
There was a problem hiding this comment.
What happens if a field is empty or solely contains whitespace characters? These cases should probably be interpreted like a missing field.
The parsing should also not fail if the number is enclosed in leading/trailing whitespace characters, e.g. parsing " 12 " should not fail.
There was a problem hiding this comment.
The text should be trimmed and then checked for emptiness before trying to parse the number.
Now whitespace will be trimmed and empty strings will be ignored.
uklotzde
reviewed
Jul 3, 2023
src/id3/v2/util/pairs.rs
Outdated
|
|
||
| /// Attempts to convert a `TagItem` to a number, passing it to `setter` | ||
| pub(crate) fn set_number<F: FnMut(u32)>(item: &TagItem, mut setter: F) { | ||
| let text = item.value().text().map(str::trim); |
There was a problem hiding this comment.
Too many local variables with confusing naming. How about this:
let trimmed_text = item.value().text().unwrap_or_default().trim();
if trimmed_text.is_empty() {
...early return...
}
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This also changes the default track/disk number to
DEFAULT_NUMBER_IN_PAIR.closes #159