Mirror/SponsorBlock
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlock.git synced 2025-12-14 07:27:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Separate refetch to a new option

Browse Source
This commit is contained in:
Ajay Ramachandran
2020-09-04 12:39:00 -04:00
parent e0c6b687d3
commit d0061985ca
4 changed files with 56 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/config.ts
View File

@@ -6,7 +6,6 @@ const utils = new Utils();
interface SBConfig {
userID: string,
// sponsorTimes: SBMap<string, SponsorTime[]>,
segmentTimes: SBMap<string, SponsorTime[]>,
defaultCategory: string,
whitelistedChannels: string[],
@@ -35,7 +34,8 @@ interface SBConfig {
audioNotificationOnSkip,
checkForUnlistedVideos: boolean,
testingServer: boolean,
hashPrefix: boolean
hashPrefix: boolean,
refetchWhenNotFound: boolean,
// What categories should be skipped
categorySelections: CategorySelection[],
@@ -168,6 +168,7 @@ var Config: SBObject = {
checkForUnlistedVideos: false,
testingServer: false,
hashPrefix: false,
refetchWhenNotFound: true,
categorySelections: [{
name: "sponsor",

51
src/content.ts
View File

@@ -632,20 +632,23 @@ function sponsorsLookup(id: string) {
}
getRequest.then(async (response: FetchResponse) => {
if (response?.ok) {
let getResult = JSON.parse(response.responseText);
let result = JSON.parse(response.responseText);
if (Config.config.hashPrefix) {
getResult = getResult.filter((video) => video.videoID === id);
if (getResult.length > 0) {
getResult = getResult[0].segments;
if (getResult.length === 0) { // return if no segments found
result = result.filter((video) => video.videoID === id);
if (result.length > 0) {
result = result[0].segments;
if (result.length === 0) { // return if no segments found
retryFetch(id);
return;
}
} else { // return if no video found
console.log("refetching")
retryFetch(id);
return;
}
}
let recievedSegments: SponsorTime[] = getResult;
let recievedSegments: SponsorTime[] = result;
if (!recievedSegments.length) {
console.error("[SponsorBlock] Server returned malformed response: " + JSON.stringify(recievedSegments));
return;
@@ -689,32 +692,38 @@ function sponsorsLookup(id: string) {
sponsorLookupRetries = 0;
} else if (response?.status === 404) {
sponsorDataFound = false;
//check if this video was uploaded recently
utils.wait(() => !!videoInfo).then(() => {
let dateUploaded = videoInfo?.microformat?.playerMicroformatRenderer?.uploadDate;
//if less than 3 days old
if (Date.now() - new Date(dateUploaded).getTime() < 259200000) {
//TODO lower when server becomes better
setTimeout(() => sponsorsLookup(id), 180000);
}
});
sponsorLookupRetries = 0;
retryFetch(id);
} else if (sponsorLookupRetries < 90 && !recheckStarted) {
recheckStarted = true;
//TODO lower when server becomes better (back to 1 second)
//some error occurred, try again in a second
setTimeout(() => sponsorsLookup(id), 10000);
setTimeout(() => sponsorsLookup(id), 10000 + Math.random() * 30000);
sponsorLookupRetries++;
}
});
}
function retryFetch(id: string): void {
if (!Config.config.refetchWhenNotFound) return;
sponsorDataFound = false;
//check if this video was uploaded recently
utils.wait(() => !!videoInfo).then(() => {
let dateUploaded = videoInfo?.microformat?.playerMicroformatRenderer?.uploadDate;
//if less than 3 days old
if (Date.now() - new Date(dateUploaded).getTime() < 259200000) {
//TODO lower when server becomes better
setTimeout(() => sponsorsLookup(id), 120000);
}
});
sponsorLookupRetries = 0;
}
/**
* Only should be used when it is okay to skip a sponsor when in the middle of it
*