Date: Mon, 19 Sep 2022 17:30:39 +0100 Subject: Changes Made get_instances.py more efficient Further work to get widgets/services.js to work properly --- src/pages/options/index.ejs | 10 +- src/pages/options/index.html | 1326 ++++++++++---------------------- src/pages/options/widgets/general.ejs | 12 +- src/pages/options/widgets/services.ejs | 61 +- src/pages/options/widgets/services.js | 58 +- 5 files changed, 480 insertions(+), 987 deletions(-) (limited to 'src/pages/options') diff --git a/src/pages/options/index.ejs b/src/pages/options/index.ejs index 0240f992..e0ce3c3c 100644 --- a/src/pages/options/index.ejs +++ b/src/pages/options/index.ejs @@ -1,12 +1,12 @@ - <%- include('src/pages/widgets/head') %> + <%- include('src/pages/widgets/head') -%> - <%- include('src/pages/widgets/links', {config: config}) %> + <%- include('src/pages/widgets/links', {config: config}) -%>

- <%- include('src/pages/options/widgets/general', {config: config}) %> - <%- include('src/pages/options/widgets/services', {config: config}) %> - <%- include('src/pages/options/widgets/about') %> + <%- include('src/pages/options/widgets/general', {config: config}) -%> + <%- include('src/pages/options/widgets/services', {config: config}) -%> + <%- include('src/pages/options/widgets/about') -%>

diff --git a/src/pages/options/index.html b/src/pages/options/index.html index 8908c9bf..df6bec2a 100644 --- a/src/pages/options/index.html +++ b/src/pages/options/index.html @@ -8,50 +8,29 @@ General -

General

- -

- -

- -

- -

- -

- -

- -

- -

- -

- -

- -

- -

- -

- -

- -

- -

- -

- - -

- -

Default Instances

@@ -571,8 +486,7 @@

- -

Default Instances

@@ -604,10 +516,8 @@

- -

Default Instances

@@ -627,10 +537,8 @@

- -

Default Instances

@@ -650,14 +558,11 @@

- -

+ - -

- -

Default Instances

@@ -677,8 +582,7 @@

- -

Default Instances

@@ -710,10 +612,8 @@

- -

Default Instances

@@ -733,10 +633,8 @@

- -

Default Instances

@@ -756,13 +654,11 @@

- -

+ - + -

YT Music

@@ -770,28 +666,20 @@

Enable

- +

Frontend

- +

Frontend

@@ -1127,13 +983,11 @@

- -

- +

Instagram

@@ -1141,121 +995,11 @@

Enable

- +

- -

Default Instances

Custom Instances

- -

TikTok

@@ -1263,16 +1007,11 @@

Enable

- +

- - - -

- -

Default Instances

@@ -1292,8 +1031,7 @@

- -

Default Instances

@@ -1325,10 +1061,8 @@

- -

Default Instances

@@ -1348,10 +1082,8 @@

- -

Default Instances

@@ -1371,13 +1103,11 @@

- -

- +

@@ -1385,28 +1115,20 @@

Enable

- +

@@ -1588,10 +1295,8 @@

- -

Default Instances

@@ -1611,13 +1316,11 @@

- -

+ - +

Imgur

@@ -1625,16 +1328,11 @@

Enable

- +

- - - -

- -

Default Instances

@@ -1654,8 +1352,7 @@

- -

Default Instances

@@ -1687,10 +1382,8 @@

- -

Default Instances

@@ -1710,10 +1403,8 @@

- -

Default Instances

@@ -1733,13 +1424,11 @@

- -

- +

Wikipedia

@@ -1747,16 +1436,11 @@

Enable

- +

- - - -

- -

Default Instances

@@ -1776,8 +1460,7 @@

- -

Default Instances

@@ -1809,10 +1490,8 @@

- -

Default Instances

@@ -1832,10 +1511,8 @@

- -

Default Instances

@@ -1855,13 +1532,11 @@

- -

- +

Medium

@@ -1869,16 +1544,11 @@

Enable

- +

- - - -

- -

Default Instances

@@ -1898,8 +1568,7 @@

- -

Default Instances

@@ -1931,10 +1598,8 @@

- -

Default Instances

@@ -1954,10 +1619,8 @@

- -

Default Instances

@@ -1977,13 +1640,11 @@

- -

- +

Quora

@@ -1991,16 +1652,11 @@

Enable

- +

- - - -

- -

Default Instances

@@ -2020,8 +1676,7 @@

- -

Default Instances

@@ -2053,10 +1706,8 @@

- -

Default Instances

@@ -2076,10 +1727,8 @@

- -

Default Instances

@@ -2099,13 +1748,11 @@

- -

- +

IMDb

@@ -2113,16 +1760,11 @@

Enable

- +

- - - -

- -

Default Instances

@@ -2142,8 +1784,7 @@

- -

Default Instances

@@ -2175,10 +1814,8 @@

- -

Default Instances

@@ -2198,10 +1835,8 @@

- -

Default Instances

@@ -2221,13 +1856,11 @@

- -

- +

Reuters

@@ -2235,16 +1868,11 @@

Enable

- +

- - - -

- -

Default Instances

@@ -2264,8 +1892,7 @@

- -

Default Instances

@@ -2297,10 +1922,8 @@

- -

Default Instances

@@ -2320,10 +1943,8 @@

- -

Default Instances

@@ -2343,13 +1964,11 @@

- -

- +

PeerTube

@@ -2357,16 +1976,11 @@

Enable

- +

- - - -

- -

Default Instances

@@ -2386,8 +2000,7 @@

- -

Default Instances

@@ -2419,10 +2030,8 @@

- -

Default Instances

@@ -2442,10 +2051,8 @@

- -

Default Instances

@@ -2465,13 +2072,11 @@

- -

- - - + +

- -

Default Instances

@@ -2529,8 +2134,7 @@

- -

Default Instances

@@ -2562,10 +2164,8 @@

- -

Default Instances

@@ -2585,10 +2185,8 @@

- -

Default Instances

@@ -2608,13 +2206,11 @@

- -

- +

Search

@@ -2622,32 +2218,22 @@

Enable

- +

Frontend

Default Instances

@@ -2879,8 +2445,7 @@

- -

Default Instances

@@ -2912,10 +2475,8 @@

- -

Default Instances

@@ -2935,10 +2496,8 @@

- -

Default Instances

@@ -2958,14 +2517,11 @@

- -

+ - -

- -

Default Instances

@@ -2985,8 +2541,7 @@

- -

Default Instances

@@ -3018,10 +2571,8 @@

- -

Default Instances

@@ -3041,10 +2592,8 @@

- -

Default Instances

@@ -3064,13 +2613,11 @@

- -

+ - +

Translate

@@ -3078,28 +2625,20 @@

Enable

- +

@@ -3281,10 +2805,8 @@

- -

Default Instances

@@ -3304,13 +2826,11 @@

- -

+ - +

Maps

@@ -3318,28 +2838,20 @@

Enable

- +

Frontend

- +

Frontend

- - - -

- -

Default Instances

@@ -3359,8 +2871,7 @@

- -

Default Instances

@@ -3392,10 +2901,8 @@

- -

Default Instances

@@ -3415,10 +2922,8 @@

- -

Default Instances

@@ -3438,13 +2943,11 @@

- -

- +

Send Files

@@ -3452,16 +2955,11 @@

Enable

- +

- - - -

- -

Default Instances

@@ -3481,8 +2979,7 @@

- -

Default Instances

@@ -3514,10 +3009,8 @@

- -

Default Instances

@@ -3537,10 +3030,8 @@

- -

Default Instances

@@ -3560,15 +3051,13 @@

- -

- +

About

@@ -3593,7 +3082,6 @@

- diff --git a/src/pages/options/widgets/general.ejs b/src/pages/options/widgets/general.ejs index 05ef0959..d68a2280 100644 --- a/src/pages/options/widgets/general.ejs +++ b/src/pages/options/widgets/general.ejs @@ -14,10 +14,10 @@

@@ -84,14 +84,14 @@

Customize Popup

diff --git a/src/pages/options/widgets/services.ejs b/src/pages/options/widgets/services.ejs index aed5872b..bc75f288 100644 --- a/src/pages/options/widgets/services.ejs +++ b/src/pages/options/widgets/services.ejs @@ -1,4 +1,4 @@ -<% for (const service in config.services) { %> +<% for (const service in config.services) { -%>

<%= config.services[service].name %>

@@ -6,47 +6,47 @@

Enable

- +

- <% if ((Object.keys(config.services[service].frontends).length > 1) || config.services[service].singleInstanceFrontends) { %> + <% if (Object.keys(config.services[service].frontends).length > 1) { %>

Frontend

- +

Frontend

- <% } %> - <% if ((config.services[service].singleInstanceFrontends) && (Object.keys(config.services[service].frontends).length > 1)) { %> -

+ <% if (config.services[service].embeddable) { _%> +

Embed Frontend

- <% } %> - <% if (config.services[service].embeddable) { %> + <% } _%> + <% } _%> + <% if (config.services[service].embeddable) { _%>

Redirect Type

- - - + +

- <% } %> + <% } _%>

- <% for (const frontend in config.services[service].frontends) { %> + <% for (const frontend in config.services[service].frontends) { -%> + <% if (config.services[service].frontends[frontend].instanceList) { _%>

- <% for (const network in config.networks) { %> + <% for (const network in config.networks) { -%>

Default Instances

@@ -67,7 +67,7 @@

- <% if (network == "clearnet") { %> + <% if (network == "clearnet") { _%>

- <% } %> + <% } _%>

- <% }; %> + <% } %>

- <% }; %> + <% } _%> + <% } %>

-<% }; %> +<% } %> diff --git a/src/pages/options/widgets/services.js b/src/pages/options/widgets/services.js index c7955b40..4a53a749 100644 --- a/src/pages/options/widgets/services.js +++ b/src/pages/options/widgets/services.js @@ -1,13 +1,10 @@ import utils from "../../../assets/javascripts/utils.js" -// const frontends = new Array("librarian") -// const protocols = new Array("clearnet", "tor", "i2p", "loki") - let config, network, divs = {} -async function getConfig() { +function getConfig() { return new Promise(resolve => { fetch("/config/config.json") .then(response => response.text()) @@ -19,7 +16,7 @@ async function getConfig() { }) } -getConfig() +await getConfig() browser.storage.local.get("network", r => { network = r.network @@ -27,45 +24,50 @@ browser.storage.local.get("network", r => { function changeFrontendsSettings(service) { for (const frontend in config.services[service].frontends) { - const frontendDiv = document.getElementById(frontend) - if (frontend == divs[service].frontend.value) { - frontendDiv.style.display = "block" - } else { - frontendDiv.style.display = "none" + if (config.services[service].frontends[frontend].instanceList && config.services[service].frontends.length > 1) { + const frontendDiv = document.getElementById(frontend) + if (divs[service].frontend == null) { + console.log(frontend) + } + if (frontend == divs[service].frontend.value) { + frontendDiv.style.display = "block" + } else { + frontendDiv.style.display = "none" + } } } } function changeNetworkSettings(selectedNetwork) { for (const frontend in config.frontends) { - const frontendDiv = document.getElementById(frontend) - for (const network in config.networks) { - const networkDiv = frontendDiv.getElementsByClassName(network)[0] - if (network == selectedNetwork) { - networkDiv.style.display = "block" - } else { - networkDiv.style.display = "none" + if (config.services[service].frontends[frontend].instanceList) { + const frontendDiv = document.getElementById(frontend) + for (const network in config.networks) { + const networkDiv = frontendDiv.getElementsByClassName(network)[0] + if (network == selectedNetwork) { + networkDiv.style.display = "block" + } else { + networkDiv.style.display = "none" + } } } } } -for (service in config.services) { +for (const service in config.services) { + divs[service] = {} divs[service][service] = document.getElementById(`${service}_page`) for (const option in config.services[service].options) { divs[service][option] = document.getElementById(`${service}-${option}`) browser.storage.local.get([`${service + utils.camelCase(option)}`], r => { - if (typeof config.services[service].options[option] == "boollean") divs[service][option].checked = !r[service + utils.camelCase(option)] + if (typeof config.services[service].options[option] == "boollean") divs[service][option].checked = r[service + utils.camelCase(option)] else divs[service][option].value = !r[service + utils.camelCase(option)] }) divs[service][option].addEventListener("change", () => { - if (typeof config.services[service].options[option] == "boollean") { - browser.storage.local.set({ [service + utils.camelCase(option)]: !divs[service][option].checked }) - } else { - browser.storage.local.set({ [service + utils.camelCase(option)]: divs[service][option].value }) - } + if (typeof config.services[service].options[option] == "boollean") browser.storage.local.set({ [service + utils.camelCase(option)]: divs[service][option].checked }) + else browser.storage.local.set({ [service + utils.camelCase(option)]: divs[service][option].value }) changeFrontendsSettings() }) } @@ -74,9 +76,11 @@ for (service in config.services) { changeNetworkSettings(network) for (const frontend in config.services[service].frontends) { - for (const network in config.networks) { - utils.processDefaultCustomInstances(service, frontend, network, document) + if (config.services[service].frontends[frontend].instanceList) { + for (const network in config.networks) { + utils.processDefaultCustomInstances(service, frontend, network, document) + } + utils.latency(service, frontend, document, location) } - utils.latency(service, frontend, document, location) } } -- cgit 1.4.1

Customize Popup

Youtube

Enable

Frontend

Frontend

Embed Frontend

Redirect Type

Default Instances

Default Instances

Default Instances

Default Instances

Default Instances

Default Instances

Default Instances

Default Instances

Default Instances

Default Instances

Default Instances

Default Instances

Default Instances

Default Instances

Default Instances

Default Instances

YT Music

Enable

Frontend

Frontend

Default Instances

Default Instances

Default Instances

Default Instances

Default Instances

Default Instances

Default Instances

Default Instances

Twitter

Enable

Redirect Type

Default Instances

Default Instances

Default Instances

Default Instances

Instagram

Enable

Default Instances

Custom Instances

Default Instances

Custom Instances

Default Instances

Custom Instances

Default Instances

Custom Instances

TikTok

Enable

Default Instances

Default Instances

Default Instances

Default Instances

Reddit

Enable

Frontend

Frontend

Default Instances

Default Instances

Default Instances

Default Instances

Default Instances

Default Instances

Default Instances

Default Instances

Imgur

Enable

Default Instances

Default Instances

Default Instances

Default Instances

Wikipedia

Enable

Default Instances

Default Instances