Commit ea156a26 authored by 神楽坂玲奈's avatar 神楽坂玲奈

fix

parent dde94ddd
import {ApplicationRef, EventEmitter, Injectable, NgZone} from '@angular/core';
import {Http} from '@angular/http';
import { ApplicationRef, EventEmitter, Injectable, NgZone } from '@angular/core';
import { Http } from '@angular/http';
import * as child_process from 'child_process';
import {ChildProcess} from 'child_process';
import { ChildProcess } from 'child_process';
import * as crypto from 'crypto';
import {remote} from 'electron';
import { remote } from 'electron';
import * as sudo from 'electron-sudo';
import * as fs from 'fs';
import * as glob from 'glob';
import * as ini from 'ini';
import * as path from 'path';
import * as readline from 'readline';
import 'rxjs/Rx';
import {Observable, Observer} from 'rxjs/Rx';
import {Action, App, AppStatus} from './app';
import {AppLocal} from './app-local';
import {DownloadService, DownloadStatus} from './download.service';
import {InstallOption} from './install-option';
import {LoginService} from './login.service';
import {SettingsService} from './settings.sevices';
import {ComparableSet} from './shared/ComparableSet';
import { Observable, Observer } from 'rxjs/Rx';
import { Action, App, AppStatus } from './app';
import { AppLocal } from './app-local';
import { DownloadService, DownloadStatus } from './download.service';
import { InstallOption } from './install-option';
import { LoginService } from './login.service';
import { SettingsService } from './settings.sevices';
import { ComparableSet } from './shared/ComparableSet';
import Timer = NodeJS.Timer;
import ReadableStream = NodeJS.ReadableStream;
import * as sudo from 'electron-sudo';
const Logger = {
info: (...message: any[]) => {
console.log('AppService [INFO]: ', ...message);
......@@ -1196,7 +1196,7 @@ export class AppsService {
return new Promise((resolve, reject) => {
fs.lstat(file, (err, stats) => {
if (err) {
return resolve(path);
return resolve(file);
}
if (stats.isDirectory()) {
fs.rmdir(file, (error) => {
......
......@@ -12,20 +12,20 @@ import {
Output,
ViewChild
} from '@angular/core';
import * as fs from 'fs';
import * as path from 'path';
import { Headers, Http } from '@angular/http';
import * as child_process from 'child_process';
import { remote, shell } from 'electron';
import * as fs from 'fs';
import * as ini from 'ini';
import { EncodeOptions } from 'ini';
import { LoginService } from './login.service';
import { App } from './app';
import { Headers, Http } from '@angular/http';
import * as $ from 'jquery';
import * as path from 'path';
import 'rxjs/Rx';
import { ISubscription } from 'rxjs/Subscription';
import { App } from './app';
import { AppsService } from './apps.service';
import { LoginService } from './login.service';
import { SettingsService } from './settings.sevices';
import * as $ from 'jquery';
import Timer = NodeJS.Timer;
import WillNavigateEvent = Electron.WillNavigateEvent;
......@@ -186,11 +186,11 @@ export class YGOProComponent implements OnInit, OnDestroy {
this.textfont = ['/System/Library/Fonts/PingFang.ttc'];
break;
case 'win32':
this.numfont = [path.join(process.env['SystemRoot'], 'Fonts', 'arialbd.ttf')];
this.numfont = [path.join(process.env['SystemRoot']!, 'Fonts', 'arialbd.ttf')];
this.textfont = [
path.join(process.env['SystemRoot'], 'Fonts', 'msyh.ttc'),
path.join(process.env['SystemRoot'], 'Fonts', 'msyh.ttf'),
path.join(process.env['SystemRoot'], 'Fonts', 'simsun.ttc')
path.join(process.env['SystemRoot']!, 'Fonts', 'msyh.ttc'),
path.join(process.env['SystemRoot']!, 'Fonts', 'msyh.ttf'),
path.join(process.env['SystemRoot']!, 'Fonts', 'simsun.ttc')
];
break;
}
......@@ -372,7 +372,7 @@ export class YGOProComponent implements OnInit, OnDestroy {
});
remote.ipcMain.on('YGOPro', (e: any , type: string) => {
console.log('rrrrr')
console.log('rrrrr');
this.request_match(type);
});
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment