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

Solve unicode indentation problems in summary.

Browse source
This commit is contained in:
Enno Rehling 2018-01-28 19:12:31 +01:00
parent 70cc56b223
commit 6f1f5409ae
1 changed files with 41 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
src/summary.c
View file

@ -32,6 +32,7 @@
#include <util/lists.h> #include <util/lists.h>
#include <util/log.h> #include <util/log.h>
#include <util/path.h> #include <util/path.h>
#include <util/unicode.h>
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
@ -174,13 +175,43 @@ static int count_umlaut(const char *s)
int result = 0; int result = 0;
const char *cp; const char *cp;
for (cp = s; *cp; ++cp) { for (cp = s; *cp; ++cp) {
if (*cp & 0x80) { ucs4_t ucs = *cp;
if (ucs & 0x80) {
size_t size;
++result; ++result;
unicode_utf8_to_ucs4(&ucs, cp, &size);
cp += size;
} }
} }
return result; return result;
} }
static void summarize_races(const summary *s, FILE *F, bool full) {
int i;
for (i = 0; i < MAXRACES; i++) {
if (s->poprace[i] > 0) {
const char *pad = " ";
int lpad = (int)strlen(pad);
const race *rc = get_race(i);
const char *rcname = LOC(default_locale, rc_name_s(rc, NAME_PLURAL));
lpad -= count_umlaut(rcname);
assert(lpad >= 0);
if (full) {
fputs(pad + lpad, F);
fprintf(F, "%20s: ", rcname);
fprintf(F, "%8d\n", s->poprace[i]);
}
else if (i != RC_TEMPLATE && i != RC_CLONE) {
if (playerrace(rc)) {
fputs(pad + lpad, F);
fprintf(F, "%16s: ", rcname);
fprintf(F, "%8d\n", s->poprace[i]);
}
}
}
}
}
static void summarize_players(const summary *s, FILE *F) { static void summarize_players(const summary *s, FILE *F) {
int i; int i;
const char * suffix = LOC(default_locale, "stat_tribe_p"); const char * suffix = LOC(default_locale, "stat_tribe_p");
@ -189,13 +220,13 @@ static void summarize_players(const summary *s, FILE *F) {
if (i != RC_TEMPLATE && i != RC_CLONE && s->factionrace[i]) { if (i != RC_TEMPLATE && i != RC_CLONE && s->factionrace[i]) {
const race *rc = get_race(i); const race *rc = get_race(i);
if (rc && playerrace(rc)) { if (rc && playerrace(rc)) {
int lpad = 6;
const char * pad = " "; const char * pad = " ";
int lpad = (int)strlen(pad);
const char *rccat = LOC(default_locale, rc_name_s(rc, NAME_CATEGORY)); const char *rccat = LOC(default_locale, rc_name_s(rc, NAME_CATEGORY));
fprintf(F, "%16s%s:", rccat, suffix);
lpad -= count_umlaut(rccat); lpad -= count_umlaut(rccat);
assert(lpad >= 0); assert(lpad >= 0);
fputs(pad + lpad, F); fputs(pad + lpad, F);
fprintf(F, "%16s%s:", rccat, suffix);
fprintf(F, "%8d\n", s->factionrace[i]); fprintf(F, "%8d\n", s->factionrace[i]);
} }
} }
@ -261,28 +292,7 @@ void report_summary(const summary * s, bool full)
} }
fprintf(F, "\n"); fprintf(F, "\n");
if (full) { summarize_races(s, F, full);
int i;
for (i = 0; i < MAXRACES; i++) {
if (s->poprace[i]) {
const race *rc = get_race(i);
fprintf(F, "%20s: %8d\n", LOC(default_locale, rc_name_s(rc, NAME_PLURAL)),
s->poprace[i]);
}
}
}
else {
int i;
for (i = 0; i < MAXRACES; i++) {
if (i != RC_TEMPLATE && i != RC_CLONE && s->poprace[i]) {
const race *rc = get_race(i);
if (playerrace(rc)) {
fprintf(F, "%20s: %8d\n", LOC(default_locale, rc_name_s(rc, NAME_PLURAL)),
s->poprace[i]);
}
}
}
}
if (full) { if (full) {
fprintf(F, "\nWaffen: %8d\n", s->waffen); fprintf(F, "\nWaffen: %8d\n", s->waffen);
@ -302,7 +312,7 @@ void report_summary(const summary * s, bool full)
s->playermoney + s->peasantmoney); s->playermoney + s->peasantmoney);
} }
fprintf(F, "\n\n"); fprintf(F, "\n");
newplayers = update_nmrs(); newplayers = update_nmrs();
@ -310,22 +320,22 @@ void report_summary(const summary * s, bool full)
int i; int i;
for (i = 0; i <= timeout; ++i) { for (i = 0; i <= timeout; ++i) {
if (i == timeout) { if (i == timeout) {
fprintf(F, "+ NMR:\t\t %d\n", nmrs[i]); fprintf(F, "+ NMR: %3d\n", nmrs[i]);
} }
else { else {
fprintf(F, "%d NMR:\t\t %d\n", i, nmrs[i]); fprintf(F, "%d NMR: %3d\n", i, nmrs[i]);
} }
} }
} }
if (age) { if (age) {
if (age[2] != 0) { if (age[2] != 0) {
fprintf(F, "Erstabgaben:\t %d%%\n", 100 - (dropouts[0] * 100 / age[2])); fprintf(F, "Erstabgaben: %3d%%\n", 100 - (dropouts[0] * 100 / age[2]));
} }
if (age[3] != 0) { if (age[3] != 0) {
fprintf(F, "Zweitabgaben:\t %d%%\n", 100 - (dropouts[1] * 100 / age[3])); fprintf(F, "Zweitabgaben: %3d%%\n", 100 - (dropouts[1] * 100 / age[3]));
} }
} }
fprintf(F, "Neue Spieler:\t %d\n", newplayers); fprintf(F, "Neue Spieler: %d\n", newplayers);
if (full) { if (full) {
if (factions) { if (factions) {