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

Added error when segments haven't loaded and improved popup message

Browse Source 
Resolves #1553
This commit is contained in:
Ajay
2022-10-27 21:46:47 -04:00
parent fea8a9a37e
commit 715bcb6bd3
3 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/_locales/en/messages.json
View File

@@ -116,6 +116,9 @@
"connectionError": { "connectionError": {
"message": "A connection error has occurred. Error code: " "message": "A connection error has occurred. Error code: "
}, },
"segmentsStillLoading": {
"message": "Segments still loading..."
},
"clearTimes": { "clearTimes": {
"message": "Clear Segments" "message": "Clear Segments"
}, },
@@ -1243,5 +1246,8 @@
}, },
"exportSegmentsAsURL": { "exportSegmentsAsURL": {
"message": "Share as URL" "message": "Share as URL"
},
"segmentFetchFailureWarning": {
"message": "Warning: The server hasn't responded with segments yet. There might actually be segments on this video already submitted but you just haven't recieved them due to issues with the server."
} }
} }

9
src/content.ts
View File

@@ -56,6 +56,7 @@ let sponsorVideoID: VideoID = null;
const skipNotices: SkipNotice[] = []; const skipNotices: SkipNotice[] = [];
let activeSkipKeybindElement: ToggleSkippable = null; let activeSkipKeybindElement: ToggleSkippable = null;
let retryFetchTimeout: NodeJS.Timeout = null; let retryFetchTimeout: NodeJS.Timeout = null;
let shownSegmentFailedToFetchWarning = false;
// JSON video info // JSON video info
let videoInfo: VideoInfo = null; let videoInfo: VideoInfo = null;
@@ -344,6 +345,8 @@ function resetValues() {
sponsorTimes = []; sponsorTimes = [];
existingChaptersImported = false; existingChaptersImported = false;
sponsorSkipped = []; sponsorSkipped = [];
lastResponseStatus = 0;
shownSegmentFailedToFetchWarning = false;
sponsorVideoID = null; sponsorVideoID = null;
videoInfo = null; videoInfo = null;
@@ -1922,6 +1925,12 @@ function startOrEndTimingNewSegment() {
updateSponsorTimesSubmitting(false); updateSponsorTimesSubmitting(false);
importExistingChapters(false); importExistingChapters(false);
if (lastResponseStatus !== 200 && !shownSegmentFailedToFetchWarning) {
alert(chrome.i18n.getMessage("segmentFetchFailureWarning"));
shownSegmentFailedToFetchWarning = true;
}
} }
function getIncompleteSegment(): SponsorTime { function getIncompleteSegment(): SponsorTime {

5
src/popup.ts
View File

@@ -456,7 +456,12 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
PageElements.videoFound.innerHTML = chrome.i18n.getMessage("sponsor404"); PageElements.videoFound.innerHTML = chrome.i18n.getMessage("sponsor404");
PageElements.issueReporterImportExport.classList.remove("hidden"); PageElements.issueReporterImportExport.classList.remove("hidden");
} else { } else {
if (request.status) {
PageElements.videoFound.innerHTML = chrome.i18n.getMessage("connectionError") + request.status; PageElements.videoFound.innerHTML = chrome.i18n.getMessage("connectionError") + request.status;
} else {
PageElements.videoFound.innerHTML = chrome.i18n.getMessage("segmentsStillLoading");
}
PageElements.issueReporterImportExport.classList.remove("hidden"); PageElements.issueReporterImportExport.classList.remove("hidden");
} }
} }