[FIX]: Fixing input player names (#35)

Author: ValentinMassa

src/play/tateti/main.c

@@ -225,31 +225,28 @@ void getValidatedInput(inputValuePlayer *datainput) {
     char _input[4];
 
     do {
-        puts("\n> Enter a coordinate to play. (ex: 0,0) \n WARNING:\n\t(maximum is (2,2)\n");
+        puts(
+            "\n> Enter a coordinate to play. (ex: 1,1) \n WARNING:\n\t(maximum is (3,3) / minimum)"
+            "is (1,1)\n");
         fflush(stdin);
-        fgets(_input, sizeof(_input), stdin);  // TODO: prevent negative or out range
+        fgets(_input, sizeof(_input), stdin);
         fflush(stdin);
     } while (!checkInputFormat(datainput, _input));
     return;
 }
 unsigned char checkInputFormat(inputValuePlayer *datainput, char *_input) {
-    char *pointer = _input;
-    int raw, column;
+    int raw, column, finalvalue = 2;
 
-    raw = atoi(pointer);
-    if (raw < 0 || raw > 3) {
+    if (finalvalue != sscanf(_input, "%d,%d", &raw, &column)) {
         puts("\n> No valid Format. Try Again \n");
         return 0;
     }
-    pointer++;
-    pointer++;
-    column = atoi(pointer);
-    if (column < 0 || column > 3) {
-        puts("\n> No valid Format. Try Again \n");
+    if ((raw < 1 || raw > 3) || (column < 1 || column > 3)) {
+        puts("\n> No valid number range. Try Again \n");
         return 0;
     }
-    datainput->column = column;
-    datainput->raw = raw;
+    datainput->column = column - 1;
+    datainput->raw = raw - 1;
     return 1;
 }
 

src/play/utilities.c

@@ -1,42 +1,78 @@
 
 #include "./utilities.h"
 
+#include <ctype.h>
 #include <stdio.h>
 #include <string.h>
 
 #include "../../libs/main.h"
 #include "../macros.h"
 #include "../structs.h"
+#include "../utilities.h"
+
+unsigned char formatPlayerName(char *_name) {
+    char *linepointer;
+
+    linepointer = strrchr(_name, '\0');
+    if (linepointer == NULL) return 0;
+    linepointer--;
+    while (!isalpha(*linepointer) && linepointer > _name) {
+        linepointer--;
+    }
+    *(linepointer + 1) = '\0';
+    return 1;
+}
 
-unsigned char requestPlayerNames(SList* players) {
-    char* lineBreak;
+unsigned char checkPlayerName(char *_name) {
+    char *lineBreak;
 
-    Player player = {.points = 0, .gamesWons = 0, .lostGames = 0, .tiedGames = 0};
+    lineBreak = strrchr(_name, '\n');
 
-    printf("> Enter a player name (0 to exit): ");
-    fflush(stdin);
-    fgets(player.name, PLAYER_NAME_LENGTH, stdin);
-    puts("");
+    if (lineBreak == NULL) return 0;
+    *lineBreak = '\0';
 
-    lineBreak = strrchr(player.name, '\n');
-    if (lineBreak != NULL) *lineBreak = '\0';
+    if (*lineBreak == '0') return 0;
 
-    if (*(player.name) == '0' || !pushSListElement(players, &player, sizeof(player))) return 0;
+    if (isspace(*_name) || *_name == '\0') {
+        printf("> Name is required.\n\n");
+        return 0;
+    }
+    return 1;
+}
 
-    while (*(player.name) != '0') {
-        printf("> Enter a player name (0 to exit): ");
+void requestPlayerName(char *name) {
+    printf("> Enter a player name (0 to exit): ");
+    do {
+        fflush(stdin);
+        fgets(name, PLAYER_NAME_LENGTH, stdin);
         fflush(stdin);
-        fgets(player.name, PLAYER_NAME_LENGTH, stdin);
         puts("");
 
-        lineBreak = strrchr(player.name, '\n');
-        if (lineBreak != NULL) *lineBreak = '\0';
+    } while (!checkPlayerName(name));
+    return;
+}
+
+unsigned char requestPlayerNames(SList *players) {
+    Player player;
+    char playerName[PLAYER_NAME_LENGTH];
+
+    requestPlayerName(playerName);
+    formatPlayerName(playerName);
+    if (*playerName == '0') return 0;
+
+    newPlayer(&player, playerName);
 
-        if (*(player.name) == '0') break;
+    if (!pushSListElement(players, &player, sizeof(player))) return 0;
+
+    while (*playerName != '0') {
+        requestPlayerName(playerName);
+        formatPlayerName(playerName);
+
+        if (*playerName == '0') break;
+        newPlayer(&player, playerName);
 
         if (!pushSListElement(players, &player, sizeof(player))) return 0;
     };
-
     return 1;
 }
 

src/play/utilities.h

@@ -6,8 +6,14 @@
 #include "../structs.h"
 #include "./tateti/main.h"
 
-unsigned char requestPlayerNames(SList* players);
+unsigned char checkPlayerName(char *_name);
+
+unsigned char formatPlayerName(char *_name);
+
+unsigned char requestPlayerNames(SList *players);
 
 void isPlayerReady();
 
+void requestPlayerName(char *name);
+
 #endif  // SRC_PLAY_UTILITIES_H_INCLUDED