Mirror/SponsorBlockServer
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlockServer.git synced 2025-12-06 03:26:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Make hasStartSegment result optional

Browse Source
This commit is contained in:
Ajay
2025-01-17 23:59:17 -05:00
parent e2a9976cd0
commit 2455d2cd7e
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/routes/getVideoLabel.ts
View File

@@ -34,7 +34,7 @@ async function getLabelsByVideoID(videoID: VideoID, service: Service): Promise<F
}
}
async function getLabelsByHash(hashedVideoIDPrefix: VideoIDHash, service: Service): Promise<SBRecord<VideoID, FullVideoSegmentVideoData>> {
async function getLabelsByHash(hashedVideoIDPrefix: VideoIDHash, service: Service, checkHasStartSegment: boolean): Promise<SBRecord<VideoID, FullVideoSegmentVideoData>> {
const segments: SBRecord<VideoID, FullVideoSegmentVideoData> = {};
try {
@@ -57,10 +57,10 @@ async function getLabelsByHash(hashedVideoIDPrefix: VideoIDHash, service: Servic
const result = chooseSegment(videoData.segments);
const data: FullVideoSegmentVideoData = {
segments: result.segments,
hasStartSegment: result.hasStartSegment
hasStartSegment: checkHasStartSegment ? result.hasStartSegment : undefined
};
if (data.segments.length > 0 || data.hasStartSegment) {
if (data.segments.length > 0 || (data.hasStartSegment && checkHasStartSegment)) {
segments[videoID] = data;
}
}
@@ -153,7 +153,7 @@ async function handleGetLabel(req: Request, res: Response): Promise<FullVideoSeg
return false;
}
const hasStartSegment = !!req.query.hasStartSegment;
const hasStartSegment = req.query.hasStartSegment === "true";
const service = getService(req.query.service, req.body.service);
const segmentData = await getLabelsByVideoID(videoID, service);

4
src/routes/getVideoLabelByHash.ts
View File

@@ -11,10 +11,12 @@ export async function getVideoLabelsByHash(req: Request, res: Response): Promise
}
hashPrefix = hashPrefix.toLowerCase() as VideoIDHash;
const checkHasStartSegment = req.query.hasStartSegment === "true";
const service: Service = getService(req.query.service, req.body.service);
// Get all video id's that match hash prefix
const segments = await getLabelsByHash(hashPrefix, service);
const segments = await getLabelsByHash(hashPrefix, service, checkHasStartSegment);
if (!segments) return res.status(404).json([]);

7
test/cases/getVideoLabelByHash.ts
View File

@@ -36,11 +36,11 @@ describe("getVideoLabelHash", () => {
assert.strictEqual(data[0].segments.length, 1);
}
const get = (videoID: string) => client.get(`${endpoint}/${getHash(videoID, 1).substring(0, 4)}`);
const get = (videoID: string, hasStartSegment = false) => client.get(`${endpoint}/${getHash(videoID, 1).substring(0, 4)}?hasStartSegment=${hasStartSegment}`);
it("Should be able to get sponsor only label", (done) => {
const videoID = "getLabelHashSponsor";
get(videoID)
get(videoID, true)
.then(res => {
assert.strictEqual(res.status, 200);
const data = res.data;
@@ -55,7 +55,7 @@ describe("getVideoLabelHash", () => {
it("Should be able to get exclusive access only label", (done) => {
const videoID = "getLabelHashEA";
get(videoID)
get(videoID, true)
.then(res => {
assert.strictEqual(res.status, 200);
const data = res.data;
@@ -77,6 +77,7 @@ describe("getVideoLabelHash", () => {
validateLabel(data, videoID);
const result = data[0].segments[0];
assert.strictEqual(result.category, "selfpromo");
assert.strictEqual(data[0].hasStartSegment, undefined);
done();
})
.catch(err => done(err));