[fix] Local record creation (#31)

Author: hozlucas28

src/api/main.c

@@ -87,30 +87,35 @@ unsigned char postAPI(const Configuration* config, List* players) {
     return error;
 }
 
-unsigned char createLocalRecord(const Configuration* config, List* players, char* localFilePath) {
+unsigned char createLocalRecord(Configuration* config, List* players) {
     unsigned char error;
 
     FILE* file;
 
     // Chars per column
     const int indexCol = 2;
     const int nameCol = PLAYER_NAME_LENGTH;
-    const int pointsCol = 6;
-    const int columns = 3;
+    const int gamesWonCol = sizeof("Games won") - 1;
+    const int lostGamesCol = sizeof("Lost games") - 1;
+    const int tiedGamesCol = sizeof("Tied games") - 1;
+    const int pointsCol = sizeof("Points") - 1;
+    const int columns = 6;
     const int separatorsBetweenCols = columns - 1;
 
-    const int lineLength = (indexCol + nameCol + pointsCol) + (columns * 2) + separatorsBetweenCols;
+    const int lineLength =
+        (indexCol + nameCol + gamesWonCol + lostGamesCol + tiedGamesCol + pointsCol) +
+        (columns * 2) + separatorsBetweenCols;
 
     int i;
     Player player;
     size_t playersLength;
 
-    error = concatCurrentTime(localFilePath);
+    error = concatCurrentTime(config->localRecordPath);
     if (error) return 1;
 
-    strcat(localFilePath, ".txt");
+    strcat(config->localRecordPath, ".txt");
 
-    file = fopen(localFilePath, "wt");
+    file = fopen(config->localRecordPath, "wt");
     if (file == NULL) return 1;
 
     // Header - Team name
@@ -122,7 +127,8 @@ unsigned char createLocalRecord(const Configuration* config, List* players, char
     fprintf(file, "+\n");
 
     // Table - Titles
-    fprintf(file, "| N° | %-*s | Points |\n", nameCol, "Player name");
+    fprintf(file, "| N° | %-*s | Games won | Lost games | Tied games | Points |\n", nameCol,
+            "Player name");
 
     // Table - Separator line
     fputc('|', file);
@@ -143,8 +149,9 @@ unsigned char createLocalRecord(const Configuration* config, List* players, char
         error = getElement(players, &player, sizeof(player), i);
         if (error) break;
 
-        fprintf(file, "| %0*d | %-*s | %0*d |\n", indexCol, i + 1, nameCol, player.name, pointsCol,
-                player.points);
+        fprintf(file, "| %0*d | %-*s | %0*d | %0*d | %0*d | %0*d |\n", indexCol, i + 1, nameCol,
+                player.name, gamesWonCol, player.gamesWons, lostGamesCol, player.lostGames,
+                tiedGamesCol, player.tiedGames, pointsCol, player.points);
     };
 
     // Table - End line

src/api/main.h

@@ -10,6 +10,6 @@ unsigned char getAPI(const char* endpoint, List* players);
 
 unsigned char postAPI(const Configuration* config, List* players);
 
-unsigned char createLocalRecord(const Configuration* config, List* players, char* localFilePath);
+unsigned char createLocalRecord(Configuration* config, List* players);
 
 #endif  // SRC__API_H_INCLUDED

src/configuration/functions.c

@@ -6,8 +6,14 @@
 #include "./structs.h"
 
 unsigned char getConfiguration(Configuration* config, const char* path) {
+    size_t fieldsRead = 0;
     char line[CONFIGURATION_LINE_LENGTH];
 
+    char apiURL[API_URL_LENGTH];
+    char localRecordPath[LOCAL_RECORD_PATH_LENGTH];
+    char teamName[TEAM_NAME_LENGTH];
+    int gamesPerPlayer;
+
     char* fieldStart;
     char* fieldEnd;
 
@@ -24,23 +30,29 @@ unsigned char getConfiguration(Configuration* config, const char* path) {
 
     *fieldEnd = '\0';
     if (strlen(fieldStart) == 0) return 1;
-    strcpy(config->apiURL, fieldStart);
+    strcpy(apiURL, fieldStart);
 
     fieldStart = fieldEnd + 1;
     fieldEnd = strchr(fieldStart, ' ');
     if (fieldEnd == NULL) return 1;
 
     fieldStart = fieldEnd + 1;
     lineBreak = strrchr(fieldStart, '\n');
-    if (lineBreak != NULL) {
-        *lineBreak = '\0';
-    };
+    if (lineBreak != NULL) *lineBreak = '\0';
 
-    strcpy(config->teamName, fieldStart);
+    strcpy(teamName, fieldStart);
 
     if (fgets(line, sizeof(line), file) == NULL) return 1;
 
-    sscanf(line, "%d", &config->gamesPerPlayer);
+    fieldsRead = sscanf(line, "%d", &gamesPerPlayer);
+    if (fieldsRead != 1) return 1;
+
+    strcpy(localRecordPath, LOCAL_RECORD_PATH);
+
+    strcpy(config->apiURL, apiURL);
+    strcpy(config->teamName, teamName);
+    config->gamesPerPlayer = gamesPerPlayer;
+    strcpy(config->localRecordPath, LOCAL_RECORD_PATH);
 
     return 0;
 }

src/configuration/logs/main.c

@@ -9,8 +9,9 @@ void reprConfiguration(Configuration* config) {
     };
 
     printf("Configuration 0x%p {\n", (void*)&config);
-    printf("  char apiURL[MAXIMUM_API_URL_LENGTH] = \"%s\",\n", config->apiURL);
-    printf("  char teamName[TEAM_NAME_LENGTH] = \"%s\",\n", config->teamName);
+    printf("  char apiURL[%d] = \"%s\",\n", API_URL_LENGTH, config->apiURL);
+    printf("  char localRecordPath[%d] = \"%s\",\n", (int)LOCAL_RECORD_PATH_LENGTH, config->teamName);
+    printf("  char teamName[%d] = \"%s\",\n", (int)TEAM_NAME_LENGTH, config->teamName);
     printf("  int gamesPerPlayer = %d,\n", config->gamesPerPlayer);
     printf("};");
 }

src/configuration/macros.h

@@ -1,7 +1,16 @@
 #ifndef SRC__CONFIG_MACRO_H_INCLUDED
 #define SRC__CONFIG_MACRO_H_INCLUDED
 
-#define MAXIMUM_API_URL_LENGTH 256
+#define CONFIGURATION_PATH "./statics/configuration.txt"
+
+#define API_URL_LENGTH 256
+
+#define LOCAL_RECORD_PATH "./statics/local-storage/informe-juego_"
+
+#define LOCAL_RECORD_PATH_LENGTH \
+    (sizeof(LOCAL_RECORD_PATH) + sizeof("YYYY-MM-DD-HH-mm") + sizeof(".txt") + 1)
+
+#define TEAM_NAME_LENGTH 32
 
 #define CONFIGURATION_LINE_LENGTH 256
 

src/configuration/structs.h

@@ -6,7 +6,8 @@
 #include "./macros.h"
 
 typedef struct {
-    char apiURL[MAXIMUM_API_URL_LENGTH];
+    char apiURL[API_URL_LENGTH];
+    char localRecordPath[LOCAL_RECORD_PATH_LENGTH];
     char teamName[TEAM_NAME_LENGTH];
     int gamesPerPlayer;
 } Configuration;

src/macros.h

@@ -1,23 +1,12 @@
 #ifndef SRC_MACROS_H_INCLUDED
 #define SRC_MACROS_H_INCLUDED
 
-/* --------------------------------- Common --------------------------------- */
-
 #define DEVELOPMENT_TEAM "SQUASH"
 
-#define TEAM_NAME_LENGTH 32
-
-#define CONFIGURATION_PATH "./statics/configuration.txt"
-
-#define LOCAL_FILE_PATH "./statics/local-storage/informe-juego_"
-
-#define LOCAL_FILE_PATH_LENGTH \
-    (sizeof(LOCAL_FILE_PATH) + sizeof("YYYY-MM-DD-HH-mm") + sizeof(".txt") + 1)
-
-/* --------------------------------- Player --------------------------------- */
+#define DEVELOPMENT_TEAM_LENGTH 16
 
 #define PLAYER_NAME_LENGTH 64
 
-#define PLAYER_LAST_GAME_PLAYED_LENGTH 19
+#define PLAYER_LAST_GAME_PLAYED_LENGTH 20
 
 #endif  // SRC_MACROS_H_INCLUDED

src/main.c

@@ -13,9 +13,7 @@
 int main(const int argsLength, char* args[]) {
     unsigned char error;
 
-    Team team;
     Configuration config;
-    char localFilePath[LOCAL_FILE_PATH_LENGTH] = LOCAL_FILE_PATH;
 
     int userInput;
 
@@ -25,8 +23,6 @@ int main(const int argsLength, char* args[]) {
         return 1;
     };
 
-    strcpy(team.name, config.teamName);
-
     printf("> %s team - A Tic-Tac-Toe game developed with C...", DEVELOPMENT_TEAM);
 
     printf("\n\n> Available options:\n\n%s%s%s", " 1 - Play Tic-Tac-Toe.\n", " 2 - Show ranking.\n",
@@ -39,8 +35,8 @@ int main(const int argsLength, char* args[]) {
     while (userInput != 0) {
         switch (userInput) {
             case 1:
-                printf("\n> Team %s...\n\n", team.name);
-                playTicTacToe(&config, localFilePath);
+                printf("\n> Team %s...\n\n", config.teamName);
+                playTicTacToe(&config);
                 break;
             case 2:
                 showRanking(&config);

src/play/main.c

@@ -3,13 +3,14 @@
 #include <stdio.h>
 
 #include "../../libs/main.h"
+#include "../../utilities.h"
 #include "../api/main.h"
 #include "../configuration/main.h"
 #include "../structs.h"
 #include "./tateti/main.h"
 #include "./utilities.h"
 
-unsigned char playTicTacToe(const Configuration* config, char* localFilePath) {
+unsigned char playTicTacToe(Configuration* config) {
     List players;
     List playersAfterMatch;
 
@@ -20,11 +21,6 @@ unsigned char playTicTacToe(const Configuration* config, char* localFilePath) {
     newList(&players);
     newList(&playersAfterMatch);
 
-    if (!requestPlayerNames(&players)) {
-        printf("> Error! An error occurred on get player names.\n\n");
-        return 0;
-    };
-
     randomSort(&players);
 
     while (popElement(&players, &player, sizeof(player))) {
@@ -43,13 +39,11 @@ unsigned char playTicTacToe(const Configuration* config, char* localFilePath) {
 
         printf("> Your final score is %d.\n\n", player.points);
 
-        printf("> ");
-        system("pause");
-        puts("");
-
         if (!pushElement(&playersAfterMatch, &player, sizeof(player))) return 0;
     }
 
+    selectionSort(&playersAfterMatch, &cmpPlayersAscPoints);
+
     if (postAPI(config, &playersAfterMatch)) {
         puts("> Error! An error occurred on post to the API.\n\n");
 
@@ -61,7 +55,7 @@ unsigned char playTicTacToe(const Configuration* config, char* localFilePath) {
 
     puts("> The game statistics was sent to the API.\n");
 
-    if (createLocalRecord(config, &playersAfterMatch, localFilePath)) {
+    if (createLocalRecord(config, &playersAfterMatch)) {
         puts("> Error! An error occurred on create local record.\n\n");
 
         destroyList(&players);

src/play/main.h

@@ -3,6 +3,6 @@
 
 #include "../configuration/main.h"
 
-unsigned char playTicTacToe(const Configuration* config, char* localFilePath);
+unsigned char playTicTacToe(Configuration* config);
 
 #endif  // SRC__PLAY_H_INCLUDED

src/play/structs.h

@@ -0,0 +1,20 @@
+#ifndef SRC__PLAY_STRUCTS_H_INCLUDED
+#define SRC__PLAY_STRUCTS_H_INCLUDED
+
+#include "../../libs/main.h"
+#include "../configuration/structs.h"
+#include "../structs.h"
+
+typedef struct {
+    Player winner;
+    Player loser;
+    unsigned char result;
+    Configuration* configuration;
+} Game;
+
+typedef struct {
+    List* players;
+    List* games;
+} TicTacToeGame;
+
+#endif  // SRC__PLAY_STRUCTS_H_INCLUDED