From ba1e6824e98c52e867d92cfdcb2a6d2a614fd67f Mon Sep 17 00:00:00 2001 From: Wojtek Kosior Date: Wed, 29 Dec 2021 18:05:08 +0100 Subject: refactor yewtu.be URL generation into a js library --- content/byoutube/index.json | 8 ++++ content/pyoutube/index.json | 2 +- content/syewtube_urls/index.json | 6 +++ content/syewtube_urls/yewtube_urls.js | 57 +++++++++++++++++++++++ content/syoutube/index.json | 6 +-- content/syoutube/youtube.js | 61 ------------------------- content/syoutube/youtube_yewtube_redirection.js | 19 ++++++++ 7 files changed, 94 insertions(+), 65 deletions(-) create mode 100644 content/byoutube/index.json create mode 100644 content/syewtube_urls/index.json create mode 100644 content/syewtube_urls/yewtube_urls.js delete mode 100644 content/syoutube/youtube.js create mode 100644 content/syoutube/youtube_yewtube_redirection.js diff --git a/content/byoutube/index.json b/content/byoutube/index.json new file mode 100644 index 0000000..2af4824 --- /dev/null +++ b/content/byoutube/index.json @@ -0,0 +1,8 @@ +{ +"type" : "bag", +"name" : "youtube_2_yewtube_redirection", +"components" : [ +["script", "youtube.com_2_yewtu.be_URL_converter"], +["script", "youtube_2_yewtube_redirection"] +] +} diff --git a/content/pyoutube/index.json b/content/pyoutube/index.json index 89decd4..b33b736 100644 --- a/content/pyoutube/index.json +++ b/content/pyoutube/index.json @@ -1,5 +1,5 @@ { "type" : "page", "pattern" : "https://www.youtube.com/***", -"payload" : ["script", "youtube->yewtu.be"] +"payload" : ["bag", "youtube_2_yewtube_redirection"] } diff --git a/content/syewtube_urls/index.json b/content/syewtube_urls/index.json new file mode 100644 index 0000000..df8330d --- /dev/null +++ b/content/syewtube_urls/index.json @@ -0,0 +1,6 @@ +{ +"type" : "script", +"name" : "youtube.com_2_yewtu.be_URL_converter", +"sha256" : "ae2abac001a7256f4b4a66846264470b2898aa736a55f91022017ce7634dd1ae", +"location" : "yewtube_urls.js" +} diff --git a/content/syewtube_urls/yewtube_urls.js b/content/syewtube_urls/yewtube_urls.js new file mode 100644 index 0000000..b013132 --- /dev/null +++ b/content/syewtube_urls/yewtube_urls.js @@ -0,0 +1,57 @@ +/** + * Copyright (C) 2021, Wojtek Kosior + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the CC0 1.0 Universal License as published by + * the Creative Commons Corporation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * CC0 1.0 Universal License for more details. + * Available under the terms of Creative Commons Zero. + */ + +/* Library to convert youtube.com URLs to yewtu.be URLs. */ + +function decode_query_options(url) +{ + const query_options = {}; + const match = /^[^?]*\?(.*)/.exec(url); + if (!match) + return query_options; + + for (const opt of match[1].split("&")) { + const [key, val] = + /^([^=]*)=?(.*)/.exec(opt).splice(1, 2).map(decodeURIComponent); + query_options[key] = val; + } + + return query_options; +} + +function encode_query_options(query_options) +{ + return Object.entries(query_options) + .map(ar => ar.map(encodeURIComponent).join("=")).join("&"); +} + +function make_yewtube_url(youtube_url) +{ + const query_options = decode_query_options(youtube_url); + + let endpoint = ""; + + const match = /^(?:(?:https?:)?\/\/)?[^/]*\/([^?]*)/.exec(youtube_url); + if (match) + endpoint = match[1]; + + if (/^embed\//.test(query_options.v)) + endpoint = query_options.v; + + if (/^embed\/.+/.test(endpoint)) + delete query_options.v + + const encoded_options = encode_query_options(query_options); + return `https://yewtu.be/${endpoint}?${encoded_options}`; +} diff --git a/content/syoutube/index.json b/content/syoutube/index.json index 0650c42..4a3171b 100644 --- a/content/syoutube/index.json +++ b/content/syoutube/index.json @@ -1,6 +1,6 @@ { "type" : "script", -"name" : "youtube->yewtu.be", -"sha256" : "8fade4c6d87cb717289c382f71f1aaa95f8122041eb173d5e1267c13e68c56e1", -"location" : "youtube.js" +"name" : "youtube_2_yewtube_redirection", +"sha256" : "5a6b0495f122459cae22d921c3719bc5c449f30eefcc070e8aa2b27cf4e01b70", +"location" : "youtube_yewtube_redirection.js" } diff --git a/content/syoutube/youtube.js b/content/syoutube/youtube.js deleted file mode 100644 index 2486bd4..0000000 --- a/content/syoutube/youtube.js +++ /dev/null @@ -1,61 +0,0 @@ -/** - * Copyright (C) 2021, Wojtek Kosior - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the CC0 1.0 Universal License as published by - * the Creative Commons Corporation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * CC0 1.0 Universal License for more details. - * Available under the terms of Creative Commons Zero. - */ - -/* Use with https://www.youtube.com/*** */ - -/* Redirect youtube.com to yewtu.be */ - -function decode_query_options(url) -{ - const query_options = {}; - const match = /^[^?]*\?(.*)/.exec(url); - if (!match) - return query_options; - - for (const opt of match[1].split("&")) { - const [key, val] = - /^([^=]*)=?(.*)/.exec(opt).splice(1, 2).map(decodeURIComponent); - query_options[key] = val; - } - - return query_options; -} - -function encode_query_options(query_options) -{ - return Object.entries(query_options) - .map(ar => ar.map(encodeURIComponent).join("=")).join("&"); -} - -function remake_url(youtube_url) -{ - const query_options = decode_query_options(youtube_url); - - let endpoint = ""; - - const match = /^(?:(?:https?)?\/\/)?[^/]*\/([^?]*)/.exec(youtube_url); - if (match) - endpoint = match[1]; - - if (/^embed\//.test(query_options.v)) - endpoint = query_options.v; - - if (/^embed\/.+/.test(endpoint)) - delete query_options.v - - const encoded_options = encode_query_options(query_options); - return `https://yewtu.be/${endpoint}?${encoded_options}`; -} - -window.location.href = remake_url(document.URL); diff --git a/content/syoutube/youtube_yewtube_redirection.js b/content/syoutube/youtube_yewtube_redirection.js new file mode 100644 index 0000000..308771e --- /dev/null +++ b/content/syoutube/youtube_yewtube_redirection.js @@ -0,0 +1,19 @@ +/** + * Copyright (C) 2021, Wojtek Kosior + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the CC0 1.0 Universal License as published by + * the Creative Commons Corporation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * CC0 1.0 Universal License for more details. + * Available under the terms of Creative Commons Zero. + */ + +/* Use with https://www.youtube.com/*** */ + +/* Redirect youtube.com to yewtu.be */ + +window.location.href = make_yewtube_url(document.URL); -- cgit v1.2.3