Skip to content

command: unset metadata key if string is empty #18377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
myQwil wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −2
Open

command: unset metadata key if string is empty #18377

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions player/command.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1342,10 +1342,16 @@ static int tag_property(int action, void *arg, struct mp_tags *tags)
.type = CONF_TYPE_STRING,
};
return M_PROPERTY_OK;
case M_PROPERTY_SET:
mp_tags_set_bstr(tags, k, bstr0(*(char **)ka->arg));
case M_PROPERTY_SET: {
bstr v = bstr0(*(char **)ka->arg);
if (v.len == 0) {
Comment on lines +1346 to +1347

@CounterPillow CounterPillow Aug 16, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason why we instantiate a bstr from ka->arg here to check for v.len == 0 rather than checking !ka->arg? I.e., is it possible that ka->arg points to a string that's just '\0' and this should also be handled?

@myQwil myQwil Aug 16, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's essentially what we're already checking when we ask if v.len == 0, since bstr0 calls strlen to determine the string's length. Either way works, i just thought this way was a little bit more readable.

@CounterPillow CounterPillow Aug 16, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I'm wondering if the check is redundant (i.e. we're never passed a pointer to a \0) to turn this into this

if (!ka->arg)
    mp_tags_remove_bstr(tags, k);
else
    mp_tags_set_bstr(tags, k, bstr0(*(char **)ka->arg));

but if there's any chance that we do get passed a pointer to \0 as an empty string, then your way is both correct and necessary

@kasper93 kasper93 Aug 17, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no redundant check bstr0 is inlined there and the flow will be exactly the same. It's more safe this way if we ever pass "" there, and if not there is zero overhead. Also we need bstr anyway.

@CounterPillow CounterPillow Aug 17, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, due to the inlining the compiler will fold those two checks into one, so this is strictly better. Sorry for the noise.

@myQwil myQwil Aug 21, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, it's not possible to pass, from the lua end, a value of nil. You'll get an error saying that that's not a valid type for this property. It has to be a string (or number). So !ka->arg will never be true. You have to double-dereference it, first to get the char pointer, and then again to find out if its first character is '\0'.

mp_tags_remove_bstr(tags, k);
} else {
mp_tags_set_bstr(tags, k, v);
}
return M_PROPERTY_OK;
}
}
}
}
return M_PROPERTY_NOT_IMPLEMENTED;
Expand Down
Loading