fix: conflict

master
kunkka 4 years ago
commit 71ee186d83

@ -10,11 +10,11 @@
"electron:serve": "vue-cli-service electron:serve", "electron:serve": "vue-cli-service electron:serve",
"postinstall": "electron-builder install-app-deps", "postinstall": "electron-builder install-app-deps",
"postuninstall": "electron-builder install-app-deps", "postuninstall": "electron-builder install-app-deps",
"prettier": "npx prettier --write ./src", "prettier": "npx prettier --write ./src ./script",
"napi_run": "cd ./NeteaseCloudMusicApi-master && npm run start", "napi:run": "cd ./NeteaseCloudMusicApi-master && npm run start",
"napi_pull": "node script/setup.js v3.45.1", "napi:pull": "node script/pull.js",
"napi_install": "cd ./NeteaseCloudMusicApi-master && npm install", "napi:install": "cd ./NeteaseCloudMusicApi-master && npm install",
"setup": "npm run napi_pull && npm run napi_install" "napi:setup": "npm run napi:pull && npm run napi:install"
}, },
"main": "background.js", "main": "background.js",
"dependencies": { "dependencies": {

@ -49,7 +49,11 @@ async function download(options, fileName, callback) {
res.on("data", (chunk) => { res.on("data", (chunk) => {
if (len) { if (len) {
cur += chunk.length; cur += chunk.length;
console.log(`Downloading ${fix2((100.0 * cur) / len)}% ${fix2(cur / MEGA)}/${fix2(total)}mb`); console.log(
`Downloading ${fix2((100.0 * cur) / len)}% ${fix2(
cur / MEGA
)}/${fix2(total)}mb`
);
} }
}); });
res.on("end", () => { res.on("end", () => {
@ -93,7 +97,7 @@ async function unzip(source, target) {
download(options, fileName, (text) => { download(options, fileName, (text) => {
console.log(text); console.log(text);
}).then((path) => { }).then((path) => {
console.log(path) console.log(path);
// Unzip process // Unzip process
return unzip(path, dest); return unzip(path, dest);
}); });
Loading…
Cancel
Save