Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix sorting of files/dirs in dialogs

Browse source 
Sorts leading `_` before other characters except `.`.
This commit is contained in:
A Thousand Ships 2024-02-02 16:50:23 +01:00
parent fe01776f05
commit 2cbf469912
No known key found for this signature in database
GPG key ID: 2033189A662F8BD7
13 changed files with 181 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

165
core/string/ustring.cpp
View file

@ -927,52 +927,106 @@ static _FORCE_INLINE_ signed char natural_cmp_common(const char32_t *&r_this_str
return 0;
}
static _FORCE_INLINE_ signed char naturalcasecmp_to_base(const char32_t *p_this_str, const char32_t *p_that_str) {
if (p_this_str && p_that_str) {
while (*p_this_str == '.' || *p_that_str == '.') {
if (*p_this_str++ != '.') {
return 1;
}
if (*p_that_str++ != '.') {
return -1;
}
if (!*p_that_str) {
return 1;
}
if (!*p_this_str) {
return -1;
}
}
while (*p_this_str) {
if (!*p_that_str) {
return 1;
} else if (is_digit(*p_this_str)) {
if (!is_digit(*p_that_str)) {
return -1;
}
signed char ret = natural_cmp_common(p_this_str, p_that_str);
if (ret) {
return ret;
}
} else if (is_digit(*p_that_str)) {
return 1;
} else {
if (*p_this_str < *p_that_str) { // If current character in this is less, we are less.
return -1;
} else if (*p_this_str > *p_that_str) { // If current character in this is greater, we are greater.
return 1;
}
p_this_str++;
p_that_str++;
}
}
if (*p_that_str) {
return -1;
}
}
return 0;
}
signed char String::naturalcasecmp_to(const String &p_str) const {
const char32_t *this_str = get_data();
const char32_t *that_str = p_str.get_data();
if (this_str && that_str) {
while (*this_str == '.' || *that_str == '.') {
if (*this_str++ != '.') {
return naturalcasecmp_to_base(this_str, that_str);
}
static _FORCE_INLINE_ signed char naturalnocasecmp_to_base(const char32_t *p_this_str, const char32_t *p_that_str) {
if (p_this_str && p_that_str) {
while (*p_this_str == '.' || *p_that_str == '.') {
if (*p_this_str++ != '.') {
return 1;
}
if (*that_str++ != '.') {
if (*p_that_str++ != '.') {
return -1;
}
if (!*that_str) {
if (!*p_that_str) {
return 1;
}
if (!*this_str) {
if (!*p_this_str) {
return -1;
}
}
while (*this_str) {
if (!*that_str) {
while (*p_this_str) {
if (!*p_that_str) {
return 1;
} else if (is_digit(*this_str)) {
if (!is_digit(*that_str)) {
} else if (is_digit(*p_this_str)) {
if (!is_digit(*p_that_str)) {
return -1;
}
signed char ret = natural_cmp_common(this_str, that_str);
signed char ret = natural_cmp_common(p_this_str, p_that_str);
if (ret) {
return ret;
}
} else if (is_digit(*that_str)) {
} else if (is_digit(*p_that_str)) {
return 1;
} else {
if (*this_str < *that_str) { // If current character in this is less, we are less.
if (_find_upper(*p_this_str) < _find_upper(*p_that_str)) { // If current character in this is less, we are less.
return -1;
} else if (*this_str > *that_str) { // If current character in this is greater, we are greater.
} else if (_find_upper(*p_this_str) > _find_upper(*p_that_str)) { // If current character in this is greater, we are greater.
return 1;
}
this_str++;
that_str++;
p_this_str++;
p_that_str++;
}
}
if (*that_str) {
if (*p_that_str) {
return -1;
}
}
@ -984,55 +1038,50 @@ signed char String::naturalnocasecmp_to(const String &p_str) const {
const char32_t *this_str = get_data();
const char32_t *that_str = p_str.get_data();
if (this_str && that_str) {
while (*this_str == '.' || *that_str == '.') {
if (*this_str++ != '.') {
return 1;
}
if (*that_str++ != '.') {
return -1;
}
if (!*that_str) {
return 1;
}
if (!*this_str) {
return -1;
}
}
return naturalnocasecmp_to_base(this_str, that_str);
}
while (*this_str) {
if (!*that_str) {
return 1;
} else if (is_digit(*this_str)) {
if (!is_digit(*that_str)) {
return -1;
}
signed char ret = natural_cmp_common(this_str, that_str);
if (ret) {
return ret;
}
} else if (is_digit(*that_str)) {
return 1;
} else {
if (_find_upper(*this_str) < _find_upper(*that_str)) { // If current character in this is less, we are less.
return -1;
} else if (_find_upper(*this_str) > _find_upper(*that_str)) { // If current character in this is greater, we are greater.
return 1;
}
this_str++;
that_str++;
}
static _FORCE_INLINE_ signed char file_cmp_common(const char32_t *&r_this_str, const char32_t *&r_that_str) {
// Compare leading `_` sequences.
while (*r_this_str && *r_that_str) {
// Sort `_` lower than everything except `.`
if (*r_this_str != '_' && *r_that_str == '_') {
return *r_this_str == '.' ? -1 : 1;
}
if (*that_str) {
return -1;
if (*r_this_str == '_' && *r_that_str != '_') {
return *r_that_str == '.' ? 1 : -1;
}
r_this_str++;
r_that_str++;
}
return 0;
}
signed char String::filecasecmp_to(const String &p_str) const {
const char32_t *this_str = get_data();
const char32_t *that_str = p_str.get_data();
signed char ret = file_cmp_common(this_str, that_str);
if (ret) {
return ret;
}
return naturalcasecmp_to_base(this_str, that_str);
}
signed char String::filenocasecmp_to(const String &p_str) const {
const char32_t *this_str = get_data();
const char32_t *that_str = p_str.get_data();
signed char ret = file_cmp_common(this_str, that_str);
if (ret) {
return ret;
}
return naturalnocasecmp_to_base(this_str, that_str);
}
const char32_t *String::get_data() const {
static const char32_t zero = 0;
return size() ? &operator[](0) : &zero;