Fix undefined GameModel and loading gamemodel when no gamesystems defined
All checks were successful
E2E Testing / test (push) Successful in 1m36s

This commit is contained in:
Sebastian Böckelmann 2024-03-18 15:58:44 +01:00
parent 2e6bddc099
commit 26ef72cac3
3 changed files with 18 additions and 6 deletions

View File

@ -54,10 +54,15 @@ class SaveProject {
} }
static loadGamesystems(projectDir) { static loadGamesystems(projectDir) {
const gamesystemDir = path.join(projectDir, "gamesystems"); const gamesystemDir = path.join(projectDir, "gamesystems");
if (fs.existsSync(gamesystemDir)) {
const loadedGamesystems = this.loadGamesystemsRecursively(gamesystemDir); const loadedGamesystems = this.loadGamesystemsRecursively(gamesystemDir);
console.log("LoadedGamesystems: ", loadedGamesystems.length); console.log("LoadedGamesystems: ", loadedGamesystems.length);
return loadedGamesystems; return loadedGamesystems;
} }
else {
return [];
}
}
static loadGamesystemsRecursively(gamesystemDir) { static loadGamesystemsRecursively(gamesystemDir) {
let loadedGamesystems = []; let loadedGamesystems = [];
const gamesystemFileNames = fs.readdirSync(gamesystemDir); const gamesystemFileNames = fs.readdirSync(gamesystemDir);

View File

@ -62,9 +62,13 @@ export class SaveProject {
static loadGamesystems(projectDir: string): LoadModel[] { static loadGamesystems(projectDir: string): LoadModel[] {
const gamesystemDir = path.join(projectDir, "gamesystems"); const gamesystemDir = path.join(projectDir, "gamesystems");
if(fs.existsSync(gamesystemDir)) {
const loadedGamesystems = this.loadGamesystemsRecursively(gamesystemDir); const loadedGamesystems = this.loadGamesystemsRecursively(gamesystemDir);
console.log("LoadedGamesystems: ", loadedGamesystems.length); console.log("LoadedGamesystems: ", loadedGamesystems.length);
return loadedGamesystems; return loadedGamesystems;
} else {
return []
}
} }
static loadGamesystemsRecursively(gamesystemDir: string): LoadModel[] { static loadGamesystemsRecursively(gamesystemDir: string): LoadModel[] {

View File

@ -42,6 +42,9 @@ export class AppComponent implements OnInit{
private dialog: MatDialog private dialog: MatDialog
) { ) {
console.log('APP_CONFIG', APP_CONFIG); console.log('APP_CONFIG', APP_CONFIG);
if(this.gameModel == undefined) {
this.gameModel = new GameModel("Unknown GameModel")
}
if (electronService.isElectron) { if (electronService.isElectron) {
console.log(process.env); console.log(process.env);