recursive load child ygopro data

app/about.component.ts

@@ -2,6 +2,7 @@
  * Created by zh99998 on 16/9/2.
  */
 import {Component} from '@angular/core';
+
 @Component({
     moduleId: module.id,
     selector: 'about',

app/app-local.ts

 import {App} from './app';
+
 /**
  * Created by zh99998 on 16/9/6.
  */

app/app.ts

-import { AppLocal } from './app-local';
+import {AppLocal} from './app-local';
 import * as path from 'path';
 import * as ini from 'ini';
 import * as fs from 'fs';

app/apps.service.ts

@@ -19,9 +19,8 @@ import {LoginService} from './login.service';
 import {SettingsService} from './settings.sevices';
 import {ComparableSet} from './shared/ComparableSet';
 import {AppsJson} from './apps-json-type';
-import Timer = NodeJS.Timer;
-import ReadableStream = NodeJS.ReadableStream;
 import * as os from 'os';
+import Timer = NodeJS.Timer;
 
 const Logger = {
     info: (...message: any[]) => {

app/candy.component.ts

@@ -23,7 +23,7 @@ $.fn.init = new Proxy($.fn.init, {
 
 window['jQuery'] = $;
 
-import {Component, ViewEncapsulation, OnInit, Input, OnChanges, SimpleChanges, ElementRef} from '@angular/core';
+import {Component, ElementRef, Input, OnChanges, OnInit, SimpleChanges, ViewEncapsulation} from '@angular/core';
 import {LoginService} from './login.service';
 import {SettingsService} from './settings.sevices';
 import {App} from './app';

app/download.service.ts

 /**
  * Created by weijian on 2016/10/26.
  */
-import {Injectable, NgZone, EventEmitter} from '@angular/core';
+import {EventEmitter, Injectable, NgZone} from '@angular/core';
 import {Http} from '@angular/http';
 // import {error} from 'util';
 // import Timer = NodeJS.Timer;

app/error-handler.ts

@@ -2,7 +2,7 @@
  * Created by zh99998 on 2017/6/1.
  */
 import * as Raven from 'raven-js';
-import { ErrorHandler } from '@angular/core';
+import {ErrorHandler} from '@angular/core';
 
 Raven
     .config('https://2c5fa0d0f13c43b5b96346f4eff2ea60@sentry.io/174769')

app/i18n-providers.ts

-import {TRANSLATIONS, TRANSLATIONS_FORMAT, LOCALE_ID} from '@angular/core';
+import {LOCALE_ID, TRANSLATIONS, TRANSLATIONS_FORMAT} from '@angular/core';
 import {remote} from 'electron';
 
 export async function getTranslationProviders (): Promise<Object[]> {

app/install-option.ts

 import {App} from './app';
 import * as path from 'path';
+
 /**
  * Created by weijian on 2016/10/24.
  */

app/lobby.component.ts

 /**
  * Created by zh99998 on 16/9/2.
  */
-import { ChangeDetectorRef, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
-import { AppsService } from './apps.service';
-import { LoginService } from './login.service';
-import { App, Category } from './app';
-import { shell } from 'electron';
-import { SettingsService } from './settings.sevices';
+import {ChangeDetectorRef, Component, ElementRef, OnInit, ViewChild} from '@angular/core';
+import {AppsService} from './apps.service';
+import {LoginService} from './login.service';
+import {App, Category} from './app';
+import {shell} from 'electron';
+import {SettingsService} from './settings.sevices';
+
 const ReconnectingWebSocket = require('reconnecting-websocket');
 
 // import 'typeahead.js';

app/login.component.ts

 /**
  * Created by zh99998 on 16/9/2.
  */
-import { Component } from '@angular/core';
-import { LoginService } from './login.service';
+import {Component} from '@angular/core';
+import {LoginService} from './login.service';
 import * as crypto from 'crypto';
-import { shell } from 'electron';
+import {shell} from 'electron';
 
 @Component({
     moduleId: module.id,

app/mycard.component.ts

-import { ChangeDetectorRef, Component, ElementRef, OnInit, Renderer, ViewChild } from '@angular/core';
+import {ChangeDetectorRef, Component, ElementRef, OnInit, Renderer, ViewChild} from '@angular/core';
 import 'bootstrap';
-import { remote, shell } from 'electron';
+import {remote, shell} from 'electron';
 import * as $ from 'jquery';
 import * as Tether from 'tether';
-import { LoginService } from './login.service';
-import { SettingsService } from './settings.sevices';
+import {LoginService} from './login.service';
+import {SettingsService} from './settings.sevices';
+
 window['Tether'] = Tether;
 
 const autoUpdater: Electron.AutoUpdater = remote.getGlobal('autoUpdater');

app/mycard.module.ts

-import { ErrorHandler, LOCALE_ID, NgModule, NO_ERRORS_SCHEMA } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { HttpModule } from '@angular/http';
-import { MyCardComponent } from './mycard.component';
-import { LoginComponent } from './login.component';
-import { StoreComponent } from './store.component';
-import { LobbyComponent } from './lobby.component';
-import { AppDetailComponent } from './app-detail.component';
-import { RosterComponent } from './roster.component';
-import { YGOProComponent } from './ygopro.component';
-import { AppsService } from './apps.service';
-import { SettingsService } from './settings.sevices';
-import { LoginService } from './login.service';
-import { DownloadService } from './download.service';
-import { AboutComponent } from './about.component';
-import { CandyComponent } from './candy.component';
-import { RavenErrorHandler } from './error-handler';
-import { NetworkComponent } from './network.component';
+import {LOCALE_ID, NgModule, NO_ERRORS_SCHEMA} from '@angular/core';
+import {BrowserModule} from '@angular/platform-browser';
+import {FormsModule, ReactiveFormsModule} from '@angular/forms';
+import {HttpModule} from '@angular/http';
+import {MyCardComponent} from './mycard.component';
+import {LoginComponent} from './login.component';
+import {StoreComponent} from './store.component';
+import {LobbyComponent} from './lobby.component';
+import {AppDetailComponent} from './app-detail.component';
+import {RosterComponent} from './roster.component';
+import {YGOProComponent} from './ygopro.component';
+import {AppsService} from './apps.service';
+import {SettingsService} from './settings.sevices';
+import {LoginService} from './login.service';
+import {DownloadService} from './download.service';
+import {AboutComponent} from './about.component';
+import {CandyComponent} from './candy.component';
+import {NetworkComponent} from './network.component';
 
 export function settingsService_getLocale(settingsService: SettingsService) {
     return settingsService.getLocale();

app/network.component.ts

-import { ChangeDetectorRef, Component, ElementRef, Input, OnChanges, OnInit, SimpleChanges, Injectable } from '@angular/core';
-import { AppsService } from './apps.service';
+import {Component, Injectable, Input} from '@angular/core';
+import {AppsService} from './apps.service';
 import {App} from './app';
 
 @Component({

app/roster.component.ts

 /**
  * Created by zh99998 on 16/9/2.
  */
-import {Component, Input, EventEmitter, Output, OnInit, OnChanges} from '@angular/core';
+import {Component, EventEmitter, Input, OnChanges, OnInit, Output} from '@angular/core';
+
 @Component({
     moduleId: module.id,
     selector: 'roster',

app/store.component.ts

@@ -2,6 +2,7 @@
  * Created by zh99998 on 16/9/2.
  */
 import {Component} from '@angular/core';
+
 @Component({
     moduleId: module.id,
     selector: 'store',

app/ygopro.component.ts

@@ -5,17 +5,17 @@ import {ChangeDetectorRef, Component, ElementRef, EventEmitter, Input, OnDestroy
 import {Headers, Http} from '@angular/http';
 import {clipboard, remote, shell} from 'electron';
 import * as fs from 'fs-extra';
-import * as ini from 'ini';
 import * as $ from 'jquery';
 import * as path from 'path';
 import 'rxjs/Rx';
 import {ISubscription} from 'rxjs/Subscription';
-import {App, AppStatus} from './app';
+import {App} from './app';
 import {AppsService} from './apps.service';
 import {LoginService} from './login.service';
 import {SettingsService} from './settings.sevices';
 import Timer = NodeJS.Timer;
 import WillNavigateEvent = Electron.WillNavigateEvent;
+import _ = require('lodash');
 
 interface SystemConf {
     use_d3d: string;
@@ -278,8 +278,23 @@ export class YGOProComponent implements OnInit, OnDestroy {
         });
     }
 
+    getYGOProData(app: App) {
+        const ygoproData = <YGOProData>app.data;
+        for (const child of this.appsService.findChildren(app)) {
+            if (child.isYGOPro) {
+                const childData = this.getYGOProData(child);
+                _.mergeWith(ygoproData, childData, (objValue, srcValue) => {
+                    if (_.isArray(objValue)) {
+                        return objValue.concat(srcValue);
+                    }
+                });
+            }
+        }
+        return ygoproData;
+    }
+
     async ngOnInit() {
-        const ygoproData = <YGOProData>this.app.data;
+        const ygoproData = this.getYGOProData(this.app);
         this.servers = ygoproData.servers;
         this.selectableServers = this.servers.filter(s => !s.hidden);
         this.currentServer = this.selectableServers[0];
@@ -293,11 +308,12 @@ export class YGOProComponent implements OnInit, OnDestroy {
         }
 
         if (ygoproData.ygopro.lastDeckFormat) {
-            //console.log(`Deck format pattern: ${ygoproData.ygopro.lastDeckFormat}`)
+            // console.log(`Deck format pattern: ${ygoproData.ygopro.lastDeckFormat}`)
             this.lastDeckFormat = new RegExp(ygoproData.ygopro.lastDeckFormat);
         }
 
         this.system_conf = this.app.systemConfPath;
+        console.log(`Will load system conf file from ${this.system_conf}`);
         await this.refresh(true);
 
         let modal = $('#game-list-modal');
@@ -549,6 +565,7 @@ export class YGOProComponent implements OnInit, OnDestroy {
             return null;
         }
         try {
+            // console.log(`Loading system conf from ${this.system_conf}`)
             let data = await fs.readFile(this.system_conf, {encoding: 'utf-8'});
             return data;
         } catch(e) {

systemjs.config.js

@@ -71,6 +71,7 @@ System.config({
         "electron": "@node/electron",
         "ini": "@node/ini",
         "mustache": "@node/mustache",
+        "lodash": "@node/lodash",
         "mkdirp": "@node/mkdirp",
         "aria2": "@node/aria2",
         "electron-sudo": "@node/electron-sudo",