Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity

more sbstring use in reports.

Browse source 
fix paragraph lines with very long words, indirectly test through region report.
This commit is contained in:
Enno Rehling 2018-11-28 20:18:22 +01:00
parent 2fe5c0e0f7
commit d3713be6bd
2 changed files with 135 additions and 157 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

253
src/report.c
View file

@ -745,6 +745,13 @@ static void rp_battles(struct stream *out, faction * f)
} }
} }
static void append_message(sbstring *sbp, message *m, const faction * f) {
/* FIXME: this is a bad hack, cause by how msg_message works. */
size_t size = sbp->size - sbs_length(sbp);
size = nr_render(m, f->locale, sbp->end, size, f);
sbp->end += size;
}
static void prices(struct stream *out, const region * r, const faction * f) static void prices(struct stream *out, const region * r, const faction * f)
{ {
const luxury_type *sale = NULL; const luxury_type *sale = NULL;
@ -777,12 +784,9 @@ static void prices(struct stream *out, const region * r, const faction * f)
for (dmd = r->land->demands; dmd; dmd = dmd->next) { for (dmd = r->land->demands; dmd; dmd = dmd->next) {
if (dmd->value > 0) { if (dmd->value > 0) {
size_t size = sizeof(buf) - sbs_length(&sbs);
/* FIXME: this is a bad hack, cause by how msg_message works. */
m = msg_message("nr_market_price", "product price", m = msg_message("nr_market_price", "product price",
dmd->type->itype->rtype, dmd->value * dmd->type->price); dmd->type->itype->rtype, dmd->value * dmd->type->price);
size = nr_render(m, f->locale, sbs.end, size, f); append_message(&sbs, m, f);
sbs.end += size;
msg_release(m); msg_release(m);
n--; n--;
if (n == 0) { if (n == 0) {
@ -833,6 +837,15 @@ struct edge {
direction_t lastd; direction_t lastd;
}; };
static void report_region_resource(sbstring *sbp, const struct locale *lang, const struct resource_type *rtype, int n) {
if (n != 0) {
sbs_strcat(sbp, ", ");
sbs_strcat(sbp, str_itoa(n));
sbs_strcat(sbp, " ");
sbs_strcat(sbp, LOC(lang, resourcename(rtype, (n != 1) ? GR_PLURAL : 0)));
}
}
static void report_region_description(struct stream *out, const region * r, faction * f, const bool see[]) static void report_region_description(struct stream *out, const region * r, faction * f, const bool see[])
{ {
int n; int n;
@ -842,66 +855,61 @@ static void report_region_description(struct stream *out, const region * r, fact
attrib *a; attrib *a;
const char *tname; const char *tname;
char buf[4096]; char buf[4096];
char *bufp = buf; sbstring sbs;
size_t size = sizeof(buf);
int bytes;
bytes = (int)f_regionid(r, f, bufp, size); f_regionid(r, f, buf, sizeof(buf));
if (wrptr(&bufp, &size, bytes) != 0) sbs_adopt(&sbs, buf, sizeof(buf));
WARN_STATIC_BUFFER();
if (r->seen.mode == seen_travel) { if (r->seen.mode == seen_travel) {
bytes = snprintf(bufp, size, " (%s)", LOC(f->locale, "see_travel")); sbs_strcat(&sbs, " (");
sbs_strcat(&sbs, LOC(f->locale, "see_travel"));
sbs_strcat(&sbs, ")");
} }
else if (r->seen.mode == seen_neighbour) { else if (r->seen.mode == seen_neighbour) {
bytes = snprintf(bufp, size, " (%s)", LOC(f->locale, "see_neighbour")); sbs_strcat(&sbs, " (");
sbs_strcat(&sbs, LOC(f->locale, "see_neighbour"));
sbs_strcat(&sbs, ")");
} }
else if (r->seen.mode == seen_lighthouse) { else if (r->seen.mode == seen_lighthouse) {
bytes = snprintf(bufp, size, " (%s)", LOC(f->locale, "see_lighthouse")); sbs_strcat(&sbs, " (");
sbs_strcat(&sbs, LOC(f->locale, "see_lighthouse"));
sbs_strcat(&sbs, ")");
} }
else {
bytes = 0;
}
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
/* Terrain */ /* Terrain */
bytes = (int)str_strlcpy(bufp, ", ", size);
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
tname = terrain_name(r); tname = terrain_name(r);
bytes = (int)str_strlcpy(bufp, LOC(f->locale, tname), size); sbs_strcat(&sbs, ", ");
if (wrptr(&bufp, &size, bytes) != 0) sbs_strcat(&sbs, LOC(f->locale, tname));
WARN_STATIC_BUFFER(); pump_paragraph(&sbs, out, REPORTWIDTH, false);
/* Trees */ /* Trees */
trees = rtrees(r, 2); trees = rtrees(r, 2);
saplings = rtrees(r, 1); saplings = rtrees(r, 1);
if (max_production(r)) { if (max_production(r)) {
if (trees > 0 || saplings > 0) { if (trees > 0 || saplings > 0) {
bytes = snprintf(bufp, size, ", %d/%d ", trees, saplings); sbs_strcat(&sbs, ", ");
if (wrptr(&bufp, &size, bytes) != 0) sbs_strcat(&sbs, str_itoa(trees));
WARN_STATIC_BUFFER(); sbs_strcat(&sbs, "/");
sbs_strcat(&sbs, str_itoa(saplings));
sbs_strcat(&sbs, " ");
if (fval(r, RF_MALLORN)) { if (fval(r, RF_MALLORN)) {
if (trees == 1) { if (trees == 1) {
bytes = (int)str_strlcpy(bufp, LOC(f->locale, "nr_mallorntree"), size); sbs_strcat(&sbs, LOC(f->locale, "nr_mallorntree"));
} }
else { else {
bytes = (int)str_strlcpy(bufp, LOC(f->locale, "nr_mallorntree_p"), size); sbs_strcat(&sbs, LOC(f->locale, "nr_mallorntree_p"));
} }
} }
else if (trees == 1) { else if (trees == 1) {
bytes = (int)str_strlcpy(bufp, LOC(f->locale, "tree"), size); sbs_strcat(&sbs, LOC(f->locale, "tree"));
} }
else { else {
bytes = (int)str_strlcpy(bufp, LOC(f->locale, "tree_p"), size); sbs_strcat(&sbs, LOC(f->locale, "tree_p"));
} }
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
} }
} }
pump_paragraph(&sbs, out, REPORTWIDTH, false);
/* iron & stone */ /* iron & stone */
if (r->seen.mode >= seen_unit) { if (r->seen.mode >= seen_unit) {
@ -911,111 +919,71 @@ static void report_region_description(struct stream *out, const region * r, fact
for (n = 0; n < numresults; ++n) { for (n = 0; n < numresults; ++n) {
if (result[n].number >= 0 && result[n].level >= 0) { if (result[n].number >= 0 && result[n].level >= 0) {
const char * name = resourcename(result[n].rtype, result[n].number != 1); const char * name = resourcename(result[n].rtype, result[n].number != 1);
bytes = snprintf(bufp, size, ", %d %s/%d", result[n].number, sbs_strcat(&sbs, ", ");
LOC(f->locale, name), result[n].level); sbs_strcat(&sbs, str_itoa(result[n].number));
if (wrptr(&bufp, &size, bytes) != 0) sbs_strcat(&sbs, " ");
WARN_STATIC_BUFFER(); sbs_strcat(&sbs, LOC(f->locale, name));
sbs_strcat(&sbs, "/");
sbs_strcat(&sbs, str_itoa(result[n].level));
} }
} }
} }
/* peasants & silver */ /* peasants & silver */
if (rpeasants(r)) { n = rpeasants(r);
int p = rpeasants(r); if (n) {
bytes = snprintf(bufp, size, ", %d", p); sbs_strcat(&sbs, ", ");
if (wrptr(&bufp, &size, bytes) != 0) sbs_strcat(&sbs, str_itoa(n));
WARN_STATIC_BUFFER();
if (r->land->ownership) { if (r->land->ownership) {
const char *str = const char *str =
LOC(f->locale, mkname("morale", itoa10(region_get_morale(r)))); LOC(f->locale, mkname("morale", itoa10(region_get_morale(r))));
bytes = snprintf(bufp, size, " %s", str); sbs_strcat(&sbs, " ");
if (wrptr(&bufp, &size, bytes) != 0) sbs_strcat(&sbs, str);
WARN_STATIC_BUFFER();
} }
bytes = (int)str_strlcpy(bufp, " ", size); sbs_strcat(&sbs, " ");
if (wrptr(&bufp, &size, bytes) != 0) sbs_strcat(&sbs, LOC(f->locale, n != 1 ? "peasant_p" : "peasant"));
WARN_STATIC_BUFFER();
bytes =
(int)str_strlcpy(bufp, LOC(f->locale, p == 1 ? "peasant" : "peasant_p"),
size);
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
if (is_mourning(r, turn + 1)) { if (is_mourning(r, turn + 1)) {
bytes = (int)str_strlcpy(bufp, " ", size); sbs_strcat(&sbs, " ");
if (wrptr(&bufp, &size, bytes) != 0) sbs_strcat(&sbs, LOC(f->locale, "nr_mourning"));
WARN_STATIC_BUFFER();
bytes = (int)str_strlcpy(bufp, LOC(f->locale, "nr_mourning"), size);
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
} }
} }
if (rmoney(r) && r->seen.mode >= seen_travel) { if (r->seen.mode >= seen_travel) {
bytes = snprintf(bufp, size, ", %d ", rmoney(r)); report_region_resource(&sbs, f->locale, get_resourcetype(R_SILVER), rmoney(r));
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
bytes =
(int)str_strlcpy(bufp, LOC(f->locale, resourcename(get_resourcetype(R_SILVER),
rmoney(r) != 1)), size);
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
} }
/* Pferde */ /* Pferde */
report_region_resource(&sbs, f->locale, get_resourcetype(R_HORSE), rhorses(r));
if (rhorses(r)) { sbs_strcat(&sbs, ".");
bytes = snprintf(bufp, size, ", %d ", rhorses(r));
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
bytes =
(int)str_strlcpy(bufp, LOC(f->locale, resourcename(get_resourcetype(R_HORSE),
(rhorses(r) > 1) ? GR_PLURAL : 0)), size);
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
}
bytes = (int)str_strlcpy(bufp, ".", size);
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
if (r->land && r->land->display && r->land->display[0]) { if (r->land && r->land->display && r->land->display[0]) {
bytes = (int)str_strlcpy(bufp, " ", size); sbs_strcat(&sbs, " ");
if (wrptr(&bufp, &size, bytes) != 0) sbs_strcat(&sbs, r->land->display);
WARN_STATIC_BUFFER();
bytes = (int)str_strlcpy(bufp, r->land->display, size);
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
n = r->land->display[strlen(r->land->display) - 1]; n = r->land->display[strlen(r->land->display) - 1];
if (n != '!' && n != '?' && n != '.') { if (n != '!' && n != '?' && n != '.') {
bytes = (int)str_strlcpy(bufp, ".", size); sbs_strcat(&sbs, ".");
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
} }
} }
if (rule_region_owners()) { if (rule_region_owners()) {
const faction *owner = region_get_owner(r); const faction *owner = region_get_owner(r);
message *msg;
if (owner != NULL) { if (owner != NULL) {
bytes = (int)str_strlcpy(bufp, " ", size); message *msg;
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER(); sbs_strcat(&sbs, " ");
msg = msg_message("nr_region_owner", "faction", owner); msg = msg_message("nr_region_owner", "faction", owner);
bytes = (int)nr_render(msg, f->locale, bufp, size, f); append_message(&sbs, msg, f);
msg_release(msg); msg_release(msg);
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
} }
} }
a = a_find(r->attribs, &at_overrideroads);
pump_paragraph(&sbs, out, REPORTWIDTH, false);
a = a_find(r->attribs, &at_overrideroads);
if (a) { if (a) {
bytes = (int)str_strlcpy(bufp, " ", size); sbs_strcat(&sbs, " ");
if (wrptr(&bufp, &size, bytes) != 0) sbs_strcat(&sbs, (const char *)a->data.v);
WARN_STATIC_BUFFER();
bytes = (int)str_strlcpy(bufp, (char *)a->data.v, size);
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
} }
else { else {
int d, nrd = 0; int d, nrd = 0;
@ -1025,8 +993,8 @@ static void report_region_description(struct stream *out, const region * r, fact
if (see[d] && rconnect(r, d)) if (see[d] && rconnect(r, d))
nrd++; nrd++;
} }
/* list directions */
/* list directions */
dh = false; dh = false;
for (d = 0; d != MAXDIRECTIONS; d++) { for (d = 0; d != MAXDIRECTIONS; d++) {
if (see[d]) { if (see[d]) {
@ -1035,36 +1003,25 @@ static void report_region_description(struct stream *out, const region * r, fact
continue; continue;
nrd--; nrd--;
if (dh) { if (dh) {
char regname[4096]; char regname[128], trail[256];
if (nrd == 0) { if (nrd == 0) {
bytes = (int)str_strlcpy(bufp, " ", size); sbs_strcat(&sbs, " ");
if (wrptr(&bufp, &size, bytes) != 0) sbs_strcat(&sbs, LOC(f->locale, "nr_nb_final"));
WARN_STATIC_BUFFER();
bytes = (int)str_strlcpy(bufp, LOC(f->locale, "nr_nb_final"), size);
} }
else { else {
bytes = (int)str_strlcpy(bufp, LOC(f->locale, "nr_nb_next"), size); sbs_strcat(&sbs, LOC(f->locale, "nr_nb_next"));
} }
if (wrptr(&bufp, &size, bytes) != 0) sbs_strcat(&sbs, LOC(f->locale, directions[d]));
WARN_STATIC_BUFFER(); sbs_strcat(&sbs, " ");
bytes = (int)str_strlcpy(bufp, LOC(f->locale, directions[d]), size);
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
bytes = (int)str_strlcpy(bufp, " ", size);
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
f_regionid(r2, f, regname, sizeof(regname)); f_regionid(r2, f, regname, sizeof(regname));
bytes = snprintf(bufp, size, trailinto(r2, f->locale), regname); snprintf(trail, sizeof(trail), trailinto(r2, f->locale), regname);
if (wrptr(&bufp, &size, bytes) != 0) sbs_strcat(&sbs, trail);
WARN_STATIC_BUFFER();
} }
else { else {
bytes = (int)str_strlcpy(bufp, " ", size); message * msg = msg_message("nr_vicinitystart", "dir region", d, r2);
if (wrptr(&bufp, &size, bytes) != 0) sbs_strcat(&sbs, " ");
WARN_STATIC_BUFFER(); append_message(&sbs, msg, f);
MSG(("nr_vicinitystart", "dir region", d, r2), bufp, size, f->locale, msg_release(msg);
f);
bufp += strlen(bufp);
dh = true; dh = true;
} }
} }
@ -1073,29 +1030,15 @@ static void report_region_description(struct stream *out, const region * r, fact
for (a = a_find(r->attribs, &at_direction); a && a->type == &at_direction; for (a = a_find(r->attribs, &at_direction); a && a->type == &at_direction;
a = a->next) { a = a->next) {
spec_direction *spd = (spec_direction *)(a->data.v); spec_direction *spd = (spec_direction *)(a->data.v);
bytes = (int)str_strlcpy(bufp, " ", size); sbs_strcat(&sbs, " ");
if (wrptr(&bufp, &size, bytes) != 0) sbs_strcat(&sbs, LOC(f->locale, spd->desc));
WARN_STATIC_BUFFER(); sbs_strcat(&sbs, " (\"");
bytes = (int)str_strlcpy(bufp, LOC(f->locale, spd->desc), size); sbs_strcat(&sbs, LOC(f->locale, spd->keyword));
if (wrptr(&bufp, &size, bytes) != 0) sbs_strcat(&sbs, "\").");
WARN_STATIC_BUFFER();
bytes = (int)str_strlcpy(bufp, " (\"", size);
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
bytes = (int)str_strlcpy(bufp, LOC(f->locale, spd->keyword), size);
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
bytes = (int)str_strlcpy(bufp, "\")", size);
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
bytes = (int)str_strlcpy(bufp, ".", size);
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
dh = 1; dh = 1;
} }
} }
*bufp = 0; pump_paragraph(&sbs, out, REPORTWIDTH, true);
paragraph(out, buf, 0, 0, 0);
} }
/** /**
@ -1521,15 +1464,19 @@ void pump_paragraph(sbstring *sbp, stream *out, size_t maxlen, bool isfinal)
return; return;
} }
else if (next > begin + maxlen) { else if (next > begin + maxlen) {
ptrdiff_t len = pos - begin; ptrdiff_t len;
if (pos == begin) {
/* there was no space before the break, line will be too long */
pos = next;
}
len = pos - begin;
swrite(begin, 1, len, out); swrite(begin, 1, len, out);
newline(out); newline(out);
while (*pos && IS_UTF8_SPACE(pos)) { while (*pos && IS_UTF8_SPACE(pos)) {
++pos; ++pos;
++len;
} }
sbs_substr(sbp, len, SIZE_MAX); sbs_substr(sbp, pos - begin, SIZE_MAX);
break; break;
} }
pos = next; pos = next;

39
src/report.test.c
View file

@ -106,12 +106,30 @@ static void test_report_region(CuTest *tc) {
rsettrees(r, 0, 1); rsettrees(r, 0, 1);
rsettrees(r, 1, 2); rsettrees(r, 1, 2);
rsettrees(r, 2, 3); rsettrees(r, 2, 3);
region_setname(r, "Hodor");
f = test_create_faction(NULL); f = test_create_faction(NULL);
f->locale = lang; f->locale = lang;
u = test_create_unit(f, r); u = test_create_unit(f, r);
set_level(u, SK_QUARRYING, 1); set_level(u, SK_QUARRYING, 1);
region_setname(r, "1234567890123456789012345678901234567890");
r->seen.mode = seen_travel;
report_region(&out, r, f);
out.api->rewind(out.handle);
len = out.api->read(out.handle, buf, sizeof(buf));
buf[len] = '\0';
CuAssertStrEquals(tc, "1234567890123456789012345678901234567890 (0,0) (durchgereist), Ebene, 3/2\nBlumen, 5 Bauern, 2 Silber, 7 Pferde.\n", buf);
out.api->rewind(out.handle);
region_setname(r, "12345678901234567890123456789012345678901234567890123456789012345678901234567890");
r->seen.mode = seen_travel;
report_region(&out, r, f);
out.api->rewind(out.handle);
len = out.api->read(out.handle, buf, sizeof(buf));
buf[len] = '\0';
CuAssertStrEquals(tc, "12345678901234567890123456789012345678901234567890123456789012345678901234567890\n(0,0) (durchgereist), Ebene, 3/2 Blumen, 5 Bauern, 2 Silber, 7 Pferde.\n", buf);
out.api->rewind(out.handle);
region_setname(r, "Hodor");
r->seen.mode = seen_travel; r->seen.mode = seen_travel;
report_region(&out, r, f); report_region(&out, r, f);
out.api->rewind(out.handle); out.api->rewind(out.handle);
@ -119,27 +137,40 @@ static void test_report_region(CuTest *tc) {
buf[len] = '\0'; buf[len] = '\0';
CuAssertStrEquals(tc, "Hodor (0,0) (durchgereist), Ebene, 3/2 Blumen, 5 Bauern, 2 Silber, 7 Pferde.\n", buf); CuAssertStrEquals(tc, "Hodor (0,0) (durchgereist), Ebene, 3/2 Blumen, 5 Bauern, 2 Silber, 7 Pferde.\n", buf);
r->seen.mode = seen_unit;
out.api->rewind(out.handle); out.api->rewind(out.handle);
r->seen.mode = seen_unit;
report_region(&out, r, f); report_region(&out, r, f);
out.api->rewind(out.handle); out.api->rewind(out.handle);
len = out.api->read(out.handle, buf, sizeof(buf)); len = out.api->read(out.handle, buf, sizeof(buf));
buf[len] = '\0'; buf[len] = '\0';
CuAssertStrEquals(tc, "Hodor (0,0), Ebene, 3/2 Blumen, 135 Steine/1, 5 Bauern, 2 Silber, 7 Pferde.\n", buf); CuAssertStrEquals(tc, "Hodor (0,0), Ebene, 3/2 Blumen, 135 Steine/1, 5 Bauern, 2 Silber, 7 Pferde.\n", buf);
out.api->rewind(out.handle);
r->resources->amount = 1; r->resources->amount = 1;
r->land->peasants = 1; r->land->peasants = 1;
r->land->horses = 1; r->land->horses = 1;
r->land->money = 1; r->land->money = 1;
r->seen.mode = seen_unit; r->seen.mode = seen_unit;
out.api->rewind(out.handle);
report_region(&out, r, f); report_region(&out, r, f);
out.api->rewind(out.handle); out.api->rewind(out.handle);
len = out.api->read(out.handle, buf, sizeof(buf)); len = out.api->read(out.handle, buf, sizeof(buf));
buf[len] = '\0'; buf[len] = '\0';
CuAssertStrEquals(tc, "Hodor (0,0), Ebene, 3/2 Blumen, 1 Stein/1, 1 Bauer, 1 Silber, 1 Pferd.\n", buf); CuAssertStrEquals(tc, "Hodor (0,0), Ebene, 3/2 Blumen, 1 Stein/1, 1 Bauer, 1 Silber, 1 Pferd.\n", buf);
r->land->peasants = 0;
r->land->horses = 0;
r->land->money = 0;
rsettrees(r, 0, 0);
rsettrees(r, 1, 0);
rsettrees(r, 2, 0);
out.api->rewind(out.handle);
report_region(&out, r, f);
out.api->rewind(out.handle);
len = out.api->read(out.handle, buf, sizeof(buf));
buf[len] = '\0';
CuAssertStrEquals(tc, "Hodor (0,0), Ebene, 1 Stein/1.\n", buf);
mstream_done(&out); mstream_done(&out);
test_teardown(); test_teardown();
} }