diff --git a/tracer/tests/test_tracer.c b/tracer/tests/test_tracer.c index 355f486..3ccbf9d 100644 --- a/tracer/tests/test_tracer.c +++ b/tracer/tests/test_tracer.c @@ -598,6 +598,20 @@ static void test_public_log(void) { CHECK(n == strlen(shown)); free(shown); } + { /* a home folder's name goes whole, spaces and all, as take_log puts ~ in a log for the site: with the summary of + before ScarletNX #986 (7bde830fb), C:\Users\John Smith\x reached a public report as ~ Smith\x */ + static const char homes[] = "[ 1.04] saved in C:\\Users\\John Smith\\AppData\\x.sav\n" + "[ 1.05] loading /home/Ana Maria/games/x.nsp\n" + "[ 1.06] saved in C:\\Users\\John Smith\n"; + char* tilded = snx_logscan_tilde(homes, sizeof homes - 1, &n); + SAME(tilded, "[ 1.04] saved in ~\\AppData\\x.sav\n" + "[ 1.05] loading ~/games/x.nsp\n" + "[ 1.06] saved in ~\n"); + LACKS(tilded, "Smith"); + LACKS(tilded, "Maria"); + CHECK(tilded && n == strlen(tilded)); + free(tilded); + } /* each prefix the log summary's dump() leaves out is left out here: a prefix added there fails this until it is */ source = read_file("third_party/logscan/common/utilities/logscan.c", NULL); where = source ? strstr(source, "static int dump(Span line)") : NULL; diff --git a/tracer/third_party/logscan/COMMIT b/tracer/third_party/logscan/COMMIT index c939c49..ec1361a 100644 --- a/tracer/third_party/logscan/COMMIT +++ b/tracer/third_party/logscan/COMMIT @@ -1 +1 @@ -954583bbf841adf196e98fd28f4778cedb8b79ee +3468cf2410b8b4b44d5b2123c36079c4c50563a1 diff --git a/tracer/third_party/logscan/common/utilities/logscan.c b/tracer/third_party/logscan/common/utilities/logscan.c index eddbc52..d0a534f 100644 --- a/tracer/third_party/logscan/common/utilities/logscan.c +++ b/tracer/third_party/logscan/common/utilities/logscan.c @@ -170,29 +170,62 @@ static size_t utf8_len(const unsigned char* p, size_t n) { return len; } -/* How long the home folder's part is at s: "/home/", "/var/home/" (Silverblue's), "/Users/", - "/media/" and "/run/media/" (the drives a desktop mounts for its user, where games often are), - "C:\Users\" (either slash, any case), Android's "/data/user//"; 0 elsewhere. The player's account - name stays out of a public report */ +static int is_sep(char c) { return c == '/' || c == '\\'; } +/* a drive at s, "C:\" or "C:/", or WSL's "/mnt/c/": the length before its separator, 0 for none */ +static size_t drive_at(Span s) { + if (s.n >= 3 && snx_is_alpha(s.p[0]) && s.p[1] == ':' && is_sep(s.p[2])) return 2; + if (s.n >= 7 && starts(s, "/mnt/") && snx_is_alpha(s.p[5]) && s.p[6] == '/') return 6; + return 0; +} +/* "\Users\" at s, either slash: its length, 0 for none. In any case after a drive, Windows' names having none; + elsewhere only as macOS and Windows write it, the data folder's own users/ being no home */ +static size_t users_at(Span s, int any_case) { + if (s.n < 7 || !is_sep(s.p[0]) || !is_sep(s.p[6])) return 0; + for (size_t k = 0; k < 5; k++) + if (any_case ? snx_to_lower(s.p[1 + k]) != "users"[k] : s.p[1 + k] != "Users"[k]) return 0; + return 7; +} +/* a byte no account's name holds on the systems the runtime runs on: a control, a line's end among them, or one that + Windows refuses in a name, passwd's ':' with them. A space is a name's: Windows' often hold one */ +static int ends_name(char c) { return (unsigned char)c < 0x20 || c == 0x7f || strchr("\"*+,:;<=>?[]|", c); } +/* the length of the account's folder at s, past a home's prefix: up to the separator its path goes on with. A name + that no separator follows cannot be told from the words after it, which go with it to the line's end or the first + byte no name holds, its last blanks left out; a blank, then a separator or a drive, starts another path */ +static size_t name_len(Span s) { + size_t i, end = 0; + if (!s.n || s.p[0] == ' ') return 0; + for (i = 0; i < s.n && !ends_name(s.p[i]) && !is_sep(s.p[i]); i++) { + if (s.p[i] != ' ') + end = i + 1; + else if (i + 1 < s.n && (is_sep(s.p[i + 1]) || drive_at(skip(s, i + 1)))) + break; + } + return end; +} + +/* How long the home folder's part is at s: "/home/", "/usr/home/" (FreeBSD's), "/var/home/" + (Silverblue's), "/Users/", "/media/" and "/run/media/" (the drives a desktop mounts for its user, + where games often are), "C:\Users\" (either slash) and WSL's "/mnt/c/Users/", "\Users\" on a + share or another volume, Android's "/data/user//"; 0 elsewhere. The player's account name stays out of + a public report, spaces and all */ static size_t home_at(Span s) { - static const char* const homes[] = {"/home/", "/var/home/", "/Users/", "/run/media/", "/media/"}; - size_t i = 0, k; - if (!s.n || (s.p[0] != '/' && !snx_is_alpha(s.p[0]))) return 0; - for (k = 0; k < sizeof homes / sizeof homes[0] && !i; k++) + static const char* const homes[] = {"/home/", "/usr/home/", "/var/home/", "/run/media/", "/media/"}; + size_t i = 0, k, drive; + if (!s.n || (!is_sep(s.p[0]) && !snx_is_alpha(s.p[0]))) return 0; + for (k = 0; k < sizeof homes / sizeof homes[0] && !i && s.p[0] == '/'; k++) if (starts(s, homes[k])) i = strlen(homes[k]); - if (!i && s.n > 9 && snx_is_alpha(s.p[0]) && s.p[1] == ':' && (s.p[2] == '\\' || s.p[2] == '/') && - (s.p[8] == '\\' || s.p[8] == '/')) { - for (k = 0; k < 5 && snx_to_lower(s.p[3 + k]) == "users"[k]; k++) {} - if (k == 5) i = 9; + if (!i) { + drive = drive_at(s); + k = users_at(skip(s, drive), drive != 0); + if (k) i = drive + k; } if (!i && starts(s, "/data/user/")) { i = 11 + dec_run(skip(s, 11)); if (i == 11 || i >= s.n || s.p[i] != '/') return 0; i++; } - if (!i || i >= s.n || s.p[i] == '/' || s.p[i] == '\\' || snx_is_blank(s.p[i])) return 0; - while (i < s.n && s.p[i] != '/' && s.p[i] != '\\' && !snx_is_blank(s.p[i])) i++; - return i; + k = i ? name_len(skip(s, i)) : 0; + return k ? i + k : 0; } /* room for n more bytes in the pool: 0, or -1 out of memory, the pool as it was. Its offsets are unsigned */ @@ -453,8 +486,8 @@ static int marker(Span line, Marker* m) { } /* ============================================================ the scan */ -/* A game log is all of itself. The launcher's Share Log file (src/gui/main.c's share_log) starts with snx_build_info's - line, "ScarletNX (, )", then its message and sections: the last run's output +/* A game log is all of itself. The launcher's Share Log file (src/gui/main.c's share_log) starts with + snx_build_log_line's line, "ScarletNX , committed (, )", then its message and sections: the last run's output under "== the last run: ==" and the newest game log under "== ==", which can come alone, without the run's. The game log's lines are scanned, else the run's output when it had none. The newest game log can be another game's, one played before: the run's output is kept while it is read, and stands for itself when its title ID is not the game log's */ @@ -479,9 +512,18 @@ static void header(SnxLogScan* s, Span title) { s->title = add(s, title); } -/* "build: ScarletNX (, )" or the launcher's line without "build: " */ +/* "YYYY-MM-DD", a month 01 to 12 and a day 01 to 31 */ +static int is_day(Span s) { + if (s.n != 10) return 0; + for (size_t i = 0; i < 10; i++) + if (i == 4 || i == 7 ? s.p[i] != '-' : s.p[i] < '0' || s.p[i] > '9') return 0; + return (s.p[5] == '0' ? s.p[6] != '0' : s.p[5] == '1' && s.p[6] <= '2') && + (s.p[8] == '0' ? s.p[9] != '0' : s.p[8] < '3' || (s.p[8] == '3' && s.p[9] <= '1')); +} +/* "build: ScarletNX , committed (, )", a build before the day had no + ", committed ...", or the launcher's line without "build: " */ static int build_line(SnxLogScan* s, Span line) { - Span rest = line; + Span rest = line, day; if (!take_lit(&rest, "ScarletNX ") || !rest.n || rest.p[rest.n - 1] != ')') return 0; long sp = find(rest, " "); if (sp <= 0) return 0; @@ -490,9 +532,13 @@ static int build_line(SnxLogScan* s, Span line) { sp = find(rest, " ("); if (sp <= 0) return 0; Span commit = span(rest.p, (size_t)sp); + long at = find(commit, ", committed "); + day = at > 0 ? skip(commit, (size_t)at + 12) : span(commit.p, 0); + if (at > 0) commit.n = (size_t)at; s->build = add(s, line); s->branch = add(s, branch); s->commit = add(s, commit); + s->committed = is_day(day) || (day.n == 7 && starts(day, "unknown")) ? add(s, day) : 0; return 1; } @@ -1637,6 +1683,35 @@ static void md_sym(Buf* b, const SnxLogScan* s, const SnxLogSym* sym, SnxDemangl } free(plain); } +/* the days from 1970-01-01 to y-m-d of the Gregorian calendar (Howard Hinnant's days_from_civil) */ +static long days_from_civil(long y, long m, long d) { + long era, yoe, doy; + y -= m <= 2; + era = (y >= 0 ? y : y - 399) / 400; + yoe = y - era * 400; + doy = (153 * (m > 2 ? m - 3 : m + 9) + 2) / 5 + d - 1; + return era * 146097 + yoe * 365 + yoe / 4 - yoe / 100 + doy - 719468; +} +/* "` `, committed ", and when the run's time is known (written) and the day is one, ", days + before this run", by the days of the UTC calendar */ +static void md_build_age(Buf* b, const SnxLogScan* s) { + Buf name = {0}; + const char* day = snx_logscan_text(s, s->committed); + long long began = s->written - (s->centiseconds > 0 ? s->centiseconds / 100 : 0); + put(&name, snx_logscan_text(s, s->branch)); + put(&name, " "); + put(&name, snx_logscan_text(s, s->commit)); + md_code(b, name.p ? name.p : ""); + free(name.p); + put(b, ", committed "); + put(b, day); + if (s->written > 0 && began >= 0 && strcmp(day, "unknown")) { + char age[64]; + long days = (long)(began / 86400) - days_from_civil(atol(day), atol(day + 5), atol(day + 8)); + sprintf(age, ", %ld %s before this run", days, days == 1 || days == -1 ? "day" : "days"); + put(b, age); + } +} static void md_fold_start(Buf* b, const char* summary) { put(b, "\n
"); put(b, summary); @@ -1668,7 +1743,9 @@ char* snx_logscan_markdown(const SnxLogScan* s, const char* name, const char* he put(&b, "\n"); } put(&b, "- **Build:** "); - if (s->build) + if (s->committed) + md_build_age(&b, s); + else if (s->build) md_code(&b, snx_logscan_text(s, s->build)); else put(&b, "not in the log"); diff --git a/tracer/third_party/logscan/common/utilities/logscan.h b/tracer/third_party/logscan/common/utilities/logscan.h index 73f33e4..5062a08 100644 --- a/tracer/third_party/logscan/common/utilities/logscan.h +++ b/tracer/third_party/logscan/common/utilities/logscan.h @@ -94,11 +94,16 @@ typedef struct { typedef struct SnxLogScan { char* pool; /* the texts, each terminated, grown as the scan adds them */ size_t used, cap; - /* the header: the game log's lines, else the launcher's build line */ - unsigned title, title_id, game_version, build, branch, commit, system, gpu, vulkan, driver; + /* the header: the game log's lines, else the launcher's build line, whose committed is the day the build's commit + was made as the line says it (YYYY-MM-DD, or unknown), 0 from a build that did not say it */ + unsigned title, title_id, game_version, build, branch, commit, committed, system, gpu, vulkan, driver; int console; /* SNX_CONSOLE_* */ unsigned launcher_build, launcher_message; /* the Share Log file's; launcher_build 0 for a game log */ long centiseconds; /* the last line's time, -1 without one */ + /* when the log was last written, in seconds since 1970 (UTC), which the log does not say: the caller's to set + after the scan, from the log's file as the run left it (the launcher's Share Log does), 0 for unknown. Less the + last line's time, the run began then: the markdown says how many days the build's commit is older */ + long long written; int outcome; unsigned signature; /* the failure, when outcome isn't SNX_LOG_NONE: the marker's fields, then its report's */ @@ -183,7 +188,8 @@ const SnxLogSym* snx_logscan_function(const SnxLogScan* s); char* snx_logscan_json(const SnxLogScan* s, SnxDemangle demangle); char* snx_logscan_markdown(const SnxLogScan* s, const char* name, const char* heading, int brief, SnxDemangle demangle); /* the n bytes of text with each home folder's part as ~, as a report writes it (/home/, C:\Users\, Android's - /data/user//...), allocated and ended by a 0, its length in *size; NULL out of memory */ + /data/user//..., the account's name whole, spaces and all), allocated and ended by a 0, its length in + *size; NULL out of memory */ char* snx_logscan_tilde(const char* text, size_t n, size_t* size); /* scarletnx --scan-log: LOG... (- for stdin) [--format json|markdown] [--name NAME], a JSON object a line or a summary a log, NAME the markdown's title for a log without a title line (its path otherwise). argv[0] is the command's name */