reidlab/amdl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't flush album data all at once

Browse source
This commit is contained in:
Reid 2026-03-24 15:09:47 -07:00
parent fa3e91663d
commit d9216fe8ce
Signed by: reidlab
GPG key ID: DAF5EAF6665839FD
2 changed files with 14 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/web/endpoints/back/download.ts
View file

@ -60,9 +60,11 @@ router.get(path, async (req, res, next) => {
// TODO: stream to user
const filePath = await downloadSongFile(streamInfo.streamUrl, decryptionKey, codecType.codecType, trackMetadata);
const fileExt = "." + filePath.split(".").at(-1) as string; // safe cast, filePath is always a valid path
const fileName = formatSongForFs(trackAttributes) + fileExt;
const fileName = formatSongForFs(trackAttributes) + fileExt;
res.attachment(fileName);
res.flushHeaders();
res.sendFile(filePath, { root: "." });
} catch (err) {
next(err);

35
src/web/endpoints/back/downloadAlbum.ts
View file

@ -32,22 +32,24 @@ paths[path] = {
}
};
interface AlbumEntry {
path: string;
name: string;
}
// TODO: include album art?
router.get(path, async (req, res, next) => {
try {
const { id, codec } = (await validate(req, schema)).query;
const files: AlbumEntry[] = [];
const albumMetadata = await appleMusicApi.getAlbum(id);
const albumAttributes = albumMetadata.data[0].attributes;
const tracks = albumMetadata.data[0].relationships.tracks.data;
const fileName = formatAlbumForFs(albumAttributes) + ".zip";
res.attachment(fileName);
res.flushHeaders();
const zipArchiver = archiver("zip");
zipArchiver.pipe(res);
zipArchiver.on("error", (err) => { throw err; });
zipArchiver.on("warning", (err) => { throw err; });
for (const track of tracks) {
const trackId = track.attributes.playParams?.id;
if (trackId === undefined) { throw new Error("track id gone, this may indicate your song isn't accessable w/ your subscription!"); }
@ -75,28 +77,13 @@ router.get(path, async (req, res, next) => {
const fileExt = "." + filePath.split(".").at(-1) as string; // safe cast, filePath is always a valid path
const fileName = formatSongForFs(trackAttributes) + fileExt;
files.push({
path: filePath,
name: fileName
});
}
const fileName = formatAlbumForFs(albumAttributes) + ".zip";
const zipArchiver = archiver("zip");
zipArchiver.on("error", (err) => { throw err; });
zipArchiver.pipe(res);
for (const file of files) {
zipArchiver.file(file.path, { name: file.name });
zipArchiver.file(filePath, { name: fileName });
}
const albumCover = await downloadAlbumCover(albumAttributes);
const albumCoverExt = albumCover.slice(albumCover.lastIndexOf(".") + 1);
zipArchiver.file(await downloadAlbumCover(albumAttributes), { name: `cover.${albumCoverExt}` });
zipArchiver.file(albumCover, { name: `cover.${albumCoverExt}` });
zipArchiver.finalize();
res.attachment(fileName);
} catch (err) {
next(err);
}