+
{sortableList.map(({ id, seg }, index) => {
diff --git a/src/ffmpeg.js b/src/ffmpeg.js
index 29f8b672..a7bfc84d 100644
--- a/src/ffmpeg.js
+++ b/src/ffmpeg.js
@@ -5,7 +5,8 @@ import i18n from 'i18next';
import Timecode from 'smpte-timecode';
import { pcmAudioCodecs, getMapStreamsArgs } from './util/streams';
-import { getSuffixedOutPath, isDurationValid, getExtensionForFormat, isWindows, isMac, platform, arch } from './util';
+import { getSuffixedOutPath, getExtensionForFormat, isWindows, isMac, platform, arch } from './util';
+import { isDurationValid } from './segments';
import isDev from './isDev';
diff --git a/src/segments.js b/src/segments.js
index 13d1e9b1..0b4601b4 100644
--- a/src/segments.js
+++ b/src/segments.js
@@ -1,6 +1,9 @@
import { v4 as uuidv4 } from 'uuid';
import sortBy from 'lodash/sortBy';
+
+export const isDurationValid = (duration) => Number.isFinite(duration) && duration > 0;
+
export const createSegment = ({ start, end, name, tags, segColorIndex } = {}) => ({
start,
end,
@@ -22,6 +25,13 @@ export function getSegApparentStart(seg) {
return time !== undefined ? time : 0;
}
+export function getSegApparentEnd(seg, duration) {
+ const time = seg.end;
+ if (time !== undefined) return time;
+ if (isDurationValid(duration)) return duration;
+ return 0; // Haven't gotten duration yet - what do to ¯\_(ツ)_/¯
+}
+
export const getCleanCutSegments = (cs) => cs.map((seg) => ({
start: seg.start,
end: seg.end,
@@ -41,14 +51,59 @@ export const getSegmentTags = (segment) => (segment.tags || {});
export const sortSegments = (segments) => sortBy(segments, 'start');
+// https://stackoverflow.com/a/30472982/6519037
+export function partitionIntoOverlappingRanges(array, getSegmentStart = (seg) => seg.start, getSegmentEnd = (seg) => seg.end) {
+ function getMaxEnd(array2) {
+ // note: this also mutates array2
+ array2.sort((a, b) => {
+ if (getSegmentEnd(a) < getSegmentEnd(b)) return 1;
+ if (getSegmentEnd(a) > getSegmentEnd(b)) return -1;
+ return 0;
+ });
+ return getSegmentEnd(array2[0]);
+ }
+
+ const ret = [];
+ let g = 0;
+ ret[g] = [array[0]];
+
+ for (let i = 1; i < array.length; i += 1) {
+ if (getSegmentStart(array[i]) >= getSegmentStart(array[i - 1]) && getSegmentStart(array[i]) < getMaxEnd(ret[g])) {
+ ret[g].push(array[i]);
+ } else {
+ g += 1;
+ ret[g] = [array[i]];
+ }
+ }
+
+ return ret.filter((group) => group.length > 1).map((group) => sortBy(group, (seg) => getSegmentStart(seg)));
+}
+
+export function combineOverlappingSegments(existingSegments, getSegApparentEnd2) {
+ const partitionedSegments = partitionIntoOverlappingRanges(existingSegments, getSegApparentStart, getSegApparentEnd2);
+
+ return existingSegments.map((existingSegment) => {
+ const partOfPartition = partitionedSegments.find((partition) => partition.includes(existingSegment));
+ if (partOfPartition == null) return existingSegment; // this is not an overlapping segment, pass it through
+
+ const index = partOfPartition.indexOf(existingSegment);
+ // The first segment is the one with the lowest "start" value, so we use its start value
+ if (index === 0) {
+ return {
+ ...existingSegment,
+ // but use the segment with the highest "end" value as the end value.
+ end: sortBy(partOfPartition, (segment) => segment.end)[partOfPartition.length - 1].end,
+ };
+ }
+ return undefined; // then remove all other segments in this partition group
+ }).filter((segment) => segment);
+}
+
export function hasAnySegmentOverlap(sortedSegments) {
if (sortedSegments.length < 1) return false;
- return sortedSegments.some((cutSegment, i) => {
- if (i === 0) return false;
- const previousSeg = sortedSegments[i - 1];
- return previousSeg.end > cutSegment.start;
- });
+ const overlappingGroups = partitionIntoOverlappingRanges(sortedSegments);
+ return overlappingGroups.length > 0;
}
export function invertSegments(sortedCutSegments, includeFirstSegment, includeLastSegment, duration) {
diff --git a/src/segments.test.js b/src/segments.test.js
index fa52de75..f80c613e 100644
--- a/src/segments.test.js
+++ b/src/segments.test.js
@@ -1,4 +1,4 @@
-import { convertSegmentsToChapters } from './segments';
+import { convertSegmentsToChapters, partitionIntoOverlappingRanges, getSegApparentStart, getSegApparentEnd } from './segments';
it('converts segments to chapters with gaps', () => {
expect(convertSegmentsToChapters([
@@ -49,3 +49,61 @@ it('converts segments to chapters with single long segment', () => {
},
])).toMatchSnapshot();
});
+
+it('detects overlapping segments', () => {
+ expect(partitionIntoOverlappingRanges([
+ { start: 0, end: 1 },
+ ])).toEqual([]);
+
+ expect(partitionIntoOverlappingRanges([
+ { start: 0, end: 1 },
+ { start: 1, end: 2 },
+ ])).toEqual([]);
+
+ expect(partitionIntoOverlappingRanges([
+ { start: 0, end: 1 },
+ { start: 0.5, end: 2 },
+ { start: 2, end: 3 },
+ ])).toEqual([
+ [
+ { start: 0, end: 1 },
+ { start: 0.5, end: 2 },
+ ],
+ ]);
+
+ expect(partitionIntoOverlappingRanges([
+ { start: 0, end: 2 },
+ { start: 0.5, end: 1 },
+ ])).toEqual([
+ [
+ { start: 0, end: 2 },
+ { start: 0.5, end: 1 },
+ ],
+ ]);
+
+ expect(partitionIntoOverlappingRanges([
+ { start: 9, end: 10.50 },
+ { start: 11, end: 12 },
+ { start: 11.5, end: 12.5 },
+ { start: 11.5, end: 13 },
+ { start: 15, end: 17 },
+ { start: 17, end: 20 },
+ { start: 17.5, end: 18.5 },
+ { start: 18, end: 19.5 },
+ { start: 19, end: 19.5 },
+ { start: 19.5, end: 22 },
+ { start: 22, end: 25 },
+ ])).toEqual([
+ [{ start: 11, end: 12 }, { start: 11.5, end: 13 }, { start: 11.5, end: 12.5 }],
+ [{ start: 17, end: 20 }, { start: 17.5, end: 18.5 }, { start: 18, end: 19.5 }, { start: 19, end: 19.5 }, { start: 19.5, end: 22 }],
+ ]);
+});
+
+it('detects overlapping segments, undefined end', () => {
+ expect(partitionIntoOverlappingRanges([
+ { start: 1, end: undefined },
+ { start: 1.5, end: undefined },
+ ], getSegApparentStart, (seg) => getSegApparentEnd(seg, 2))).toEqual([
+ [{ start: 1, end: undefined }, { start: 1.5, end: undefined }],
+ ]);
+});
diff --git a/src/util.js b/src/util.js
index bbbba28c..8ac3a5df 100644
--- a/src/util.js
+++ b/src/util.js
@@ -156,8 +156,6 @@ export const isMasBuild = window.process.mas;
export const isWindowsStoreBuild = window.process.windowsStore;
export const isStoreBuild = isMasBuild || isWindowsStoreBuild;
-export const isDurationValid = (duration) => Number.isFinite(duration) && duration > 0;
-
export const platform = os.platform();
export const arch = os.arch();