Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add support for timestamp csv import #1755

Merged
merged 2 commits into from
Dec 2, 2023
Merged

add support for timestamp csv import #1755

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3f723c
add support for timestamp csv import
danielbaak Oct 21, 2023
6283858
Update public/menu.js
mifi Dec 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion public/menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ module.exports = ({ app, mainWindow, newVersion, isStoreBuild }) => {
label: esc(t('Import project')),
submenu: [
{
label: esc(t('Times in seconds (CSV)')),
label: esc(t('Times in seconds / Timestamps (CSV)')),
mifi marked this conversation as resolved.
Show resolved Hide resolved
mifi marked this conversation as resolved.
Show resolved Hide resolved
click() {
mainWindow.webContents.send('importEdlFile', 'csv');
},
Expand Down
9 changes: 8 additions & 1 deletion src/edlFormats.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,14 @@ export async function parseCsv(csvStr, processTime = (t) => t) {

function parseTimeVal(str) {
if (str === '') return undefined;
const parsed = parseFloat(str, 10);
let timestampMatch = str.match(/^(\d{1,2}):(\d{1,2}):(\d{1,2})(?:\.(\d{1,3}))?$/);
let parsed = undefined;
if (timestampMatch && timestampMatch.length === 5) {
let [, h, m, s, ms] = timestampMatch;
parsed = parseInt(h, 10) * 60 + parseInt(m, 10) * 60 + parseInt(s, 10) + parseInt(ms, 10) / 1000;
} else {
parsed = parseFloat(str, 10);
}
return processTime(parsed);
}
const mapped = rows
Expand Down
22 changes: 21 additions & 1 deletion src/edlFormats.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { fileURLToPath } from 'url';
import { it, describe, expect } from 'vitest';


import { parseYouTube, formatYouTube, parseMplayerEdl, parseXmeml, parseFcpXml, parseCsv, getTimeFromFrameNum, formatCsvFrames, getFrameCountRaw, parsePbf, parseDvAnalyzerSummaryTxt } from './edlFormats';
import { parseYouTube, formatYouTube, parseMplayerEdl, parseXmeml, parseFcpXml, parseCsv, getTimeFromFrameNum, formatCsvFrames, formatCsvHuman, getFrameCountRaw, parsePbf, parseDvAnalyzerSummaryTxt } from './edlFormats';

// eslint-disable-next-line no-underscore-dangle
const __dirname = dirname(fileURLToPath(import.meta.url));
Expand Down Expand Up @@ -211,6 +211,26 @@ it('parses csv with frames', async () => {
expect(formatted).toEqual(csvFramesStr);
});

const csvTimestampStr = `\
00:01:54.612,00:03:09.053,A
00:05:00.448,00:07:56.194,B
00:09:27.075,00:11:44.264,C
`;

it('parses csv with timestamps', async () => {
const fps = 30;
const parsed = await parseCsv(csvTimestampStr);

expect(parsed).toEqual([
{ end: 189.053, name: 'A', start: 114.612},
{ end: 476.194, name: 'B', start: 300.448},
{ end: 704.264, name: 'C', start: 567.075},
]);

const formatted = await formatCsvHuman(parsed);
expect(formatted).toEqual(csvTimestampStr);
});

it('parses pbf', async () => {
expect(parsePbf(await readFixture('test1.pbf', null))).toMatchSnapshot();
expect(parsePbf(await readFixture('test2.pbf', null))).toMatchSnapshot();
Expand Down