use correct extension for format

pull/276/head
Mikael Finstad 6 years ago
parent 296a3a2ad5
commit dbb58053ed

@ -71,6 +71,15 @@ function isCuttingEnd(cutTo, duration) {
return cutTo < duration; return cutTo < duration;
} }
function getExtensionForFormat(format) {
const ext = {
matroska: 'mkv',
ipod: 'm4a',
}[format];
return ext || format;
}
async function cut({ async function cut({
filePath, outFormat, cutFrom, cutTo, videoDuration, rotation, filePath, outFormat, cutFrom, cutTo, videoDuration, rotation,
onProgress, copyStreamIds, keyframeCut, outPath, onProgress, copyStreamIds, keyframeCut, outPath,
@ -146,7 +155,7 @@ async function cutMultiple({
let i = 0; let i = 0;
// eslint-disable-next-line no-restricted-syntax,no-unused-vars // eslint-disable-next-line no-restricted-syntax,no-unused-vars
for (const { cutFrom, cutTo } of segments) { for (const { cutFrom, cutTo } of segments) {
const ext = isOutFormatUserSelected ? `.${outFormat}` : extname(filePath); const ext = isOutFormatUserSelected ? `.${getExtensionForFormat(outFormat)}` : extname(filePath);
const cutSpecification = `${formatDuration({ seconds: cutFrom, fileNameFriendly: true })}-${formatDuration({ seconds: cutTo, fileNameFriendly: true })}`; const cutSpecification = `${formatDuration({ seconds: cutFrom, fileNameFriendly: true })}-${formatDuration({ seconds: cutTo, fileNameFriendly: true })}`;
const outPath = getOutPath(customOutDir, filePath, `${cutSpecification}${ext}`); const outPath = getOutPath(customOutDir, filePath, `${cutSpecification}${ext}`);
@ -292,15 +301,6 @@ function mapFormat(requestedFormat) {
} }
} }
function getExtensionForFormat(format) {
const ext = {
matroska: 'mkv',
ipod: 'm4a',
}[format];
return ext || format;
}
function determineOutputFormat(ffprobeFormats, ft) { function determineOutputFormat(ffprobeFormats, ft) {
if (ffprobeFormats.includes(ft.ext)) return ft.ext; if (ffprobeFormats.includes(ft.ext)) return ft.ext;
return ffprobeFormats[0] || undefined; return ffprobeFormats[0] || undefined;

Loading…
Cancel
Save