better progression

Author: Raphael67

src/generation/filler.ts

@@ -126,7 +126,7 @@ export class Filler {
                     try {
                         row[column.name] = generators[c].generate(currentTableRow, row);
                     } catch (ex) {
-                        this.callback({ currentTable: table.name, step: 'generateData', state: 'RUNNING', currentValue: currentNbRows, max: maxLines, comment: (ex as Error).message });
+                        this.callback({ currentTable: table.name, step: 'generateData', state: 'RUNNING', currentValue: currentNbRows, max: maxLines, comment: (ex as Error).message + '. ' });
                         break BATCH_LOOP;
                     }
 
@@ -138,7 +138,7 @@ export class Filler {
             insertedRows = await this.dbConnector.insert(table.name, rows);
             currentNbRows += insertedRows;
             if (previousRunRows === currentNbRows) {
-                this.callback({ currentTable: table.name, step: 'generateData', state: 'DONE', currentValue: currentNbRows, max: maxLines, comment: 'Last run did not insert any rows' });
+                this.callback({ currentTable: table.name, step: 'generateData', state: 'DONE', currentValue: currentNbRows, max: maxLines, comment: 'Last run did not insert any rows. ' });
                 break TABLE_LOOP;
             }
             this.callback({ currentTable: table.name, step: 'generateData', state: 'RUNNING', currentValue: currentNbRows, max: maxLines });

src/main.ts

@@ -126,7 +126,6 @@ class Main extends CliMainClass {
     progressEventHandler() {
         let previousEvent: ProgressEvent = { currentTable: '', currentValue: 0, max: 0, state: 'DONE', step: '' };
         let currentProgress: SingleBar;
-        let lastComment: string = '';
         return (event: ProgressEvent) => {
             let diff = false;
             if (previousEvent.currentTable !== event.currentTable) {
@@ -137,16 +136,15 @@ class Main extends CliMainClass {
                 diff = true;
             }
             if (diff === true) {
-                lastComment = '';
                 if (currentProgress) currentProgress.stop();
                 currentProgress = new cliProgress.SingleBar({
                     format: `${event.step + new Array(16 - event.step.length).join(' ')} | ${colors.cyan('{bar}')} | {percentage}% | {value}/{total} | {comment}`,
                     stopOnComplete: true,
                 });
-                currentProgress.start(event.max, event.currentValue, { comment: event.comment || lastComment });
+                currentProgress.start(event.max, event.currentValue, { comment: event.comment || '' });
             } else {
-                if (currentProgress) currentProgress.update(event.currentValue, { comment: event.comment || lastComment });
-                if (event.comment) lastComment = event.comment;
+                event.comment = [previousEvent.comment, event.comment].join('');
+                if (currentProgress) currentProgress.update(event.currentValue, { comment: event.comment });
                 if (event.state === 'DONE') currentProgress.stop();
             }
             previousEvent = event;