Skip to content

Commit

Permalink
Fix beatmap encoding async queue
Browse files Browse the repository at this point in the history
  • Loading branch information
@Sebola3461
Sebola3461 committed Dec 28, 2023
1 parent 1c23182 commit a15ee5c
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 57 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ temp/debloater/*.mp3
temp/spectro/audio/*.wav
temp/spectro/images/*.png
beatmapsets
temp/ratechange/
18 changes: 5 additions & 13 deletions modules/osu/ratechanger/BeatmapRateChanger.ts
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
import { randomBytes } from "crypto";
import {
createWriteStream,
existsSync,
mkdirSync,
readFileSync,
readdirSync,
rename,
statSync,
writeFileSync,
} from "fs";
import { createWriteStream, existsSync, mkdirSync } from "fs";
import {
Beatmap,
ControlPoint,
Expand Down Expand Up @@ -70,9 +61,9 @@ export class BeatmapRateChanger {
.replace(/\\/g, " ")
.replace(/\//g, "");

encoder.encodeToPath(path.join(this.tempPath, output), this.beatmap);

resolve(this.fileHash);
encoder
.encodeToPath(path.join(this.tempPath, output), this.beatmap)
.then(() => resolve(this.fileHash));
})
.catch(reject);
});
Expand Down Expand Up @@ -129,6 +120,7 @@ export class BeatmapRateChanger {
this.beatmap.metadata.version = `${this.beatmap.metadata.version} ${this.rate}x`;
this.beatmap.general.audioFilename = `(${this.rate}x) ${this.beatmap.general.audioFilename}`;
this.beatmap.general.previewTime = Math.round(this.beatmap.general.previewTime / this.rate);
this.beatmap.metadata.beatmapId = -1;
this.beatmap.metadata.tags.push("axerbot");
}

Expand Down
12 changes: 6 additions & 6 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@
"mp3-cutter": "^1.0.6",
"node-cron": "^3.0.2",
"osu-beatmapset-downloader": "^1.1.2",
"osu-catch-stable": "^3.2.1",
"osu-classes": "^2.2.0",
"osu-catch-stable": "^4.0.0",
"osu-classes": "^3.0.1",
"osu-downloader": "^0.8.1",
"osu-mania-stable": "^4.0.2",
"osu-parsers": "^3.3.3",
"osu-standard-stable": "^4.0.4",
"osu-taiko-stable": "^4.0.3",
"osu-mania-stable": "^5.0.0",
"osu-parsers": "^4.1.6",
"osu-standard-stable": "^5.0.0",
"osu-taiko-stable": "^5.0.0",
"osureplayparser": "^1.0.1",
"ow": "^0.27.0",
"owoify-js": "^1.0.7",
Expand Down
67 changes: 29 additions & 38 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1265,14 +1265,6 @@ buffer@^5.2.0, buffer@^5.6.0:
base64-js "^1.3.1"
ieee754 "^1.1.13"

buffer@^6.0.3:
version "6.0.3"
resolved "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz"
integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==
dependencies:
base64-js "^1.3.1"
ieee754 "^1.2.1"

busboy@^1.6.0:
version "1.6.0"
resolved "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz"
Expand Down Expand Up @@ -3231,10 +3223,10 @@ lru-cache@^6.0.0:
dependencies:
yallist "^4.0.0"

lzma-js-simple-v2@^1.2.1:
version "1.2.1"
resolved "https://registry.npmjs.org/lzma-js-simple-v2/-/lzma-js-simple-v2-1.2.1.tgz"
integrity sha512-sc9dskNREbNEaxRumUv1R4j4JT8IPcR6fQwl3sep1shwu+znZpzZGsFdChdK7OJdGzyw0JQCz+shN0WtV5pOhw==
lzma-js-simple-v2@^1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/lzma-js-simple-v2/-/lzma-js-simple-v2-1.2.2.tgz#5d2e2ccf72e04c6cf9fe8ac7fe2c475dff682d2c"
integrity sha512-dHjXHlgcS8r2K+4t8kAycGE4xMVQxPzMTCrrYhaFEtQDmjXh/A7xq4D88oOfEtjTR9XFzTAML9AuBrm4jXLigA==

lzma@^2.3.2:
version "2.3.2"
Expand Down Expand Up @@ -3643,15 +3635,15 @@ osu-beatmapset-downloader@^1.1.2:
dependencies:
node-fetch "^2.6.1"

osu-catch-stable@^3.2.1:
version "3.2.1"
resolved "https://registry.npmjs.org/osu-catch-stable/-/osu-catch-stable-3.2.1.tgz"
integrity sha512-UDdsm66noKt+xtR4AGq5LsdDhNvi7oUgG8DT6Xqy+cMMnNzUX1WUoA/FYCOp5Ssjg79axnqycvl+lm20jTr20w==
osu-catch-stable@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/osu-catch-stable/-/osu-catch-stable-4.0.0.tgz#60a5b150840a9d4efe53b230a92945e43ac13908"
integrity sha512-qOayn6WifpZ7+mT4qj6gCgGmbOxx5/PVL/NIm6NsZ86O6O0qH+6R+ytSV2TtB4RXklBYKP/nK2dTdS9kSbXznQ==

osu-classes@^2.2.0:
version "2.2.0"
resolved "https://registry.npmjs.org/osu-classes/-/osu-classes-2.2.0.tgz"
integrity sha512-AhZr4QvW12rkxv2+P6NPUOR5Kmp9gWjAYpKVN1hnOBmM7/XYQZr3/zgwZnV3oGYzoLiJfUlwiec7iTHQu9WUkg==
osu-classes@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/osu-classes/-/osu-classes-3.0.1.tgz#561a87a97f58b296a4c0ee5bb1bd8c284c402f5f"
integrity sha512-EI0pMoyUAgrvGHeOywaglHaGpjxhCHtwxPsK7kKJMDGmSgT8lvD3Ebs7vkSNPcKAuBX0VMbfsnSrwE9ArkOXyw==

osu-downloader@^0.8.1:
version "0.8.1"
Expand All @@ -3662,28 +3654,27 @@ osu-downloader@^0.8.1:
bottleneck "^2.19.5"
spark-md5 "^3.0.2"

osu-mania-stable@^4.0.2:
version "4.0.2"
resolved "https://registry.npmjs.org/osu-mania-stable/-/osu-mania-stable-4.0.2.tgz"
integrity sha512-wWKTwnrPOTA+lrsF1rAz7k3bRXRXd6scM2bMNoV95o+nm63caN71FAQGxbxVnzJ1ci9gNdiohFLuozbk0++8qg==
osu-mania-stable@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/osu-mania-stable/-/osu-mania-stable-5.0.0.tgz#ddc5103743e5082326e9bb6d97b2add553b98b90"
integrity sha512-9UYjgZ2YYBFgVxNDON1rSXQO7KQ5DMuJxRsavDRLKFsoE7foHHc4y1AUBgOH0u6vuGVDOleBXhvvGjwsHAibjw==

osu-parsers@^3.3.3:
version "3.3.3"
resolved "https://registry.npmjs.org/osu-parsers/-/osu-parsers-3.3.3.tgz"
integrity sha512-AuCnf27FWlV+IPUSrFzVpijebgb2pxaeIaw310dYCEZn9wZjdmMLzGSMnBOVfiypOok/OD+f2D+u9FuJB/VAOA==
osu-parsers@^4.1.6:
version "4.1.6"
resolved "https://registry.yarnpkg.com/osu-parsers/-/osu-parsers-4.1.6.tgz#b53f1064cf142bcfb102b80b4c4787c3cd81352f"
integrity sha512-k0PQaWBEZEMiweminI/A4j0lLTvsbHvhU/McMI94yJy+ME1ZfggAOp3vVee1P0Ze0Nu+pT/Ir7b0AlrhJO9IsQ==
dependencies:
buffer "^6.0.3"
lzma-js-simple-v2 "^1.2.1"
lzma-js-simple-v2 "^1.2.2"

osu-standard-stable@^4.0.4:
version "4.0.4"
resolved "https://registry.yarnpkg.com/osu-standard-stable/-/osu-standard-stable-4.0.4.tgz#eaf30e4d3441d552549b88bf4742286c12cc923d"
integrity sha512-Rb1aJTViU+ZFMe197aKlYhjMThuQ/jPHF9+KybKvElLY10/+nDgbD+lyVw2fp/4G/IgI3ghxSuD4nakgrLLGaA==
osu-standard-stable@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/osu-standard-stable/-/osu-standard-stable-5.0.0.tgz#dc82e0d4224c13d05effaa64904f4d34d8b0e9c6"
integrity sha512-qCzS1DFStHjgeDZguLRY5k4OgJSNXHG+sUdi1jm2Xwgk23QsyexwRQyTs5phFMuAnQmxeyjzWELLHOo99A/gMA==

osu-taiko-stable@^4.0.3:
version "4.0.3"
resolved "https://registry.npmjs.org/osu-taiko-stable/-/osu-taiko-stable-4.0.3.tgz"
integrity sha512-cG5N6TyEnuwT/D0ZuPpH/dCw9Dhcje2FI/QWzun/VTBJYuJHJvYMBdUhi3N8B51u6snsh0TkkPZ54q+ybtmj1A==
osu-taiko-stable@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/osu-taiko-stable/-/osu-taiko-stable-5.0.0.tgz#f3db101721923b5601e82b2032f0e5a56659365b"
integrity sha512-zvkFfAysl2BOSTTRN7sNtA590I+1hRYhEnArvQrUOWU94UTeyCLgh2yvlYXqVXeIQlhVDcrSxT8JR9RnGk3voA==

osureplayparser@^1.0.1:
version "1.0.1"
Expand Down

0 comments on commit a15ee5c

Please sign in to comment.