Directory name must be different from robot name

ARIG-Robotique · May 3, 2024 · a9c4496 · a9c4496
1 parent 483f01d
commit a9c4496
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/src/models/Robot.ts b/src/models/Robot.ts
@@ -14,6 +14,9 @@ export class Robot extends Model<Robot> {
     @Column
     name: string;
 
+    @Column
+    dirName: string;
+
     @Column
     simulateur: boolean;
 

diff --git a/src/services/BashService.ts b/src/services/BashService.ts
@@ -29,7 +29,8 @@ export class BashService {
                 this.log.info(`Copy all logs for ${robotId} ${robot.name} from ${host} to ${dir}`);
 
                 return new Promise((resolve, reject) => {
-                    const getLogs = child.spawn(this.GET_LOGS_SH, [host, robot.name.toLowerCase(), dir], {
+                    let robotName = robot.dirName !== undefined ? robot.dirName.toLowerCase() : robot.name.toLowerCase();
+                    const getLogs = child.spawn(this.GET_LOGS_SH, [host, robotName, dir], {
                         cwd: process.cwd()
                     });
 

diff --git a/src/services/RobotService.ts b/src/services/RobotService.ts
@@ -14,10 +14,12 @@ export class RobotService {
     private log: Logger;
 
     buildDir(robot: Robot): string {
+        let dirName = robot.dirName !== undefined ? robot.dirName.toLowerCase() : robot.name.toLowerCase();
+
         if (robot.simulateur) {
-            return `${this.config.logsOutput}-simulateur/${robot.name.toLowerCase()}`;
+            return `${this.config.logsOutput}-simulateur/${dirName}`;
         } else {
-            return `${this.config.logsOutput}/${robot.name.toLowerCase()}`;
+            return `${this.config.logsOutput}/${dirName}`;
         }
     }
 
@@ -92,41 +94,47 @@ export class RobotService {
                     new Robot({
                         host      : 'pami-triangle:8082',
                         name      : 'Pami △',
+                        dirName   : 'pami-triangle',
                         simulateur: false,
                     }).save();
                 }
                 if (!hasPamiTriangleSimu) {
                     new Robot({
                         host      : 'localhost:8082',
                         name      : 'Pami △',
+                        dirName   : 'pami-triangle',
                         simulateur: true,
                     }).save();
                 }
                 if (!hasPamiCarre) {
                     new Robot({
                         host      : 'pami-carre:8083',
                         name      : 'Pami ▢',
+                        dirName   : 'pami-carre',
                         simulateur: false,
                     }).save();
                 }
                 if (!hasPamiCarreSimu) {
                     new Robot({
                         host      : 'localhost:8083',
                         name      : 'Pami ▢',
+                        dirName   : 'pami-carre',
                         simulateur: true,
                     }).save();
                 }
                 if (!hasPamiRond) {
                     new Robot({
                         host      : 'pami-rond:8084',
                         name      : 'Pami ○',
+                        dirName   : 'pami-rond',
                         simulateur: false,
                     }).save();
                 }
                 if (!hasPamiRondSimu) {
                     new Robot({
                         host      : 'localhost:8084',
                         name      : 'Pami ○',
+                        dirName   : 'pami-rond',
                         simulateur: true,
                     }).save();
                 }