mirror of
https://github.com/ajayyy/SponsorBlock.git
synced 2024-11-10 09:07:45 +01:00
Fixed up formatting and style. Added more detailed error messages. Changed from var to let.
Co-author worked on creating this url parser. Co-Authored-By: Giacomo Rossetto <jackyman_cs4@live.it>
This commit is contained in:
parent
ccafbf663c
commit
5be8ecb32b
1 changed files with 10 additions and 10 deletions
20
utils.js
20
utils.js
|
@ -1,24 +1,24 @@
|
|||
function getYouTubeVideoID(url) {
|
||||
|
||||
//Attempt to parse url
|
||||
try {
|
||||
var obj = new URL(url);
|
||||
let urlObject = new URL(url);
|
||||
} catch (e) {
|
||||
console.error("[SB] Unable to parser URL");
|
||||
console.error("[SB] Unable to parse URL: " + url);
|
||||
return false
|
||||
}
|
||||
|
||||
//Check if valid hostname
|
||||
if(!["www.youtube.com","www.youtube-nocookie.com"].includes(obj.host)) return false;
|
||||
if(!["www.youtube.com","www.youtube-nocookie.com"].includes(urlObject.host)) return false;
|
||||
|
||||
if (obj.pathname == "/watch" && obj.searchParams.has("v")) {
|
||||
id = obj.searchParams.get("v"); // Get ID from searchParam
|
||||
//Get ID from searchParam
|
||||
if ((urlObject.pathname == "/watch" || urlObject.pathname == "/watch/") && urlObject.searchParams.has("v")) {
|
||||
id = urlObject.searchParams.get("v");
|
||||
return id.length == 11 ? id : false;
|
||||
} else if (obj.pathname.startsWith("/embed/")) {
|
||||
} else if (urlObject.pathname.startsWith("/embed/")) {
|
||||
try {
|
||||
return obj.pathname.substr(7, 11);
|
||||
return urlObject.pathname.substr(7, 11);
|
||||
} catch (e) {
|
||||
console.error("[SB] Video ID not valid");
|
||||
console.error("[SB] Video ID not valid for " + url);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
@ -27,7 +27,7 @@ function getYouTubeVideoID(url) {
|
|||
//returns the start time of the video if there was one specified (ex. ?t=5s)
|
||||
function getYouTubeVideoStartTime(url) {
|
||||
let searchParams = new URL(url).searchParams;
|
||||
var startTime = searchParams.get("t");
|
||||
let startTime = searchParams.get("t");
|
||||
if (startTime == null) {
|
||||
startTime = searchParams.get("time_continue");
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue