From 2d3a9b800f6bba23677178d539bc23c9928392fd Mon Sep 17 00:00:00 2001 From: Renzo Torr- <56176668+geikha@users.noreply.github.com> Date: Tue, 21 May 2024 17:54:41 -0300 Subject: [PATCH 1/2] fix sampler on windows --- packages/sampler/sample-server.mjs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/sampler/sample-server.mjs b/packages/sampler/sample-server.mjs index 827ed050..49392c56 100644 --- a/packages/sampler/sample-server.mjs +++ b/packages/sampler/sample-server.mjs @@ -4,7 +4,7 @@ import cowsay from 'cowsay'; import { createReadStream } from 'fs'; import { readdir } from 'fs/promises'; import http from 'http'; -import { join } from 'path'; +import { join, sep } from 'path'; import os from 'os'; // eslint-disable-next-line @@ -45,16 +45,16 @@ async function getFilesInDirectory(directory) { } async function getBanks(directory) { - // const directory = resolve(__dirname, '.'); let files = await getFilesInDirectory(directory); let banks = {}; - let separator = process.platform === 'win32' ? '\\' : '/'; - files = files.map((url) => { - const [bank] = url.split(separator).slice(-2); + directory = directory.split(sep).join('/'); + files = files.map((path) => path.split(sep).join('/')); + files = files.map((path) => { + const [bank] = path.split('/').slice(-2); banks[bank] = banks[bank] || []; - url = url.replace(directory, ''); - banks[bank].push(url); - return url; + const relativeUrl = path.replace(directory, ''); + banks[bank].push(relativeUrl); + return relativeUrl; }); banks._base = `http://localhost:5432`; return { banks, files }; @@ -75,7 +75,7 @@ const server = http.createServer(async (req, res) => { res.end('File not found'); return; } - const filePath = join(directory, subpath); + const filePath = join(directory, subpath.split('/').join(sep)); const readStream = createReadStream(filePath); readStream.on('error', (err) => { res.statusCode = 500; From b19c737c824f9f2087f4df13a8dc3973812da3f4 Mon Sep 17 00:00:00 2001 From: Felix Roos Date: Wed, 22 May 2024 12:52:15 +0200 Subject: [PATCH 2/2] spare some cycles --- packages/sampler/sample-server.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sampler/sample-server.mjs b/packages/sampler/sample-server.mjs index 49392c56..12520992 100644 --- a/packages/sampler/sample-server.mjs +++ b/packages/sampler/sample-server.mjs @@ -48,8 +48,8 @@ async function getBanks(directory) { let files = await getFilesInDirectory(directory); let banks = {}; directory = directory.split(sep).join('/'); - files = files.map((path) => path.split(sep).join('/')); files = files.map((path) => { + path = path.split(sep).join('/'); const [bank] = path.split('/').slice(-2); banks[bank] = banks[bank] || []; const relativeUrl = path.replace(directory, '');