The swiss army knife of lossless video/audio editing
implement label selected segments #993
Mikael Finstad2eb9565db0bd
diff --git a/src/App.jsx b/src/App.jsxindex f2ae07df..0dcd68fc 100644--- a/src/App.jsx+++ b/src/App.jsx@@ -424,12 +424,6 @@ const App = memo(() => {const maxLabelLength = safeOutputFileName ? 100 : 500;- const onLabelSegmentPress = useCallback(async (index) => {- const { name } = cutSegments[index];- const value = await labelSegmentDialog({ currentName: name, maxLength: maxLabelLength });- if (value != null) updateSegAtIndex(index, { name: value });- }, [cutSegments, updateSegAtIndex, maxLabelLength]);-const onSelectSegmentsByLabel = useCallback(async () => {const { name } = currentCutSeg;const value = await selectSegmentsByLabelDialog(name);@@ -443,7 +437,7 @@ const App = memo(() => {});}, [currentCutSeg, cutSegments]);- const onViewSegmentTagsPress = useCallback(async (index) => {+ const onViewSegmentTags = useCallback(async (index) => {const segment = cutSegments[index];function inputValidator(jsonStr) {try {@@ -1174,6 +1168,22 @@ const App = memo(() => {const filenamifyOrNot = useCallback((name) => (safeOutputFileName ? filenamify(name) : name).substr(0, maxLabelLength), [safeOutputFileName, maxLabelLength]);+ const onLabelSegment = useCallback(async (index) => {+ const { name } = cutSegments[index];+ const value = await labelSegmentDialog({ currentName: name, maxLength: maxLabelLength });+ if (value != null) updateSegAtIndex(index, { name: value });+ }, [cutSegments, updateSegAtIndex, maxLabelLength]);++ const onLabelSelectedSegments = useCallback(async () => {+ if (selectedSegmentsRaw.length < 1) return;+ const { name } = selectedSegmentsRaw[0];+ const value = await labelSegmentDialog({ currentName: name, maxLength: maxLabelLength });+ setCutSegments((existingSegments) => existingSegments.map((existingSegment) => {+ if (selectedSegmentsRaw.some((seg) => seg.segId === existingSegment.segId)) return { ...existingSegment, name: value };+ return existingSegment;+ }));+ }, [maxLabelLength, selectedSegmentsRaw, setCutSegments]);+const segmentsToExport = useMemo(() => {if (!segmentsToChaptersOnly) return selectedSegments;// segmentsToChaptersOnly is a special mode where all segments will be simply written out as chapters to one file: https://github.com/mifi/lossless-cut/issues/993#issuecomment-1037927595@@ -1864,7 +1874,7 @@ const App = memo(() => {removeCurrentSegment: () => removeCutSegment(currentSegIndexSafe),undo: () => cutSegmentsHistory.back(),redo: () => cutSegmentsHistory.forward(),- labelCurrentSegment: () => { onLabelSegmentPress(currentSegIndexSafe); return false; },+ labelCurrentSegment: () => { onLabelSegment(currentSegIndexSafe); return false; },addSegment,toggleHelp: () => { toggleHelp(); return false; },export: onExportPress,@@ -1935,7 +1945,7 @@ const App = memo(() => {if (match) return bubble;return true; // bubble the event- }, [addSegment, askSetStartTimeOffset, batchFileJump, batchOpenSelectedFile, captureSnapshot, changePlaybackRate, cleanupFilesDialog, clearSegments, closeBatch, closeExportConfirm, concatCurrentBatch, concatDialogVisible, convertFormatBatch, createFixedDurationSegments, createNumSegments, currentSegIndexSafe, cutSegmentsHistory, deselectAllSegments, exportConfirmVisible, extractAllStreams, extractCurrentSegmentFramesAsImages, fillSegmentsGaps, goToTimecode, increaseRotation, invertAllSegments, jumpCutEnd, jumpCutStart, jumpSeg, jumpTimelineEnd, jumpTimelineStart, keyboardNormalSeekSpeed, keyboardSeekAccFactor, keyboardShortcutsVisible, onExportConfirm, onExportPress, onLabelSegmentPress, pause, play, removeCutSegment, removeSelectedSegments, reorderSegsByStartTime, seekClosestKeyframe, seekRel, seekRelPercent, selectAllSegments, selectOnlyCurrentSegment, setCutEnd, setCutStart, setPlaybackVolume, shortStep, shuffleSegments, splitCurrentSegment, timelineToggleComfortZoom, toggleCaptureFormat, toggleCurrentSegmentSelected, toggleHelp, toggleKeyboardShortcuts, toggleKeyframeCut, togglePlay, toggleSegmentsList, toggleStreamsSelector, toggleStripAudio, tryFixInvalidDuration, userHtml5ifyCurrentFile, zoomRel]);+ }, [addSegment, askSetStartTimeOffset, batchFileJump, batchOpenSelectedFile, captureSnapshot, changePlaybackRate, cleanupFilesDialog, clearSegments, closeBatch, closeExportConfirm, concatCurrentBatch, concatDialogVisible, convertFormatBatch, createFixedDurationSegments, createNumSegments, currentSegIndexSafe, cutSegmentsHistory, deselectAllSegments, exportConfirmVisible, extractAllStreams, extractCurrentSegmentFramesAsImages, fillSegmentsGaps, goToTimecode, increaseRotation, invertAllSegments, jumpCutEnd, jumpCutStart, jumpSeg, jumpTimelineEnd, jumpTimelineStart, keyboardNormalSeekSpeed, keyboardSeekAccFactor, keyboardShortcutsVisible, onExportConfirm, onExportPress, onLabelSegment, pause, play, removeCutSegment, removeSelectedSegments, reorderSegsByStartTime, seekClosestKeyframe, seekRel, seekRelPercent, selectAllSegments, selectOnlyCurrentSegment, setCutEnd, setCutStart, setPlaybackVolume, shortStep, shuffleSegments, splitCurrentSegment, timelineToggleComfortZoom, toggleCaptureFormat, toggleCurrentSegmentSelected, toggleHelp, toggleKeyboardShortcuts, toggleKeyframeCut, togglePlay, toggleSegmentsList, toggleStreamsSelector, toggleStripAudio, tryFixInvalidDuration, userHtml5ifyCurrentFile, zoomRel]);useKeyboard({ keyBindings, onKeyPress });@@ -2350,12 +2360,12 @@ const App = memo(() => {onSegClick={setCurrentSegIndex}updateSegOrder={updateSegOrder}updateSegOrders={updateSegOrders}- onLabelSegmentPress={onLabelSegmentPress}+ onLabelSegment={onLabelSegment}currentCutSeg={currentCutSeg}segmentAtCursor={segmentAtCursor}addSegment={addSegment}removeCutSegment={removeCutSegment}- onRemoveSelectedPress={removeSelectedSegments}+ onRemoveSelected={removeSelectedSegments}toggleSegmentsList={toggleSegmentsList}splitCurrentSegment={splitCurrentSegment}selectedSegmentsRaw={selectedSegmentsRaw}@@ -2367,8 +2377,9 @@ const App = memo(() => {onExtractSegmentFramesAsImages={extractSegmentFramesAsImages}jumpSegStart={jumpSegStart}jumpSegEnd={jumpSegEnd}- onViewSegmentTagsPress={onViewSegmentTagsPress}+ onViewSegmentTags={onViewSegmentTags}onSelectSegmentsByLabel={onSelectSegmentsByLabel}+ onLabelSelectedSegments={onLabelSelectedSegments}/>)}</AnimatePresence>diff --git a/src/SegmentList.jsx b/src/SegmentList.jsxindex 16d8eec9..a4ab4ec7 100644--- a/src/SegmentList.jsx+++ b/src/SegmentList.jsx@@ -21,7 +21,7 @@ const buttonBaseStyle = {const neutralButtonColor = 'rgba(255, 255, 255, 0.2)';-const Segment = memo(({ seg, index, currentSegIndex, formatTimecode, getFrameCount, updateOrder, invertCutSegments, onClick, onRemovePress, onRemoveSelectedPress, onReorderPress, onLabelPress, enabled, onSelectSingleSegment, onToggleSegmentSelected, onDeselectAllSegments, onSelectSegmentsByLabel, onSelectAllSegments, jumpSegStart, jumpSegEnd, addSegment, onViewSegmentTagsPress, onExtractSegmentFramesAsImages }) => {+const Segment = memo(({ seg, index, currentSegIndex, formatTimecode, getFrameCount, updateOrder, invertCutSegments, onClick, onRemovePress, onRemoveSelected, onLabelSelectedSegments, onReorderPress, onLabelPress, enabled, onSelectSingleSegment, onToggleSegmentSelected, onDeselectAllSegments, onSelectSegmentsByLabel, onSelectAllSegments, jumpSegStart, jumpSegEnd, addSegment, onViewSegmentTags, onExtractSegmentFramesAsImages }) => {const { t } = useTranslation();const ref = useRef();@@ -37,13 +37,6 @@ const Segment = memo(({ seg, index, currentSegIndex, formatTimecode, getFrameCou{ label: t('Add segment'), click: addSegment },{ label: t('Label segment'), click: onLabelPress },{ label: t('Remove segment'), click: onRemovePress },- { label: t('Remove selected segments'), click: onRemoveSelectedPress },-- { type: 'separator' },-- { label: t('Change segment order'), click: onReorderPress },- { label: t('Increase segment order'), click: () => updateOrder(1) },- { label: t('Decrease segment order'), click: () => updateOrder(-1) },{ type: 'separator' },@@ -54,10 +47,21 @@ const Segment = memo(({ seg, index, currentSegIndex, formatTimecode, getFrameCou{ type: 'separator' },- { label: t('Segment tags'), click: () => onViewSegmentTagsPress(index) },+ { label: t('Label selected segments'), click: onLabelSelectedSegments },+ { label: t('Remove selected segments'), click: onRemoveSelected },++ { type: 'separator' },++ { label: t('Change segment order'), click: onReorderPress },+ { label: t('Increase segment order'), click: () => updateOrder(1) },+ { label: t('Decrease segment order'), click: () => updateOrder(-1) },++ { type: 'separator' },++ { label: t('Segment tags'), click: () => onViewSegmentTags(index) },{ label: t('Extract all frames as images'), click: () => onExtractSegmentFramesAsImages(index) },];- }, [invertCutSegments, t, jumpSegStart, jumpSegEnd, addSegment, onLabelPress, onRemovePress, onRemoveSelectedPress, onReorderPress, updateOrder, onSelectSingleSegment, seg, onSelectAllSegments, onDeselectAllSegments, onSelectSegmentsByLabel, onViewSegmentTagsPress, index, onExtractSegmentFramesAsImages]);+ }, [invertCutSegments, t, jumpSegStart, jumpSegEnd, addSegment, onLabelPress, onRemovePress, onReorderPress, onRemoveSelected, onLabelSelectedSegments, updateOrder, onSelectSingleSegment, seg, onSelectAllSegments, onDeselectAllSegments, onSelectSegmentsByLabel, onViewSegmentTags, index, onExtractSegmentFramesAsImages]);useContextMenu(ref, contextMenuTemplate);@@ -136,10 +140,10 @@ const Segment = memo(({ seg, index, currentSegIndex, formatTimecode, getFrameCouconst SegmentList = memo(({width, formatTimecode, apparentCutSegments, inverseCutSegments, getFrameCount, onSegClick,currentSegIndex,- updateSegOrder, updateSegOrders, addSegment, removeCutSegment, onRemoveSelectedPress,- onLabelSegmentPress, currentCutSeg, segmentAtCursor, toggleSegmentsList, splitCurrentSegment,- selectedSegments, selectedSegmentsRaw, onSelectSingleSegment, onToggleSegmentSelected, onDeselectAllSegments, onSelectAllSegments, onSelectSegmentsByLabel, onExtractSegmentFramesAsImages,- jumpSegStart, jumpSegEnd, onViewSegmentTagsPress,+ updateSegOrder, updateSegOrders, addSegment, removeCutSegment, onRemoveSelected,+ onLabelSegment, currentCutSeg, segmentAtCursor, toggleSegmentsList, splitCurrentSegment,+ selectedSegments, selectedSegmentsRaw, onSelectSingleSegment, onToggleSegmentSelected, onDeselectAllSegments, onSelectAllSegments, onSelectSegmentsByLabel, onExtractSegmentFramesAsImages, onLabelSelectedSegments,+ jumpSegStart, jumpSegEnd, onViewSegmentTags,}) => {const { t } = useTranslation();@@ -160,7 +164,7 @@ const SegmentList = memo(({else headerText = t('No segments to export.');}- async function onReorderSegsPress(index) {+ async function onReorderSegs(index) {if (apparentCutSegments.length < 2) return;const { value } = await Swal.fire({title: `${t('Change order of segment')} ${index + 1}`,@@ -212,7 +216,7 @@ const SegmentList = memo(({title={t('Change segment order')}role="button"style={{ ...buttonBaseStyle, padding: 4, background: currentSegColor }}- onClick={() => onReorderSegsPress(currentSegIndex)}+ onClick={() => onReorderSegs(currentSegIndex)}/><FaTag@@ -220,7 +224,7 @@ const SegmentList = memo(({title={t('Label segment')}role="button"style={{ ...buttonBaseStyle, padding: 4, background: currentSegColor }}- onClick={() => onLabelSegmentPress(currentSegIndex)}+ onClick={() => onLabelSegment(currentSegIndex)}/></>)}@@ -274,10 +278,10 @@ const SegmentList = memo(({enabled={enabled}onClick={onSegClick}addSegment={addSegment}- onRemoveSelectedPress={onRemoveSelectedPress}+ onRemoveSelected={onRemoveSelected}onRemovePress={() => removeCutSegment(index)}- onReorderPress={() => onReorderSegsPress(index)}- onLabelPress={() => onLabelSegmentPress(index)}+ onReorderPress={() => onReorderSegs(index)}+ onLabelPress={() => onLabelSegment(index)}jumpSegStart={() => jumpSegStart(index)}jumpSegEnd={() => jumpSegEnd(index)}updateOrder={(dir) => updateSegOrder(index, index + dir)}@@ -289,9 +293,10 @@ const SegmentList = memo(({onToggleSegmentSelected={onToggleSegmentSelected}onDeselectAllSegments={onDeselectAllSegments}onSelectAllSegments={onSelectAllSegments}- onViewSegmentTagsPress={onViewSegmentTagsPress}+ onViewSegmentTags={onViewSegmentTags}onSelectSegmentsByLabel={onSelectSegmentsByLabel}onExtractSegmentFramesAsImages={onExtractSegmentFramesAsImages}+ onLabelSelectedSegments={onLabelSelectedSegments}/>);})}