Ledda/gym-tracker
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update

Browse Source
This commit is contained in:
Daniel Ledda
2025-01-18 15:23:20 +01:00
parent 3bea5bd848
commit 815d27087b
1 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
app.cpp
View File

@@ -20,6 +20,8 @@ struct GymLogDbParsedEntry {
string name; string name;
}; };
typedef GymLogDbEntry Exercise;
struct GymLogDbParsed { struct GymLogDbParsed {
GymLogDbHeader header; GymLogDbHeader header;
list<GymLogDbParsedEntry> entries; list<GymLogDbParsedEntry> entries;
@@ -38,6 +40,11 @@ struct GymLogEntry {
}; };
}; };
struct WorkSummary {
real32 totalWork;
uint32 restTime;
};
GymLogDbParsed *parseDb(Arena *arena, string database) { GymLogDbParsed *parseDb(Arena *arena, string database) {
GymLogDbParsed *dbParsed = PushStruct(arena, GymLogDbParsed); GymLogDbParsed *dbParsed = PushStruct(arena, GymLogDbParsed);
@@ -73,27 +80,24 @@ list<GymLogEntry> loadEntryLog(Arena *arena, string fileLocation) {
return result; return result;
} }
struct WorkSummary { WorkSummary workSummaryForExercise(list<GymLogEntry> entries, Exercise exercise) {
real32 totalWork;
uint32 restTime;
};
WorkSummary workSummaryForExercise(list<GymLogEntry> entries) {
WorkSummary result = {0}; WorkSummary result = {0};
UnixTimestamp lastTimestamp = 0; UnixTimestamp lastTimestamp = 0;
for (EachInReversed(entries, i)) { for (EachInReversed(entries, i)) {
GymLogEntry logEntry = entries.data[i]; if (entries.data[i].exerciseId == exercise.id) {
result.totalWork += logEntry.weightRepsInfo.weight * logEntry.weightRepsInfo.reps; GymLogEntry logEntry = entries.data[i];
if (lastTimestamp > 0) { result.totalWork += logEntry.weightRepsInfo.weight * logEntry.weightRepsInfo.reps;
result.restTime += (uint32)(lastTimestamp - logEntry.timestamp); if (lastTimestamp > 0) {
result.restTime += (uint32)(lastTimestamp - logEntry.timestamp);
}
lastTimestamp = logEntry.timestamp;
} }
lastTimestamp = logEntry.timestamp;
} }
return result; return result;
} }
int gymTrackerWorkToday(Arena *arena, uint32 exerciseId, string exerciseName) { int gymTrackerLogWorkToday(Arena *arena, Exercise exercise) {
int statusCode = 0; int statusCode = 0;
string logfile = os_readEntireFile(arena, LOG_FILE_LOCATION); string logfile = os_readEntireFile(arena, LOG_FILE_LOCATION);
@@ -119,8 +123,8 @@ int gymTrackerWorkToday(Arena *arena, uint32 exerciseId, string exerciseName) {
if (todaysEntries.data) { if (todaysEntries.data) {
todaysEntries.length = todaysEntries.head; todaysEntries.length = todaysEntries.head;
WorkSummary summary = workSummaryForExercise(todaysEntries); WorkSummary summary = workSummaryForExercise(todaysEntries, exercise);
log("Total work today for %S:\n%.2fkg in ~%.2fmin.\n", exerciseName, summary.totalWork, (real32)summary.restTime / 60.0f); log("Total work today for %S:\n%.2fkg in ~%.2fmin.\n", exercise.name, summary.totalWork, (real32)summary.restTime / 60.0f);
} }
} }
@@ -284,12 +288,13 @@ int gymTrackerDeleteEntries(Arena *arena, list<string> args) {
// Syntax: do <exercise-name> weightKg reps // Syntax: do <exercise-name> weightKg reps
int gymTrackerDo(Arena *arena, list<string> args) { int gymTrackerDo(Arena *arena, list<string> args) {
int statusCode = 0; int statusCode = 0;
string exerciseName = {0}; Exercise exercise = {};
if (args.length < 3 || args.data[0].length == 0) { if (args.length < 3 || args.data[0].length == 0) {
log("Invalid exercise name and/or number of arguments.\n"); log("Invalid exercise name and/or number of arguments.\n");
statusCode = 1; statusCode = 1;
} else { } else {
exerciseName = args.data[0]; exercise.name = args.data[0];
} }
GymLogDbParsedEntry *existingEntry = 0; GymLogDbParsedEntry *existingEntry = 0;
@@ -298,23 +303,23 @@ int gymTrackerDo(Arena *arena, list<string> args) {
GymLogDbParsed *db = parseDb(arena, os_readEntireFile(arena, DB_FILE_LOCATION)); GymLogDbParsed *db = parseDb(arena, os_readEntireFile(arena, DB_FILE_LOCATION));
for (EachIn(db->entries, i)) { for (EachIn(db->entries, i)) {
GymLogDbParsedEntry entry = db->entries.data[i]; GymLogDbParsedEntry entry = db->entries.data[i];
if (strStartsWith(entry.name, exerciseName)) { if (strStartsWith(entry.name, exercise.name)) {
existingEntry = &entry; existingEntry = &entry;
if (entry.name.length != exerciseName.length) { if (entry.name.length != exercise.name.length) {
exerciseName = entry.name; exercise.name = entry.name;
log("Assuming exercise \"%S\".\n\n", entry.name); log("Assuming exercise \"%S\".\n\n", entry.name);
} }
break; break;
} }
} }
if (!existingEntry) { if (!existingEntry) {
log("The exercise \"%S\" hasn't been registered.", exerciseName); log("The exercise \"%S\" hasn't been registered.", exercise.name);
statusCode = 1; statusCode = 1;
} }
} }
if (statusCode == 0) { if (statusCode == 0) {
uint32 exerciseId = existingEntry->id; exercise.id = existingEntry->id;
size_t parsedCount = 0; size_t parsedCount = 0;
real32 kg = parsePositiveReal32(args.data[1], &parsedCount); real32 kg = parsePositiveReal32(args.data[1], &parsedCount);
uint8 reps = parsePositiveInt(args.data[2], &parsedCount); uint8 reps = parsePositiveInt(args.data[2], &parsedCount);
@@ -324,13 +329,13 @@ int gymTrackerDo(Arena *arena, list<string> args) {
} else { } else {
GymLogEntry entry = { GymLogEntry entry = {
getSystemUnixTime(), getSystemUnixTime(),
exerciseId, exercise.id,
reps, reps,
kg, kg,
}; };
os_fileAppend(arena, LOG_FILE_LOCATION, (byte *)&entry, sizeof(entry)); os_fileAppend(arena, LOG_FILE_LOCATION, (byte *)&entry, sizeof(entry));
statusCode = gymTrackerWorkToday(arena, exerciseId, exerciseName); statusCode = gymTrackerLogWorkToday(arena, exercise);
} }
} }