Skip to content

Don't fail silently and fix lack of protocol failing to parse #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
amsam0 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Don't fail silently and fix lack of protocol failing to parse #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 33 additions & 18 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,29 +239,44 @@
setThemeFromPreference();
const params = new URLSearchParams(window.location.search.substring(1));
if (params.has('v')) {
const url = new URL(params.get('v'));
const urlParams = new URLSearchParams(url.search.substring(1));
// See https://developers.google.com/youtube/player_parameters for supported parameters
const outputParams = new URLSearchParams();
try {
let rawUrl = params.get('v');

if (urlParams.has('t')) {
outputParams.append('start', urlParams.get('t'));
}
// URL parsing will fail if there is no protocol
if (!rawUrl.split(".")[0].includes("://")) {
rawUrl = "https://" + rawUrl;
}

const url = new URL(rawUrl);
const urlParams = new URLSearchParams(url.search.substring(1));
// See https://developers.google.com/youtube/player_parameters for supported parameters
const outputParams = new URLSearchParams();

if (url.hostname == 'youtube.com' || url.hostname.endsWith('.youtube.com')) {
if (urlParams.has('list')) {
outputParams.append('listType', 'playlist');
outputParams.append('list', urlParams.get('list'));
if (urlParams.has('t')) {
outputParams.append('start', urlParams.get('t'));
}

let id = '';
if (urlParams.has('v')) {
id = urlParams.get('v');
if (url.hostname == 'youtube.com' || url.hostname.endsWith('.youtube.com')) {
if (urlParams.has('list')) {
outputParams.append('listType', 'playlist');
outputParams.append('list', urlParams.get('list'));
}

let id = '';
if (urlParams.has('v')) {
id = urlParams.get('v');
}
purify(id, outputParams);
} else if (url.hostname == 'youtu.be') {
const id = url.pathname.substring(1);
purify(id, outputParams);
} else {
throw "Unknown hostname";
}
purify(id, outputParams);
} else if (url.hostname == 'youtu.be') {
const id = url.pathname.substring(1);
purify(id, outputParams);
} catch (e) {
setTimeout(() => alert("Failed to parse URL. Please make sure the URL is a valid YouTube video or playlist."), 500);
// Also show it in the console
throw e;
}
}
}
Expand Down