echogarden 0.1.3 → 0.1.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -149,10 +149,7 @@ function buildCommandLineArguments(inputFilename, outputOptions) {
|
|
|
149
149
|
return args;
|
|
150
150
|
}
|
|
151
151
|
async function getExecutablePath() {
|
|
152
|
-
if (
|
|
153
|
-
return "ffmpeg";
|
|
154
|
-
}
|
|
155
|
-
else if (process.platform == "win32") {
|
|
152
|
+
if (process.platform == "win32") {
|
|
156
153
|
const ffmpegPackagePath = await loadPackage("ffmpeg-6.0-essentials-win64");
|
|
157
154
|
return path.join(ffmpegPackagePath, "ffmpeg.exe");
|
|
158
155
|
}
|
|
@@ -164,6 +161,9 @@ async function getExecutablePath() {
|
|
|
164
161
|
const ffmpegPackagePath = await loadPackage("ffmpeg-6.0-linux-amd64");
|
|
165
162
|
return path.join(ffmpegPackagePath, "ffmpeg");
|
|
166
163
|
}
|
|
164
|
+
else if (await commandExists("ffmpeg")) {
|
|
165
|
+
return "ffmpeg";
|
|
166
|
+
}
|
|
167
167
|
return undefined;
|
|
168
168
|
}
|
|
169
169
|
//# sourceMappingURL=FFMpegTranscoder.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FFMpegTranscoder.js","sourceRoot":"","sources":["../../src/codecs/FFMpegTranscoder.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"FFMpegTranscoder.js","sourceRoot":"","sources":["../../src/codecs/FFMpegTranscoder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { request } from "gaxios";
|
|
2
|
-
import { getRandomHexString } from "./Utilities.js";
|
|
2
|
+
import { getRandomHexString, writeToStderr } from "./Utilities.js";
|
|
3
3
|
import { OpenPromise } from "./OpenPromise.js";
|
|
4
4
|
import { Timer } from "./Timer.js";
|
|
5
5
|
import { Logger } from "./Logger.js";
|
|
@@ -25,13 +25,13 @@ export async function downloadAndExtractTarball(options, targetDir, baseTempPath
|
|
|
25
25
|
logger.end();
|
|
26
26
|
}
|
|
27
27
|
export async function downloadFile(options, targetFilePath, prompt = "Downloading") {
|
|
28
|
-
const
|
|
28
|
+
const write = writeToStderr;
|
|
29
29
|
const downloadPromise = new OpenPromise();
|
|
30
30
|
const timer = new Timer();
|
|
31
31
|
options.responseType = 'stream';
|
|
32
32
|
const response = await request(options);
|
|
33
33
|
const ttyOutput = process.stderr.isTTY === true;
|
|
34
|
-
|
|
34
|
+
write(`\n${prompt}.. `);
|
|
35
35
|
const rateAveragingWindowSeconds = 5.0;
|
|
36
36
|
let downloadStarted = false;
|
|
37
37
|
let downloadedBytes = 0;
|
|
@@ -71,8 +71,8 @@ export async function downloadFile(options, targetFilePath, prompt = "Downloadin
|
|
|
71
71
|
newString = `${prompt}.. ${downloadedMbytesStr}MB (${timer.elapsedTimeSeconds.toFixed(1)}s, ${downloadRateStr}MB/s)`;
|
|
72
72
|
}
|
|
73
73
|
if (newString != lastString) {
|
|
74
|
-
|
|
75
|
-
|
|
74
|
+
write('\r');
|
|
75
|
+
write(newString);
|
|
76
76
|
}
|
|
77
77
|
lastString = newString;
|
|
78
78
|
}
|
|
@@ -83,15 +83,15 @@ export async function downloadFile(options, targetFilePath, prompt = "Downloadin
|
|
|
83
83
|
const percent = downloadedBytes / totalBytes;
|
|
84
84
|
const percentDisplay = `${(Math.floor(percent * 10) * 10).toString()}%`;
|
|
85
85
|
if (lastString == prompt) {
|
|
86
|
-
|
|
86
|
+
write(`(${totalMbytesStr}MB): `);
|
|
87
87
|
}
|
|
88
88
|
if (percentDisplay != lastString) {
|
|
89
|
-
|
|
89
|
+
write(percentDisplay);
|
|
90
90
|
if (percent == 1.0) {
|
|
91
|
-
|
|
91
|
+
write(` (${timer.elapsedTimeSeconds.toFixed(2)}s, ${cumulativeDownloadRateStr}MB/s)`);
|
|
92
92
|
}
|
|
93
93
|
else {
|
|
94
|
-
|
|
94
|
+
write(` `);
|
|
95
95
|
}
|
|
96
96
|
lastString = percentDisplay;
|
|
97
97
|
}
|
|
@@ -123,7 +123,7 @@ export async function downloadFile(options, targetFilePath, prompt = "Downloadin
|
|
|
123
123
|
clearInterval(statusInterval);
|
|
124
124
|
updateStatus();
|
|
125
125
|
fileWriteStream.end();
|
|
126
|
-
|
|
126
|
+
write("\n");
|
|
127
127
|
await move(partialFilePath, targetFilePath, { overwrite: true });
|
|
128
128
|
downloadPromise.resolve();
|
|
129
129
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileDownloader.js","sourceRoot":"","sources":["../../src/utilities/FileDownloader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,OAAO,EAAE,MAAM,QAAQ,CAAA;AAE/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"FileDownloader.js","sourceRoot":"","sources":["../../src/utilities/FileDownloader.ts"],"names":[],"mappings":"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"}
|