mirror of
https://github.com/ajayyy/SponsorBlock.git
synced 2025-12-12 22:47:18 +03:00
Allow importing placeholder chapters without start times
This commit is contained in:
@@ -306,7 +306,8 @@ function messageListener(request: Message, sender: unknown, sendResponse: (respo
|
|||||||
for (const segment of importedSegments) {
|
for (const segment of importedSegments) {
|
||||||
if (!sponsorTimesSubmitting.some(
|
if (!sponsorTimesSubmitting.some(
|
||||||
(s) => Math.abs(s.segment[0] - segment.segment[0]) < 1
|
(s) => Math.abs(s.segment[0] - segment.segment[0]) < 1
|
||||||
&& Math.abs(s.segment[1] - segment.segment[1]) < 1)) {
|
&& Math.abs(s.segment[1] - segment.segment[1]) < 1
|
||||||
|
&& s.description === segment.description)) {
|
||||||
const hasChaptersPermission = (Config.config.showCategoryWithoutPermission
|
const hasChaptersPermission = (Config.config.showCategoryWithoutPermission
|
||||||
|| Config.config.permissions["chapter"]);
|
|| Config.config.permissions["chapter"]);
|
||||||
if (segment.category === "chapter" && (!utils.getCategorySelection("chapter") || !hasChaptersPermission)) {
|
if (segment.category === "chapter" && (!utils.getCategorySelection("chapter") || !hasChaptersPermission)) {
|
||||||
|
|||||||
@@ -34,9 +34,12 @@ function exportTime(segment: SponsorTime): string {
|
|||||||
|
|
||||||
export function importTimes(data: string, videoDuration: number): SponsorTime[] {
|
export function importTimes(data: string, videoDuration: number): SponsorTime[] {
|
||||||
const lines = data.split("\n");
|
const lines = data.split("\n");
|
||||||
|
const timeRegex = /(?:((?:\d+:)?\d+:\d+)+(?:\.\d+)?)|(?:\d+(?=s| second))/g;
|
||||||
|
const anyLineHasTime = lines.some((line) => timeRegex.test(line));
|
||||||
|
|
||||||
const result: SponsorTime[] = [];
|
const result: SponsorTime[] = [];
|
||||||
for (const line of lines) {
|
for (const line of lines) {
|
||||||
const match = line.match(/(?:((?:\d+:)?\d+:\d+)+(?:\.\d+)?)|(?:\d+(?=s| second))/g);
|
const match = line.match(timeRegex);
|
||||||
if (match) {
|
if (match) {
|
||||||
const startTime = getFormattedTimeToSeconds(match[0]);
|
const startTime = getFormattedTimeToSeconds(match[0]);
|
||||||
if (startTime !== null) {
|
if (startTime !== null) {
|
||||||
@@ -71,6 +74,18 @@ export function importTimes(data: string, videoDuration: number): SponsorTime[]
|
|||||||
|
|
||||||
result.push(segment);
|
result.push(segment);
|
||||||
}
|
}
|
||||||
|
} else if (!anyLineHasTime) {
|
||||||
|
// Adding chapters with placeholder times
|
||||||
|
const segment: SponsorTime = {
|
||||||
|
segment: [0, 0],
|
||||||
|
category: "chapter" as Category,
|
||||||
|
actionType: ActionType.Chapter,
|
||||||
|
description: line,
|
||||||
|
source: SponsorSourceType.Local,
|
||||||
|
UUID: generateUserID() as SegmentUUID
|
||||||
|
};
|
||||||
|
|
||||||
|
result.push(segment);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user