Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-25 16:38:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Ensure names containing characters other than a-z A-Z 0-9 or _ are unique (#5810)

Browse source
This commit is contained in:
J. Nick Koston 2023-11-24 00:29:08 +01:00 committed by GitHub
parent 9f8a896e13
commit 5c31bec8c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
esphome/core/helpers.cpp
View file

@ -278,10 +278,13 @@ std::string str_snake_case(const std::string &str) {
return result; return result;
} }
std::string str_sanitize(const std::string &str) { std::string str_sanitize(const std::string &str) {
std::string out; std::string out = str;
std::copy_if(str.begin(), str.end(), std::back_inserter(out), [](const char &c) { std::replace_if(
return c == '-' || c == '_' || (c >= '0' && c <= '9') || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'); out.begin(), out.end(),
}); [](const char &c) {
return !(c == '-' || c == '_' || (c >= '0' && c <= '9') || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'));
},
'_');
return out; return out;
} }
std::string str_snprintf(const char *fmt, size_t len, ...) { std::string str_snprintf(const char *fmt, size_t len, ...) {

5
esphome/helpers.py
View file

@ -357,6 +357,9 @@ def snake_case(value):
return value.replace(" ", "_").lower() return value.replace(" ", "_").lower()
_DISALLOWED_CHARS = re.compile(r"[^a-zA-Z0-9_]")
def sanitize(value): def sanitize(value):
"""Same behaviour as `helpers.cpp` method `str_sanitize`.""" """Same behaviour as `helpers.cpp` method `str_sanitize`."""
return re.sub("[^-_0-9a-zA-Z]", r"", value) return _DISALLOWED_CHARS.sub("_", value)

6
tests/unit_tests/test_helpers.py
View file

@ -258,9 +258,9 @@ def test_snake_case(text, expected):
"text, expected", "text, expected",
( (
("foo_bar", "foo_bar"), ("foo_bar", "foo_bar"),
('!"§$%&/()=?foo_bar', "foo_bar"), ('!"§$%&/()=?foo_bar', "___________foo_bar"),
('foo_!"§$%&/()=?bar', "foo_bar"), ('foo_!"§$%&/()=?bar', "foo____________bar"),
('foo_bar!"§$%&/()=?', "foo_bar"), ('foo_bar!"§$%&/()=?', "foo_bar___________"),
), ),
) )
def test_sanitize(text, expected): def test_sanitize(text, expected):