mirror of
https://github.com/profanity-im/profanity.git
synced 2024-10-06 20:03:46 -04:00
Optimised contact comparisons, create utf8 collate key once
This commit is contained in:
parent
5067e565e3
commit
ca3f7412f5
@ -45,7 +45,9 @@
|
||||
|
||||
struct p_contact_t {
|
||||
char *barejid;
|
||||
gchar *barejid_collate_key;
|
||||
char *name;
|
||||
gchar *name_collate_key;
|
||||
GSList *groups;
|
||||
char *subscription;
|
||||
char *offline_message;
|
||||
@ -62,11 +64,14 @@ p_contact_new(const char * const barejid, const char * const name,
|
||||
{
|
||||
PContact contact = malloc(sizeof(struct p_contact_t));
|
||||
contact->barejid = strdup(barejid);
|
||||
contact->barejid_collate_key = g_utf8_collate_key(contact->barejid, -1);
|
||||
|
||||
if (name) {
|
||||
contact->name = strdup(name);
|
||||
contact->name_collate_key = g_utf8_collate_key(contact->name, -1);
|
||||
} else {
|
||||
contact->name = NULL;
|
||||
contact->name_collate_key = NULL;
|
||||
}
|
||||
|
||||
contact->groups = groups;
|
||||
@ -96,8 +101,10 @@ void
|
||||
p_contact_set_name(const PContact contact, const char * const name)
|
||||
{
|
||||
FREE_SET_NULL(contact->name);
|
||||
FREE_SET_NULL(contact->name_collate_key);
|
||||
if (name) {
|
||||
contact->name = strdup(name);
|
||||
contact->name_collate_key = g_utf8_collate_key(contact->name, -1);
|
||||
}
|
||||
}
|
||||
|
||||
@ -146,7 +153,9 @@ p_contact_free(PContact contact)
|
||||
{
|
||||
if (contact) {
|
||||
free(contact->barejid);
|
||||
free(contact->barejid_collate_key);
|
||||
free(contact->name);
|
||||
free(contact->name_collate_key);
|
||||
free(contact->subscription);
|
||||
free(contact->offline_message);
|
||||
|
||||
@ -170,12 +179,24 @@ p_contact_barejid(const PContact contact)
|
||||
return contact->barejid;
|
||||
}
|
||||
|
||||
const char *
|
||||
p_contact_barejid_collate_key(const PContact contact)
|
||||
{
|
||||
return contact->barejid_collate_key;
|
||||
}
|
||||
|
||||
const char *
|
||||
p_contact_name(const PContact contact)
|
||||
{
|
||||
return contact->name;
|
||||
}
|
||||
|
||||
const char *
|
||||
p_contact_name_collate_key(const PContact contact)
|
||||
{
|
||||
return contact->name_collate_key;
|
||||
}
|
||||
|
||||
const char *
|
||||
p_contact_name_or_jid(const PContact contact)
|
||||
{
|
||||
|
@ -47,7 +47,9 @@ void p_contact_add_resource(PContact contact, Resource *resource);
|
||||
gboolean p_contact_remove_resource(PContact contact, const char * const resource);
|
||||
void p_contact_free(PContact contact);
|
||||
const char* p_contact_barejid(PContact contact);
|
||||
const char* p_contact_barejid_collate_key(PContact contact);
|
||||
const char* p_contact_name(PContact contact);
|
||||
const char* p_contact_name_collate_key(PContact contact);
|
||||
const char* p_contact_name_or_jid(const PContact contact);
|
||||
const char* p_contact_presence(PContact contact);
|
||||
const char* p_contact_status(PContact contact);
|
||||
|
@ -507,24 +507,18 @@ gint _compare_contacts(PContact a, PContact b)
|
||||
const char * utf8_str_a = NULL;
|
||||
const char * utf8_str_b = NULL;
|
||||
|
||||
if (p_contact_name(a)) {
|
||||
utf8_str_a = p_contact_name(a);
|
||||
if (p_contact_name_collate_key(a)) {
|
||||
utf8_str_a = p_contact_name_collate_key(a);
|
||||
} else {
|
||||
utf8_str_a = p_contact_barejid(a);
|
||||
utf8_str_a = p_contact_barejid_collate_key(a);
|
||||
}
|
||||
if (p_contact_name(b)) {
|
||||
utf8_str_b = p_contact_name(b);
|
||||
if (p_contact_name_collate_key(b)) {
|
||||
utf8_str_b = p_contact_name_collate_key(b);
|
||||
} else {
|
||||
utf8_str_b = p_contact_barejid(b);
|
||||
utf8_str_b = p_contact_barejid_collate_key(b);
|
||||
}
|
||||
|
||||
gchar *key_a = g_utf8_collate_key(utf8_str_a, -1);
|
||||
gchar *key_b = g_utf8_collate_key(utf8_str_b, -1);
|
||||
|
||||
gint result = g_strcmp0(key_a, key_b);
|
||||
|
||||
g_free(key_a);
|
||||
g_free(key_b);
|
||||
gint result = g_strcmp0(utf8_str_a, utf8_str_b);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user