Skip to content

M
mycard
Commit 05e831bd authored by wudizhanche1000's avatar wudizhanche1000
Browse files
Options

修改 TODO内容

parent a833af7d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 230 additions and 130 deletions
app/apps.service.ts
View file @ 05e831bd
......@@ -11,7 +11,7 @@ import "rxjs/Rx";
import * as readline from "readline";
import {AppLocal} from "./app-local";
import * as ini from "ini";
import {DownloadService} from "./download.service";
import {DownloadService, DownloadStatus} from "./download.service";
import {InstallOption} from "./install-option";
import {ComparableSet} from "./shared/ComparableSet";
import {Observable, Observer} from "rxjs/Rx";
......@@ -21,7 +21,14 @@ import ReadableStream = NodeJS.ReadableStream;
const Aria2 = require('aria2');
const sudo = require('electron-sudo');
const Logger = {
info: (...message: any[]) => {
console.log("AppService [INFO]: ", ...message);
},
error: (...message: any[]) => {
console.error("AppService [ERROR]: ", ...message);
}
};
interface InstallTask {
app: App;
option: InstallOption;
......@@ -101,7 +108,6 @@ export class AppsService {
}
// 设置App关系
//TODO: 这里有必要重新整理一下么？
for (let [id] of apps) {
let temp = apps.get(id)!.actions;
let map = new Map<string,any>();
......@@ -153,46 +159,26 @@ export class AppsService {
}
await this.doInstall(task);
};
// TODO: 重构这个函数
const addDownloadTask = async(app: App, dir: string) => {
const addDownloadTask = async(app: App, dir: string): Promise<{app: App,files: string[]} > => {
let metalinkUrl = app.download;
if (app.id === "ygopro") {
// TODO: 需要特化平台下载的还有个desmume
metalinkUrl = "https://thief.mycard.moe/metalinks/ygopro-" + process.platform + ".meta4";
}
let metalink = await this.http.get(metalinkUrl).map((response) => response.text()).toPromise();
if (app.id === "desmume") {
metalinkUrl = "https://thief.mycard.moe/metalinks/desmume-" + process.platform + ".meta4";
}
app.status.status = "downloading";
let metalink = await this.http.get(metalinkUrl).map((response) => response.text()).toPromise();
let downloadId = await this.downloadService.addMetalink(metalink, dir);
let observable = this.downloadService.downloadProgress(downloadId);
return new Promise((resolve, reject) => {
observable.subscribe((task) => {
if (task.totalLength) {
app.status.total = task.totalLength;
} else {
app.status.total = 0;
}
app.status.progress = task.completedLength;
console.log(task);
if (task.downloadSpeed) {
let currentSpeed = parseInt(task.downloadSpeed);
const speedUnit = ["Byte/s", "KB/s", "MB/s", "GB/s", "TB/s"];
let currentUnit = Math.floor(Math.log(currentSpeed) / Math.log(1024));
console.log(currentSpeed, currentUnit);
app.status.progressMessage = (currentSpeed / 1024 ** currentUnit).toFixed(1) + " " + speedUnit[currentUnit];
} else {
app.status.progressMessage = '';
}
this.ref.tick();
}, (error) => {
reject(error);
}, async() => {
app.status.status = "waiting";
let files = await this.downloadService.getFile(downloadId);
resolve({app: app, files: files});
})
await this.downloadService.progress(downloadId, (status: DownloadStatus) => {
app.status.progress = status.completedLength;
app.status.total = status.totalLength;
app.status.progressMessage = status.downloadSpeedText;
this.ref.tick();
});
let files = await this.downloadService.getFiles(downloadId);
app.status.status = "waiting";
return {app: app, files: files}
};
if (!app.isInstalled()) {
let apps: App[] = [];
......@@ -203,16 +189,16 @@ export class AppsService {
try {
let downloadPath = path.join(option.installLibrary, 'downloading');
let tasks: Promise<any>[] = [];
Logger.info("Start to Download", apps);
for (let a of apps) {
tasks.push(addDownloadTask(a, downloadPath));
}
let downloadResults = await Promise.all(tasks);
Logger.info("Download Complete", downloadResults);
let installTasks: Promise<void>[] = [];
for (let result of downloadResults) {
console.log(result);
let o = new InstallOption(result.app, option.installLibrary);
o.downloadFiles = result.files;
let task = tryToInstall({app: result.app, option: o});
installTasks.push(task);
}
......@@ -224,7 +210,6 @@ export class AppsService {
a.reset()
}
}
console.log(e);
throw e;
}
}
......@@ -233,7 +218,7 @@ export class AppsService {
findChildren(app: App): App[] {
let children: App[] = [];
for (let [id,child] of this.apps) {
if (child.parent === app) {
if (child.parent === app || child.dependencies && child.dependencies.has(app.id)) {
children.push(child);
}
}
......@@ -347,7 +332,6 @@ export class AppsService {
remote.getCurrentWindow().minimize();
}
// TODO: 定位到下级文件，即现在的目录之内
// 如果有actions.main.execuate, 定位那个execuate的顶层路径
// 如果没有，定位目录里面任意一个顶级文件
browse(app: App) {
......@@ -357,7 +341,7 @@ export class AppsService {
if (!err) {
remote.shell.showItemInFolder(appPath + "/.");
} else {
console.log("Browser Window Error:", appPath, err);
Logger.error("Browser Window Error:", appPath, err);
}
});
}
......@@ -450,7 +434,7 @@ export class AppsService {
let app = task.app;
if (!app.isWaiting()) {
console.error('doUninstall', "应用不处于等待安装状态", JSON.stringify(app));
console.error('doUninstall', "应用不处于等待安装状态", app);
throw("应用不处于等待安装状态");
}
......@@ -652,9 +636,8 @@ export class AppsService {
for (let line of response.text().split('\n')) {
if (line !== "") {
let [checksum,filename]=line.split(' ', 2);
if (filename.endsWith("\\") || filename.endsWith("/")) {
map.set(filename, "");
}
// checksum文件里没有文件夹，这里添加上
map.set(path.dirname(filename), "");
map.set(filename, checksum);
}
}
......@@ -681,16 +664,19 @@ export class AppsService {
}
async uninstall(app: App) {
// TODO: 级联卸载mod
let children = this.findChildren(app);
let hasInstalledChild = children.find((child) => {
return child.isInstalled();
return child.isInstalled() && child.parent != app;
});
if (hasInstalledChild) {
throw "无法卸载，还有依赖此程序的游戏。"
}
if (app.isReady()) {
return this.doUninstall(app);
} else if (app.isReady()) {
for (let child of children) {
if (child.parent === app && child.isReady()) {
await this.doUninstall(child);
}
}
return await this.doUninstall(app);
}
}
......@@ -723,7 +709,7 @@ export class AppsService {
let parentSet = new ComparableSet(Array.from(app.parent.local!.files.keys()));
let difference = parentSet.intersection(fileSet);
if (difference) {
this.restoreFiles(appDir, backupDir, Array.from(difference))
await this.restoreFiles(appDir, backupDir, Array.from(difference))
}
}
......
app/download.service.ts
View file @ 05e831bd
This diff is collapsed.
app/settings.sevices.ts
View file @ 05e831bd
......@@ -16,7 +16,7 @@ export class SettingsService {
static defaultLibraries = [
{
"default": true,
path: path.join(remote.app.getPath("appData"), "library")
path: path.join(remote.app.getPath("appData"), "MyCardLibrary")
},
];
libraries: Library[];
......
index.js
View file @ 05e831bd
......@@ -180,7 +180,7 @@ function createTray() {
app.on('ready', () => {
createWindow();
if (process.env['NODE_ENV'] == 'production') {
setTimeout(autoUpdater.checkForUpdates, 2000);
setTimeout(autoUpdater.checkForUpdates.bind(autoUpdater), 2000);
}
if (process.platform == 'win32') {
createTray()
......
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