Skip to content

Commit

Permalink
jmap_contact.c: consolidate localizations handling and fix invalid re…
Browse files Browse the repository at this point in the history 
…porting
  • Loading branch information
@ksmurchison
ksmurchison committed Jul 27, 2023
1 parent e301bd7 commit f58597d
Show file tree
Hide file tree
Showing 3 changed files with 120 additions and 131 deletions.
53 changes: 1 addition & 52 deletions cassandane/tiny-tests/JMAPContacts/card-get-localizations
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,57 +134,6 @@ EOF
# Normalize and compare cards
normalize_jscard($want_jscard);
normalize_jscard($have_jscard);
warn Dumper($want_jscard);
warn Dumper($have_jscard);

$self->assert_deep_equals($want_jscard, $have_jscard);
return;
$self->assert_str_equals('es', $res->[0][1]{list}[0]{'language'});
$self->assert_str_equals('Gabriel García Márquez',
$res->[0][1]{list}[0]{'name'}{'full'});
$self->assert_deep_equals([
{ 'kind' => 'given', 'value' => 'Gabriel' },
{ 'kind' => 'given2', 'value' => 'García' },
{ 'kind' => 'surname', 'value' => 'Márquez' }
], $res->[0][1]{list}[0]{name}{components});
$self->assert_deep_equals({
't1' => {
'name' => 'Novelista'
}
}, $res->[0][1]{list}[0]{titles});
$self->assert_deep_equals({
'grammaticalGender' => 'neuter',
'pronouns' => {
'k19' => {
'pronouns' => 'él'
}
}
}, $res->[0][1]{list}[0]{speakToAs});
$self->assert_deep_equals({
'addr1' => {
'locality' => 'Tokio'
}
}, $res->[0][1]{list}[0]{addresses});
$self->assert_str_equals('Novelist',
$res->[0][1]{list}[0]{localizations}{en}{'titles/t1/name'});
$self->assert_str_equals('masculine',
$res->[0][1]{list}[0]{localizations}{en}{'speakToAs/grammaticalGender'});
$self->assert_str_equals('Tokyo',
$res->[0][1]{list}[0]{localizations}{en}{'addresses/addr1/locality'});
$self->assert_str_equals('Écrivain',
$res->[0][1]{list}[0]{localizations}{fr}{'titles/t1/name'});
$self->assert_str_equals('il',
$res->[0][1]{list}[0]{localizations}{fr}{'speakToAs/pronouns/k19/pronouns'});
$self->assert_str_equals('er',
$res->[0][1]{list}[0]{localizations}{de}{'speakToAs/pronouns/k19/pronouns'});
$self->assert_str_equals('lui',
$res->[0][1]{list}[0]{localizations}{it}{'speakToAs/pronouns/k19/pronouns'});
$self->assert_str_equals('ガブリエル・ガルシア・マルケス',
$res->[0][1]{list}[0]{localizations}{jp}{'name/full'});
$self->assert_str_equals('東京',
$res->[0][1]{list}[0]{localizations}{jp}{'addresses/addr1/locality'});
$self->assert_deep_equals([
{ 'kind' => 'given', 'value' => 'ガブリエル' },
{ 'kind' => 'given2', 'value' => 'ガルシア' },
{ 'kind' => 'surname', 'value' => 'マルケス' }
], $res->[0][1]{list}[0]{localizations}{jp}{'name/components'});
}
8 changes: 6 additions & 2 deletions cassandane/tiny-tests/JMAPContacts/card-set-create-localizations-bad
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ sub test_card_set_create_localizations_bad
}
},
jp => {
'name/foo/bar' => JSON::false,
'titles/t2/title/foo' => JSON::false,
'speakToAs/foo/bar' => JSON::false
}
}
Expand All @@ -68,13 +70,15 @@ sub test_card_set_create_localizations_bad

$self->assert_str_equals('invalidProperties',
$res->[0][1]{notCreated}{1}{type});
$self->assert_num_equals(4,
$self->assert_num_equals(6,
scalar @{$res->[0][1]{notCreated}{1}{properties}});

my @bad_props = sort @{$res->[0][1]{notCreated}{1}{properties}};

$self->assert_str_equals('localizations/de/titles/foo', $bad_props[0]);
$self->assert_str_equals('localizations/en/foo/bar', $bad_props[1]);
$self->assert_str_equals('localizations/es/titles/t1/name', $bad_props[2]);
$self->assert_str_equals('localizations/jp/speakToAs/foo/bar', $bad_props[3]);
$self->assert_str_equals('localizations/jp/name/foo/bar', $bad_props[3]);
$self->assert_str_equals('localizations/jp/speakToAs/foo/bar', $bad_props[4]);
$self->assert_str_equals('localizations/jp/titles/t2/title/foo', $bad_props[5]);
}
190 changes: 113 additions & 77 deletions imap/jmap_contact.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8456,6 +8456,87 @@ static unsigned _jsobject_to_card(struct jmap_parser *parser, json_t *obj,
return r;
}

struct l10n_rock {
unsigned is_multi: 1;
union {
unsigned (*prop_cb)(struct jmap_parser *, json_t *,
struct l10n_by_id_t *, vcardcomponent *);
struct {
const char *type;
prop_cb_t prop_cb;
struct param_prop_t *param_props;
void *rock;
} multi;
} u;
};

static unsigned _jsl10n_to_vcard(struct jmap_parser *parser, json_t *obj,
const char *key, const char *id,
struct l10n_by_id_t *l10n,
vcardcomponent *card, struct l10n_rock *rock)
{
json_t *patches =
l10n->patches ? hash_del(id ? id : "", l10n->patches) : NULL;
int r = 0;

if (patches) {
/* Apply localization patches and add new objects to Card */
struct buf buf = BUF_INITIALIZER;
const char *lang;
json_t *jpatch;

json_object_foreach(patches, lang, jpatch) {
json_t *invalid = json_array();
json_t *altobj =
jmap_patchobject_apply(obj, jpatch, invalid, PATCH_ALLOW_ARRAY);

if (altobj) {
if (rock->is_multi) {
const char *this_lang =
strcasecmp(l10n->deflang, lang) ? lang : NULL;

r |= _jsobject_to_card(parser, altobj, id,
rock->u.multi.type,
rock->u.multi.prop_cb,
rock->u.multi.param_props,
WANT_ALTID_FLAG,
this_lang, card,
rock->u.multi.rock);
}
else {
struct l10n_by_id_t my_l10n = { l10n->deflang, lang, NULL };

r |= rock->u.prop_cb(parser, altobj, &my_l10n, card);
}
json_decref(altobj);
}
else {
json_t *path;
int len, i;

buf_printf(&buf, "localizations/%s/", lang);
if (id) buf_printf(&buf, "%s/", id);
buf_printf(&buf, "%s/", key);
len = buf_len(&buf);

json_array_foreach(invalid, i, path) {
buf_appendcstr(&buf, json_string_value(path));
jmap_parser_invalid_path(parser, buf_cstring(&buf));
buf_truncate(&buf, len);
}
buf_reset(&buf);
}

json_decref(invalid);
}

json_decref(patches);
buf_free(&buf);
}

return r;
}

static unsigned _jsmultiobject_to_card(struct jmap_parser *parser, json_t *jval,
const char *key, const char *type,
prop_cb_t prop_cb, unsigned flags,
Expand All @@ -8464,6 +8545,8 @@ static unsigned _jsmultiobject_to_card(struct jmap_parser *parser, json_t *jval,
vcardcomponent *card, void *rock)

{
struct l10n_rock lrock =
{ 1, { .multi = { type, prop_cb, param_props, rock}} };
const char *id;
json_t *obj;
void *tmp;
Expand All @@ -8477,36 +8560,11 @@ static unsigned _jsmultiobject_to_card(struct jmap_parser *parser, json_t *jval,
jmap_parser_push(parser, key);

json_object_foreach_safe(jval, tmp, id, obj) {
json_t *patches = l10n->patches ? hash_del(id, l10n->patches) : NULL;
int r1;

jmap_parser_push(parser, id);

if (patches) {
/* Apply localization patches and add new objects to Card */
json_t *jpatch;
const char *lang;

json_object_foreach(patches, lang, jpatch) {
json_t *altobj =
jmap_patchobject_apply(obj, jpatch,
parser->invalid, PATCH_ALLOW_ARRAY);

if (altobj) {
const char *this_lang =
strcasecmp(l10n->deflang, lang) ? lang : NULL;

flags = WANT_ALTID_FLAG;

r |= (r1 = _jsobject_to_card(parser, altobj, id, type,
prop_cb, param_props,
flags, this_lang, card, rock));
json_decref(altobj);
}
}

json_decref(patches);
}
r |= _jsl10n_to_vcard(parser, obj, key, id, l10n, card, &lrock);

if (l10n->lang) {
flags = WANT_ALTID_FLAG;
Expand Down Expand Up @@ -8772,13 +8830,14 @@ static unsigned _jsname_to_vcard(struct jmap_parser *parser, json_t *jval,
struct l10n_by_id_t *l10n,
vcardcomponent *card)
{
struct l10n_rock lrock = { 0, { .prop_cb = &_jsname_to_vcard } };
vcardstructuredtype n = { VCARD_NUM_N_FIELDS, { 0 } };
vcardstrarray *sortas = NULL;
vcardproperty *prop = NULL;
vcardparameter *jscomps = NULL;
const char *key, *fullName = NULL;
struct buf buf = BUF_INITIALIZER;
json_t *patches, *jprop, *jsubprop;
json_t *jprop, *jsubprop;
size_t i;
int r = 0;

Expand All @@ -8787,28 +8846,9 @@ static unsigned _jsname_to_vcard(struct jmap_parser *parser, json_t *jval,
return 0;
}

jmap_parser_push(parser, "name");
_jsl10n_to_vcard(parser, jval, "name", NULL, l10n, card, &lrock);

patches = l10n->patches ? hash_del("", l10n->patches) : NULL;
if (patches) {
/* Apply localization patches and add new objects to Card */
const char *lang;
json_t *jpatch;

json_object_foreach(patches, lang, jpatch) {
json_t *altname =
jmap_patchobject_apply(jval, jpatch,
parser->invalid, PATCH_ALLOW_ARRAY);

if (altname) {
struct l10n_by_id_t my_l10n = { l10n->deflang, lang, NULL };
_jsname_to_vcard(parser, altname, &my_l10n, card);
json_decref(altname);
}
}

json_decref(patches);
}
jmap_parser_push(parser, "name");

/* Add base object to Card */
jprop = json_object_get(jval, "@type");
Expand Down Expand Up @@ -9091,7 +9131,8 @@ static unsigned _jsspeak_to_vcard(struct jmap_parser *parser,
json_t *jval, struct l10n_by_id_t *l10n,
vcardcomponent *card)
{
json_t *patches, *jprop;
struct l10n_rock lrock = { 0, { .prop_cb = &_jsspeak_to_vcard } };
json_t *jprop;
const char *key;
int r = 0;

Expand All @@ -9100,29 +9141,9 @@ static unsigned _jsspeak_to_vcard(struct jmap_parser *parser,
return 0;
}

r = _jsl10n_to_vcard(parser, jval, "speakToAs", NULL, l10n, card, &lrock);
jmap_parser_push(parser, "speakToAs");

patches = l10n->patches ? hash_del("", l10n->patches) : NULL;
if (patches) {
/* Apply localization patches and add new objects to Card */
const char *lang;
json_t *jpatch;

json_object_foreach(patches, lang, jpatch) {
json_t *altobj =
jmap_patchobject_apply(jval, jpatch,
parser->invalid, PATCH_ALLOW_ARRAY);

if (altobj) {
struct l10n_by_id_t my_l10n = { l10n->deflang, lang, NULL };
_jsspeak_to_vcard(parser, altobj, &my_l10n, card);
json_decref(altobj);
}
}

json_decref(patches);
}

/* Add base object to Card */
jprop = json_object_get(jval, "@type");
if (jprop && strcmpsafe("SpeakToAs", json_string_value(jprop))) {
Expand All @@ -9135,7 +9156,7 @@ static unsigned _jsspeak_to_vcard(struct jmap_parser *parser,
if (jssimple_to_vcard(parser, "grammaticalGender", l10n->lang, jprop,
card, VCARD_GRAMGENDER_PROPERTY,
VCARD_GRAMGENDER_VALUE)) {
r = 1;
r |= 1;
}
else {
goto done;
Expand Down Expand Up @@ -9867,19 +9888,34 @@ static void _invalid_l10n_patches_by_id(const char *id, void *val, void *rock)
const char *lang;

json_object_foreach(patches, lang, jpatch) {
const char *path;

jmap_parser_push(brock->parser, lang);
jmap_parser_push(brock->parser, brock->key);
jmap_parser_push(brock->parser, id);

json_object_foreach(jpatch, path, val) {
jmap_parser_invalid(brock->parser, path);
if (json_object_size(jpatch)) {
struct buf buf = BUF_INITIALIZER;
const char *path;
int len;

jmap_parser_push(brock->parser, id);
jmap_parser_path(brock->parser, &buf);
buf_putc(&buf, '/');
len = buf_len(&buf);

json_object_foreach(jpatch, path, val) {
buf_appendcstr(&buf, path);
jmap_parser_invalid_path(brock->parser, buf_cstring(&buf));
buf_truncate(&buf, len);
}

jmap_parser_pop(brock->parser);
buf_free(&buf);
}
else {
jmap_parser_invalid(brock->parser, id);
}

jmap_parser_pop(brock->parser);
jmap_parser_pop(brock->parser);
jmap_parser_pop(brock->parser);
}

json_decref(patches);
Expand Down

0 comments on commit f58597d

Please sign in to comment.