Changes
Made get_instances.py more efficient Further work to get widgets/services.js to work properly
This commit is contained in:
Hygna
parent
978e079307
commit
0c1595ec3a
|
|
@ -28,8 +28,8 @@ function init() {
|
|||
//cur = current
|
||||
for (const service in config.services) {
|
||||
options[service] = {}
|
||||
browser.storage.local.get([`disable${utils.camelCase(service)}`, `${service}RedirectType`, `${service}Frontend`], r => {
|
||||
options[service].disabled = r["disable" + utils.camelCase(service)]
|
||||
browser.storage.local.get([`${utils.camelCase(service)}Enable`, `${service}RedirectType`, `${service}Frontend`], r => {
|
||||
options[service].enabled = r[utils.camelCase(service) + "Enable"]
|
||||
options[service].frontend = r[service + "Frontend"]
|
||||
options[service].redirectType = r[service + "RedirectType"]
|
||||
// console.log(r)
|
||||
|
|
@ -60,19 +60,19 @@ function all(service) {
|
|||
return tmp
|
||||
}
|
||||
|
||||
getConfig()
|
||||
await getConfig()
|
||||
init()
|
||||
browser.storage.onChanged.addListener(init)
|
||||
|
||||
function redirect(url, type, initiator) {
|
||||
let randomInstance
|
||||
let frontend = options[service].frontend
|
||||
let frontend
|
||||
let network = options.network
|
||||
let networkFallback = options.networkFallback
|
||||
let redirectType = options[service].redirectType
|
||||
let redirectType
|
||||
if (url.pathname == "/") return
|
||||
for (const service in config.services) {
|
||||
if (options[service].disabled && !disableOverride) continue
|
||||
if (!options[service].enabled && !disableOverride) continue
|
||||
let targets = service.targets
|
||||
if (targets == "datajson") {
|
||||
browser.storage.local.get(`${service}Targets`, (targets = r[service + "Targets"]))
|
||||
|
|
@ -81,11 +81,18 @@ function redirect(url, type, initiator) {
|
|||
if (initiator && (all(service).includes(initiator.origin) || targets.includes(initiator.host))) continue
|
||||
if (!targets.some(rx => rx.test(url.href))) continue
|
||||
if (type != redirectType && type != "both") continue
|
||||
|
||||
frontend = options[service].frontend
|
||||
redirectType = options[service].redirectType
|
||||
|
||||
// browser.storage.local.get(`${service}Frontend`, (frontend = r[service + "Frontend"]))
|
||||
let instanceList = [...[service + utils.camelCase(network) + "RedirectsChecks"], ...[service + utils.camelCase(network) + "CustomRedirects"]]
|
||||
if (instanceList.length === 0 && networkFallback) instanceList = [...[service + "ClearnetRedirectsChecks"], ...[service + "ClearnetCustomRedirects"]]
|
||||
if (instanceList.length === 0 && redirects.indexOf(frontend) != -1) return
|
||||
randomInstance = utils.getRandomInstance(instanceList)
|
||||
|
||||
if (config.services[service].frontends[frontend].instanceList) {
|
||||
let instanceList = [...[frontend + utils.camelCase(network) + "RedirectsChecks"], ...[frontend + utils.camelCase(network) + "CustomRedirects"]]
|
||||
if (instanceList.length === 0 && networkFallback) instanceList = [...[frontend + "ClearnetRedirectsChecks"], ...[frontend + "ClearnetCustomRedirects"]]
|
||||
if (instanceList.length === 0 && redirects.indexOf(frontend) != -1) return
|
||||
randomInstance = utils.getRandomInstance(instanceList)
|
||||
}
|
||||
}
|
||||
|
||||
// Here is a (temperory) space for defining constants required in 2 or more switch cases.
|
||||
|
|
@ -114,7 +121,7 @@ function redirect(url, type, initiator) {
|
|||
.replace("/watch?v=", "/listen?id=")
|
||||
.replace("/channel/", "/artist/")
|
||||
.replace("/playlist?list=", "/playlist/VL")
|
||||
.replace(/\/search\?q=.*/, searchQuery => searchQuery.replace("?q=", "/") + "?filter=song")
|
||||
.replace(/\/search\?q=.*/, searchQuery => searchQuery.replace("?q=", "/") + "?filter=all")
|
||||
case "hyperpipe":
|
||||
return `${randomInstance}${url.pathname}${url.search}`.replace(/\/search\?q=.*/, searchQuery => searchQuery.replace("?q=", "/"))
|
||||
case "bibliogram":
|
||||
|
|
@ -386,7 +393,7 @@ function initDefaults() {
|
|||
// console.log(redirects)
|
||||
// console.log(config)
|
||||
browser.storage.local.set({
|
||||
redirects,
|
||||
redirects: redirects.invidious,
|
||||
})
|
||||
browser.storage.local.get(["cloudflareBlackList", "authenticateBlackList", "offlineBlackList"], async r => {
|
||||
// console.log(r)
|
||||
|
|
@ -395,7 +402,7 @@ function initDefaults() {
|
|||
browser.storage.local.set({ [service + "Targets"]: redirects[service] })
|
||||
}
|
||||
for (const defaultOption in config.services[service].defaults) {
|
||||
browser.storage.local.set({ [defaultOption]: config.services[service].defaults[defaultOption] })
|
||||
browser.storage.local.set({ [service + camelCase(defaultOption)]: config.services[service].defaults[defaultOption] })
|
||||
}
|
||||
for (const frontend in config.services[service].frontends) {
|
||||
let clearnetChecks = redirects[frontend].clearnet
|
||||
|
|
|
|||
|
|
@ -24,7 +24,10 @@
|
|||
"invidious": {
|
||||
"preferences": {
|
||||
"cookies": ["PREFS"]
|
||||
}
|
||||
},
|
||||
"name": "Invidious",
|
||||
"embeddable": true,
|
||||
"instanceList": true
|
||||
},
|
||||
"piped": {
|
||||
"preferences": {
|
||||
|
|
@ -48,19 +51,38 @@
|
|||
"volume",
|
||||
"watchHistory"
|
||||
]
|
||||
}
|
||||
},
|
||||
"name": "Piped",
|
||||
"embeddable": true,
|
||||
"instanceList": true
|
||||
},
|
||||
"pipedMaterial": {
|
||||
"preferences": {
|
||||
"localstorage": ["PREFERENCES"]
|
||||
}
|
||||
},
|
||||
"name": "Piped-Material",
|
||||
"embeddable": false,
|
||||
"instanceList": true
|
||||
},
|
||||
"cloudtube": {
|
||||
"preferences": {
|
||||
"token": "token",
|
||||
"fetchEndpoint": "/api/settings",
|
||||
"setEndpoint": "/settings"
|
||||
}
|
||||
},
|
||||
"name": "CloudTube",
|
||||
"embeddable": false,
|
||||
"instanceList": true
|
||||
},
|
||||
"freetube": {
|
||||
"name": "FreeTube",
|
||||
"embeddable": false,
|
||||
"instanceList": false
|
||||
},
|
||||
"yattee": {
|
||||
"name": "Yattee",
|
||||
"embeddable": false,
|
||||
"instanceList": false
|
||||
}
|
||||
},
|
||||
"singleInstanceFrontends": ["freetube", "yatte"],
|
||||
|
|
@ -74,7 +96,7 @@
|
|||
],
|
||||
"name": "Youtube",
|
||||
"options": {
|
||||
"disabled": false,
|
||||
"enabled": true,
|
||||
"redirectType": "both",
|
||||
"frontend": "invidious",
|
||||
"embedFrontend": "invidious"
|
||||
|
|
@ -88,19 +110,23 @@
|
|||
"preferences": {
|
||||
"localstorage": ["settings"],
|
||||
"indexeddb": "beatbump"
|
||||
}
|
||||
},
|
||||
"name": "Beatbump",
|
||||
"instanceList": true
|
||||
},
|
||||
"hyperpipe": {
|
||||
"preferences": {
|
||||
"localstorage": ["api", "authapi", "codec", "locale", "next", "pipedapi", "quality", "theme", "vol"],
|
||||
"indexeddb": ["hyperpipedb"]
|
||||
}
|
||||
},
|
||||
"name": "HyperPipe",
|
||||
"instanceList": true
|
||||
}
|
||||
},
|
||||
"targets": ["^https?:\\/{2}music\\.youtube\\.com(\\/.*|$)"],
|
||||
"name": "YT Music",
|
||||
"options": {
|
||||
"disabled": false,
|
||||
"enabled": true,
|
||||
"frontend": "beatbump"
|
||||
},
|
||||
"imageType": "png",
|
||||
|
|
@ -130,13 +156,16 @@
|
|||
"replaceTwitter",
|
||||
"replaceYouTube"
|
||||
]
|
||||
}
|
||||
},
|
||||
"name": "Nitter",
|
||||
"embeddable": true,
|
||||
"instanceList": true
|
||||
}
|
||||
},
|
||||
"targets": ["^https?:\\/{2}(www\\.|mobile\\.|)twitter\\.com", "^https?:\\/{2}(pbs\\.|video\\.|)twimg\\.com", "^https?:\\/{2}platform\\.twitter\\.com/embed", "^https?:\\/{2}t\\.co"],
|
||||
"name": "Twitter",
|
||||
"options": {
|
||||
"disabled": false,
|
||||
"enabled": true,
|
||||
"redirectType": "both"
|
||||
},
|
||||
"imageType": "png",
|
||||
|
|
@ -149,12 +178,14 @@
|
|||
"token": "token",
|
||||
"fetchEndpoint": "/settings.json",
|
||||
"setEndpoint": "/applysettings"
|
||||
}
|
||||
},
|
||||
"name": "Bibliogram",
|
||||
"instanceList": false
|
||||
}
|
||||
},
|
||||
"targets": ["^https?:\\/{2}(www\\.)?instagram\\.com"],
|
||||
"name": "Instagram",
|
||||
"options": { "disabled": false },
|
||||
"options": { "enabled": true },
|
||||
"imageType": "png",
|
||||
"embeddable": false
|
||||
},
|
||||
|
|
@ -163,12 +194,14 @@
|
|||
"proxiTok": {
|
||||
"preferences": {
|
||||
"cookies": ["api-test_endpoints", "theme"]
|
||||
}
|
||||
},
|
||||
"name": "ProxiTok",
|
||||
"instanceList": true
|
||||
}
|
||||
},
|
||||
"targets": ["^https?:\\/{2}(www\\.|)tiktok\\.com.*"],
|
||||
"name": "TikTok",
|
||||
"options": { "disabled": false },
|
||||
"options": { "enabled": true },
|
||||
"imageType": "png",
|
||||
"embeddable": false
|
||||
},
|
||||
|
|
@ -177,7 +210,9 @@
|
|||
"libreddit": {
|
||||
"preferences": {
|
||||
"cookies": ["theme", "front_page", "layout", "wide", "post_sort", "comment_sort", "show_nsfw", "autoplay_videos", "use_hls", "hide_hls_notification", "subscriptions", "filters"]
|
||||
}
|
||||
},
|
||||
"name": "Libreddit",
|
||||
"instanceList": true
|
||||
},
|
||||
"teddit": {
|
||||
"preferences": {
|
||||
|
|
@ -195,13 +230,15 @@
|
|||
"theme",
|
||||
"videos_muted"
|
||||
]
|
||||
}
|
||||
},
|
||||
"name": "Teddit",
|
||||
"instanceList": true
|
||||
}
|
||||
},
|
||||
"targets": ["^https?:\\/{2}(www\\.|old\\.|np\\.|new\\.|amp\\.|)reddit\\.com", "^https?:\\/{2}(i\\.|preview\\.)redd\\.it"],
|
||||
"name": "Reddit",
|
||||
"options": {
|
||||
"disabled": false,
|
||||
"enabled": true,
|
||||
"frontend": "libreddit"
|
||||
},
|
||||
"imageType": "png",
|
||||
|
|
@ -210,12 +247,14 @@
|
|||
"imgur": {
|
||||
"frontends": {
|
||||
"rimgo": {
|
||||
"preferences": {}
|
||||
"preferences": {},
|
||||
"name": "rimgo",
|
||||
"instanceList": true
|
||||
}
|
||||
},
|
||||
"targets": ["^https?:\\/{2}([im]\\.)?imgur\\.(com|io)(\\/|$)"],
|
||||
"name": "Imgur",
|
||||
"options": { "disabled": false },
|
||||
"options": { "enabled": true },
|
||||
"imageType": "png",
|
||||
"embeddable": false
|
||||
},
|
||||
|
|
@ -224,19 +263,23 @@
|
|||
"wikiless": {
|
||||
"preferences": {
|
||||
"cookies": ["theme", "default_lang"]
|
||||
}
|
||||
},
|
||||
"name": "Wikiless",
|
||||
"instanceList": true
|
||||
}
|
||||
},
|
||||
"targets": ["^https?:\\/{2}([a-z]+\\.)*wikipedia\\.org"],
|
||||
"name": "Wikipedia",
|
||||
"options": { "disabled": true },
|
||||
"options": { "enabled": false },
|
||||
"imageType": "svg",
|
||||
"embeddable": false
|
||||
},
|
||||
"medium": {
|
||||
"frontends": {
|
||||
"scribe": {
|
||||
"preferences": {}
|
||||
"preferences": {},
|
||||
"name": "Scribe",
|
||||
"instanceList": true
|
||||
}
|
||||
},
|
||||
"targets": [
|
||||
|
|
@ -260,7 +303,7 @@
|
|||
"^writingcooperative\\.com "
|
||||
],
|
||||
"name": "Medium",
|
||||
"options": { "disabled": false },
|
||||
"options": { "enabled": true },
|
||||
"imageType": "svg",
|
||||
"embeddable": false
|
||||
},
|
||||
|
|
@ -269,12 +312,14 @@
|
|||
"quetre": {
|
||||
"preferences": {
|
||||
"localstorage": ["theme"]
|
||||
}
|
||||
},
|
||||
"name": "Quetre",
|
||||
"instanceList": true
|
||||
}
|
||||
},
|
||||
"targets": ["^https?:\\/{2}([a-z]+\\.)*quora\\.com.*"],
|
||||
"name": "Quora",
|
||||
"options": { "disabled": false },
|
||||
"options": { "enabled": true },
|
||||
"imageType": "png",
|
||||
"embeddable": false
|
||||
},
|
||||
|
|
@ -283,36 +328,42 @@
|
|||
"libremdb": {
|
||||
"preferences": {
|
||||
"localstorage": ["theme"]
|
||||
}
|
||||
},
|
||||
"name": "libremdb",
|
||||
"instanceList": true
|
||||
}
|
||||
},
|
||||
"targets": ["^https?:\\/{2}(?:www\\.|)imdb\\.com.*"],
|
||||
"name": "IMDb",
|
||||
"options": { "disabled": true },
|
||||
"options": { "enabled": false },
|
||||
"imageType": "svg",
|
||||
"embeddable": false
|
||||
},
|
||||
"reuters": {
|
||||
"frontends": {
|
||||
"neuters": {
|
||||
"preferences": {}
|
||||
"preferences": {},
|
||||
"name": "Neuters",
|
||||
"instanceList": true
|
||||
}
|
||||
},
|
||||
"targets": ["^https?:\\/{2}(www\\.|)reuters\\.com.*"],
|
||||
"name": "Reuters",
|
||||
"options": { "disabled": true },
|
||||
"options": { "enabled": false },
|
||||
"imageType": "svg",
|
||||
"embeddable": false
|
||||
},
|
||||
"peertube": {
|
||||
"frontends": {
|
||||
"simpleertube": {
|
||||
"preferences": {}
|
||||
"preferences": {},
|
||||
"name": "SimpleerTube",
|
||||
"instanceList": true
|
||||
}
|
||||
},
|
||||
"targets": "datajson",
|
||||
"name": "PeerTube",
|
||||
"options": { "disabled": true },
|
||||
"options": { "enabled": false },
|
||||
"imageType": "svg",
|
||||
"embeddable": false
|
||||
},
|
||||
|
|
@ -322,14 +373,21 @@
|
|||
"preferences": {
|
||||
"cookies": ["nsfw", "theme"],
|
||||
"localstorage": ["autoplay", "autoplayNextVid", "collapseComments", "plyr", "sb_categories", "showRelated"]
|
||||
}
|
||||
},
|
||||
"name": "Librarian",
|
||||
"embeddable": true,
|
||||
"instanceList": true
|
||||
},
|
||||
"lbryDesktop": {
|
||||
"name": "LBRY Desktop",
|
||||
"embeddable": false,
|
||||
"instanceList": false
|
||||
}
|
||||
},
|
||||
"singleInstanceFrontends": ["lbryDesktop"],
|
||||
"targets": ["^https?:\\/{2}odysee\\.com", "^https?:\\/{2}lbry\\.tv"],
|
||||
"name": "LBRY",
|
||||
"options": {
|
||||
"disabled": true,
|
||||
"enabled": false,
|
||||
"frontend": "librarian",
|
||||
"redirectType": "both"
|
||||
},
|
||||
|
|
@ -359,7 +417,9 @@
|
|||
"theme",
|
||||
"tokens"
|
||||
]
|
||||
}
|
||||
},
|
||||
"name": "SearX",
|
||||
"instanceList": true
|
||||
},
|
||||
"searxng": {
|
||||
"preferences": {
|
||||
|
|
@ -384,21 +444,27 @@
|
|||
"theme",
|
||||
"tokens"
|
||||
]
|
||||
}
|
||||
},
|
||||
"name": "SearXNG",
|
||||
"instanceList": true
|
||||
},
|
||||
"whoogle": {
|
||||
"preferences": {}
|
||||
"preferences": {},
|
||||
"name": "Whoogle",
|
||||
"instanceList": true
|
||||
},
|
||||
"librex": {
|
||||
"preferences": {
|
||||
"cookies": ["bibliogram", "disable_special", "invidious", "libreddit", "nitter", "proxitok", "theme", "wikiless"]
|
||||
}
|
||||
},
|
||||
"name": "LibreX",
|
||||
"instanceList": true
|
||||
}
|
||||
},
|
||||
"targets": ["^https?:\\/{2}search\\.libredirect\\.invalid"],
|
||||
"name": "Search",
|
||||
"options": {
|
||||
"disabled": false,
|
||||
"enabled": true,
|
||||
"frontend": "searxng"
|
||||
},
|
||||
"imageType": "svg",
|
||||
|
|
@ -409,18 +475,22 @@
|
|||
"simplyTranslate": {
|
||||
"preferences": {
|
||||
"cookies": ["from_lang", "to_lang", "tts_enabled", "use_text_fields"]
|
||||
}
|
||||
},
|
||||
"name": "SimplyTranslate",
|
||||
"instanceList": true
|
||||
},
|
||||
"lingva": {
|
||||
"preferences": {
|
||||
"localstorage": ["isauto", "source", "target"]
|
||||
}
|
||||
},
|
||||
"name": "Lingva",
|
||||
"instanceList": true
|
||||
}
|
||||
},
|
||||
"targets": ["^https?:\\/{2}translate\\.google(\\.[a-z]{2,3}){1,2}\\/"],
|
||||
"name": "Translate",
|
||||
"options": {
|
||||
"disabled": false,
|
||||
"enabled": true,
|
||||
"frontend": "simplyTranslate"
|
||||
},
|
||||
"imageType": "svg",
|
||||
|
|
@ -429,14 +499,19 @@
|
|||
"maps": {
|
||||
"frontends": {
|
||||
"facil": {
|
||||
"preferences": {}
|
||||
"preferences": {},
|
||||
"name": "FacilMap",
|
||||
"instanceList": true
|
||||
},
|
||||
"osm": {
|
||||
"name": "OpenStreetMap",
|
||||
"instanceList": false
|
||||
}
|
||||
},
|
||||
"singleInstanceFrontends": ["osm"],
|
||||
"targets": ["^https?:\\/{2}(((www|maps)\\.)?(google\\.).*(\\/maps)|maps\\.(google\\.).*)"],
|
||||
"name": "Maps",
|
||||
"options": {
|
||||
"disabled": false,
|
||||
"enabled": true,
|
||||
"frontend": "osm"
|
||||
},
|
||||
"imageType": "svg",
|
||||
|
|
@ -445,12 +520,14 @@
|
|||
"sendTargets": {
|
||||
"frontends": {
|
||||
"send": {
|
||||
"preferences": {}
|
||||
"preferences": {},
|
||||
"name": "Send",
|
||||
"instanceList": "true"
|
||||
}
|
||||
},
|
||||
"targets": ["^https?:\\/{2}send\\.libredirect\\.invalid\\/$", "^https?:\\/{2}send\\.firefox\\.com\\/$", "^https?:\\/{2}sendfiles\\.online\\/$"],
|
||||
"name": "Send Files",
|
||||
"options": { "disabled": false },
|
||||
"options": { "enabled": true },
|
||||
"imageType": "svg",
|
||||
"embeddable": false
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,10 @@
|
|||
import requests
|
||||
import json
|
||||
from urllib.parse import urlparse
|
||||
from bs4 import BeautifulSoup
|
||||
import re
|
||||
from colorama import Fore, Back, Style
|
||||
from urllib.parse import urlparse
|
||||
import socket
|
||||
import subprocess
|
||||
|
||||
mightyList = {}
|
||||
|
||||
|
|
@ -18,6 +16,11 @@ torRegex = startRegex + "onion" + endRegex
|
|||
i2pRegex = startRegex + "i2p" + endRegex
|
||||
lokiRegex = startRegex + "loki" + endRegex
|
||||
authRegex = "https?:\/{2}\S+:\S+@(?:[^\s\/]+\.)+[a-zA-Z0-9]+" + endRegex
|
||||
config = {}
|
||||
|
||||
with open('./config/config.json') as file:
|
||||
config = file
|
||||
|
||||
|
||||
def filterLastSlash(urlList):
|
||||
tmp = {}
|
||||
|
|
@ -102,70 +105,162 @@ def is_offline(url):
|
|||
except:
|
||||
return False
|
||||
|
||||
def fetchCache(frontend, name) :
|
||||
# json_object = json.dumps(mightyList, ensure_ascii=False, indent=2)
|
||||
with open('./src/instances/data.json') as file:
|
||||
mightyList[frontend] = json.load(file).frontend
|
||||
print(Fore.ORANGE + 'Failed' + Style.RESET_ALL + ' to fetch ' + name)
|
||||
|
||||
def fetchFromFile(frontend, name):
|
||||
#json_object = json.dumps(mightyList, ensure_ascii=False, indent=2)
|
||||
with open('./src/instances/' + frontend + '.json') as file:
|
||||
mightyList[frontend] = json.load(file)
|
||||
print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + name)
|
||||
|
||||
def fetchJsonList(frontend, name, url, urlItem):
|
||||
try:
|
||||
r = requests.get(url)
|
||||
rJson = json.loads(r.text)
|
||||
_list = {}
|
||||
for network in config.networks:
|
||||
_list[network] = []
|
||||
if type(urlItem) is 'str':
|
||||
for item in rJson:
|
||||
if urlItem is not None:
|
||||
tmpUrl = item[urlItem]
|
||||
else:
|
||||
tmpUrl = item
|
||||
if tmpUrl.strip() == "":
|
||||
continue
|
||||
elif re.search(torRegex, tmpUrl):
|
||||
_list['tor'].append(tmpUrl)
|
||||
elif re.search(i2pRegex, tmpUrl):
|
||||
_list['i2p'].append(tmpUrl)
|
||||
elif re.search(lokiRegex, tmpUrl):
|
||||
_list['loki'].append(tmpUrl)
|
||||
else:
|
||||
_list['clearnet'].append(tmpUrl)
|
||||
else:
|
||||
for i in range(config.networks.length):
|
||||
# The expected order is the same as in config.json. If the frontend doesn't have any instances for a specified network, use None
|
||||
if urlItem != None:
|
||||
for item in rJson:
|
||||
if network in item:
|
||||
if item[network].strip() != "":
|
||||
_list[config.networks[i]].append(item[urlItem[i]])
|
||||
|
||||
mightyList[frontend] = _list
|
||||
print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + name)
|
||||
except:
|
||||
fetchCache(frontend, name)
|
||||
|
||||
def fetchRegexList(frontend, name, url, regex):
|
||||
try:
|
||||
r = requests.get(url)
|
||||
_list = {}
|
||||
for network in config.networks:
|
||||
_list[network] = []
|
||||
|
||||
tmp = re.findall(regex, r.text)
|
||||
|
||||
for item in tmp:
|
||||
if item.strip() == "":
|
||||
continue
|
||||
elif re.search(torRegex, item):
|
||||
_list['tor'].append(item)
|
||||
elif re.search(i2pRegex, item):
|
||||
_list['i2p'].append(item)
|
||||
elif re.search(lokiRegex, item):
|
||||
_list['loki'].append(item)
|
||||
else:
|
||||
_list['clearnet'].append(item)
|
||||
mightyList[frontend] = _list
|
||||
print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + name)
|
||||
except:
|
||||
fetchCache(frontend, name)
|
||||
|
||||
def fetchTextList(frontend, name, url, prepend):
|
||||
try:
|
||||
r = requests.get(url)
|
||||
tmp = r.text.strip().split('\n')
|
||||
|
||||
_list = {}
|
||||
for network in config.networks:
|
||||
_list[network] = []
|
||||
|
||||
for item in tmp:
|
||||
item = prepend + item
|
||||
if re.search(torRegex, item):
|
||||
_list['tor'].append(item)
|
||||
elif re.search(i2pRegex, item):
|
||||
_list['i2p'].append(item)
|
||||
elif re.search(lokiRegex, item):
|
||||
_list['loki'].append(item)
|
||||
else:
|
||||
_list['clearnet'].append(item)
|
||||
mightyList[frontend] = _list
|
||||
print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + name)
|
||||
except:
|
||||
fetchCache(frontend, name)
|
||||
|
||||
|
||||
def invidious():
|
||||
r = requests.get('https://api.invidious.io/instances.json')
|
||||
rJson = json.loads(r.text)
|
||||
invidiousList = {}
|
||||
invidiousList['clearnet'] = []
|
||||
invidiousList['tor'] = []
|
||||
invidiousList['i2p'] = []
|
||||
invidiousList['loki'] = []
|
||||
for instance in rJson:
|
||||
if instance[1]['type'] == 'https':
|
||||
invidiousList['clearnet'].append(instance[1]['uri'])
|
||||
elif instance[1]['type'] == 'onion':
|
||||
invidiousList['tor'].append(instance[1]['uri'])
|
||||
mightyList['invidious'] = invidiousList
|
||||
print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'Invidious')
|
||||
name = 'Invidious'
|
||||
frontend = 'invidious'
|
||||
try:
|
||||
_list = {}
|
||||
_list['clearnet'] = []
|
||||
_list['tor'] = []
|
||||
_list['i2p'] = []
|
||||
_list['loki'] = []
|
||||
r = requests.get('https://api.invidious.io/instances.json')
|
||||
rJson = json.loads(r.text)
|
||||
for instance in rJson:
|
||||
if instance[1]['type'] == 'https':
|
||||
_list['clearnet'].append(instance[1]['uri'])
|
||||
elif instance[1]['type'] == 'onion':
|
||||
_list['tor'].append(instance[1]['uri'])
|
||||
mightyList[frontend] = _list
|
||||
print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + name)
|
||||
except:
|
||||
fetchCache(frontend, name)
|
||||
|
||||
|
||||
def piped():
|
||||
r = requests.get(
|
||||
'https://raw.githubusercontent.com/wiki/TeamPiped/Piped/Instances.md')
|
||||
|
||||
tmp = re.findall(
|
||||
'(?:[^\s\/]+\.)+[a-zA-Z]+ (?:\(Official\) )?\| (https:\/{2}(?:[^\s\/]+\.)+[a-zA-Z]+) \| ', r.text)
|
||||
_list = {}
|
||||
_list['clearnet'] = []
|
||||
_list['tor'] = []
|
||||
_list['i2p'] = []
|
||||
_list['loki'] = []
|
||||
for item in tmp:
|
||||
try:
|
||||
url = requests.get(item, timeout=5).url
|
||||
if url.strip("/") == item:
|
||||
frontend = 'piped'
|
||||
name = 'Piped'
|
||||
try:
|
||||
_list = {}
|
||||
_list['clearnet'] = []
|
||||
_list['tor'] = []
|
||||
_list['i2p'] = []
|
||||
_list['loki'] = []
|
||||
r = requests.get(
|
||||
'https://raw.githubusercontent.com/wiki/TeamPiped/Piped/Instances.md')
|
||||
|
||||
tmp = re.findall(
|
||||
'(?:[^\s\/]+\.)+[a-zA-Z]+ (?:\(Official\) )?\| (https:\/{2}(?:[^\s\/]+\.)+[a-zA-Z]+) \| ', r.text)
|
||||
for item in tmp:
|
||||
try:
|
||||
url = requests.get(item, timeout=5).url
|
||||
if url.strip("/") == item:
|
||||
continue
|
||||
else:
|
||||
_list['clearnet'].append(url)
|
||||
except:
|
||||
continue
|
||||
else:
|
||||
_list['clearnet'].append(url)
|
||||
except:
|
||||
continue
|
||||
mightyList['piped'] = _list
|
||||
print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'Piped')
|
||||
mightyList[frontend] = _list
|
||||
print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + name)
|
||||
except:
|
||||
fetchCache(frontend, name)
|
||||
|
||||
|
||||
def pipedMaterial():
|
||||
r = requests.get(
|
||||
'https://raw.githubusercontent.com/mmjee/Piped-Material/master/README.md')
|
||||
|
||||
tmp = re.findall(
|
||||
r"\| (https?:\/{2}(?:\S+\.)+[a-zA-Z0-9]*) +\|", r.text)
|
||||
pipedMaterialList = {}
|
||||
pipedMaterialList['clearnet'] = []
|
||||
pipedMaterialList['tor'] = []
|
||||
pipedMaterialList['i2p'] = []
|
||||
pipedMaterialList['loki'] = []
|
||||
for item in tmp:
|
||||
pipedMaterialList['clearnet'].append(item)
|
||||
mightyList['pipedMaterial'] = pipedMaterialList
|
||||
print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'pipedMaterial')
|
||||
fetchRegexList('pipedMaterial', 'Piped-Material', 'https://raw.githubusercontent.com/mmjee/Piped-Material/master/README.md', r"\| (https?:\/{2}(?:\S+\.)+[a-zA-Z0-9]*) +\|")
|
||||
|
||||
|
||||
def cloudtube():
|
||||
json_object = json.dumps(mightyList, ensure_ascii=False, indent=2)
|
||||
with open('./src/instances/cloudtube.json') as file:
|
||||
mightyList['cloudtube'] = json.load(file)
|
||||
print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'CloudTube')
|
||||
fetchCache('cloudtube', 'Cloudtube')
|
||||
|
||||
|
||||
def proxitok():
|
||||
|
|
@ -186,19 +281,7 @@ def proxitok():
|
|||
|
||||
|
||||
def send():
|
||||
r = requests.get(
|
||||
'https://gitlab.com/timvisee/send-instances/-/raw/master/README.md')
|
||||
tmp = re.findall(
|
||||
r"- ([-a-zA-Z0-9@:%_\+.~#?&//=]{2,}\.[a-z0-9]{2,}\b(?:\/[-a-zA-Z0-9@:%_\+.~#?&//=]*)?)\)*\|*[A-Z]{0,}", r.text)
|
||||
sendList = {}
|
||||
sendList['clearnet'] = []
|
||||
sendList['tor'] = []
|
||||
sendList['i2p'] = []
|
||||
sendList['loki'] = []
|
||||
for item in tmp:
|
||||
sendList['clearnet'].append(item)
|
||||
mightyList['send'] = sendList
|
||||
print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'Send')
|
||||
fetchRegexList('send', 'Send', 'https://gitlab.com/timvisee/send-instances/-/raw/master/README.md', r"- ([-a-zA-Z0-9@:%_\+.~#?&//=]{2,}\.[a-z0-9]{2,}\b(?:\/[-a-zA-Z0-9@:%_\+.~#?&//=]*)?)\)*\|*[A-Z]{0,}")
|
||||
|
||||
|
||||
def nitter():
|
||||
|
|
@ -230,150 +313,35 @@ def nitter():
|
|||
|
||||
|
||||
def bibliogram():
|
||||
json_object = json.dumps(mightyList, ensure_ascii=False, indent=2)
|
||||
with open('./src/instances/bibliogram.json') as file:
|
||||
mightyList['bibliogram'] = json.load(file)
|
||||
print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'Bibliogram')
|
||||
fetchFromFile('bibliogram', 'Bibliogram')
|
||||
|
||||
|
||||
def libreddit():
|
||||
r = requests.get(
|
||||
'https://raw.githubusercontent.com/spikecodes/libreddit/master/README.md')
|
||||
libredditList = {}
|
||||
libredditList['clearnet'] = []
|
||||
libredditList['tor'] = []
|
||||
libredditList['i2p'] = []
|
||||
libredditList['loki'] = []
|
||||
|
||||
tmp = re.findall(
|
||||
r"\| \[.*\]\(([-a-zA-Z0-9@:%_\+.~#?&//=]{2,}\.[a-z]{2,}\b(?:\/[-a-zA-Z0-9@:%_\+.~#?&//=]*)?)\)*\|*[A-Z]{0,}.*\|.*\|", r.text)
|
||||
|
||||
for item in tmp:
|
||||
if re.search(torRegex, item):
|
||||
libredditList['tor'].append(item)
|
||||
else:
|
||||
libredditList['clearnet'].append(item)
|
||||
mightyList['libreddit'] = libredditList
|
||||
print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'LibReddit')
|
||||
fetchRegexList('libreddit', 'Libreddit', 'https://raw.githubusercontent.com/spikecodes/libreddit/master/README.md', r"\| \[.*\]\(([-a-zA-Z0-9@:%_\+.~#?&//=]{2,}\.[a-z]{2,}\b(?:\/[-a-zA-Z0-9@:%_\+.~#?&//=]*)?)\)*\|*[A-Z]{0,}.*\|.*\|")
|
||||
|
||||
|
||||
def teddit():
|
||||
r = requests.get(
|
||||
'https://codeberg.org/teddit/teddit/raw/branch/main/instances.json')
|
||||
rJson = json.loads(r.text)
|
||||
tedditList = {}
|
||||
tedditList['clearnet'] = []
|
||||
tedditList['tor'] = []
|
||||
tedditList['i2p'] = []
|
||||
tedditList['loki'] = []
|
||||
for item in rJson:
|
||||
url = item['url']
|
||||
if url != '':
|
||||
tedditList['clearnet'].append(url)
|
||||
if 'onion' in item:
|
||||
onion = item['onion']
|
||||
if onion != '':
|
||||
tedditList['tor'].append(onion)
|
||||
|
||||
mightyList['teddit'] = tedditList
|
||||
print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'Teddit')
|
||||
fetchJsonList('teddit', 'Teddit', 'https://codeberg.org/teddit/teddit/raw/branch/main/instances.json', ['url', 'onion', 'i2p', None])
|
||||
|
||||
|
||||
def wikiless():
|
||||
r = requests.get('https://wikiless.org/instances.json')
|
||||
rJson = json.loads(r.text)
|
||||
wikilessList = {}
|
||||
wikilessList['clearnet'] = []
|
||||
wikilessList['tor'] = []
|
||||
wikilessList['i2p'] = []
|
||||
wikilessList['loki'] = []
|
||||
for item in rJson:
|
||||
if 'url' in item:
|
||||
if item['url'].strip() != "":
|
||||
wikilessList['clearnet'].append(item['url'])
|
||||
if 'onion' in item:
|
||||
if item['onion'].strip() != "":
|
||||
wikilessList['tor'].append(item['onion'])
|
||||
if 'i2p' in item:
|
||||
if item['i2p'].strip() != "":
|
||||
wikilessList['i2p'].append(item['i2p'])
|
||||
mightyList['wikiless'] = wikilessList
|
||||
print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'Wikiless')
|
||||
fetchJsonList('wikiless', 'Wikiless', 'https://wikiless.org/instances.json', ['url', 'onion', 'i2p', None])
|
||||
|
||||
|
||||
def scribe():
|
||||
r = requests.get(
|
||||
'https://git.sr.ht/~edwardloveall/scribe/blob/main/docs/instances.json')
|
||||
rJson = json.loads(r.text)
|
||||
scribeList = {}
|
||||
scribeList['clearnet'] = []
|
||||
scribeList['tor'] = []
|
||||
scribeList['i2p'] = []
|
||||
scribeList['loki'] = []
|
||||
for item in rJson:
|
||||
scribeList['clearnet'].append(item)
|
||||
mightyList['scribe'] = scribeList
|
||||
print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'Scribe')
|
||||
fetchJsonList('scribe', 'Scribe', 'https://git.sr.ht/~edwardloveall/scribe/blob/main/docs/instances.json', None)
|
||||
|
||||
|
||||
def quetre():
|
||||
r = requests.get(
|
||||
'https://raw.githubusercontent.com/zyachel/quetre/main/README.md')
|
||||
_list = {}
|
||||
_list['clearnet'] = []
|
||||
_list['tor'] = []
|
||||
_list['i2p'] = []
|
||||
_list['loki'] = []
|
||||
|
||||
tmp = re.findall(
|
||||
r"\| \[.*\]\(([-a-zA-Z0-9@:%_\+.~#?&//=]{2,}\.[a-z]{2,}\b(?:\/[-a-zA-Z0-9@:%_\+.~#?&//=]*)?)\)*\|*[A-Z]{0,}.*\|.*\|", r.text)
|
||||
|
||||
|
||||
for item in tmp:
|
||||
if re.search(torRegex, item):
|
||||
_list['tor'].append(item)
|
||||
else:
|
||||
_list['clearnet'].append(item)
|
||||
mightyList['quetre'] = _list
|
||||
print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'Quetre')
|
||||
fetchRegexList('quetre', 'Quetre', 'https://raw.githubusercontent.com/zyachel/quetre/main/README.md', r"\| \[.*\]\(([-a-zA-Z0-9@:%_\+.~#?&//=]{2,}\.[a-z]{2,}\b(?:\/[-a-zA-Z0-9@:%_\+.~#?&//=]*)?)\)*\|*[A-Z]{0,}.*\|.*\|")
|
||||
|
||||
|
||||
def libremdb():
|
||||
r = requests.get(
|
||||
'https://raw.githubusercontent.com/zyachel/libremdb/main/README.md')
|
||||
_list = {}
|
||||
_list['clearnet'] = []
|
||||
_list['tor'] = []
|
||||
_list['i2p'] = []
|
||||
_list['loki'] = []
|
||||
fetchRegexList('libremdb', 'libremdb', 'https://raw.githubusercontent.com/zyachel/libremdb/main/README.md', r"\| ([-a-zA-Z0-9@:%_\+.~#?&//=]{2,}\.[a-z]{2,}\b(?:\/[-a-zA-Z0-9@:%_\+.~#?&//=]*)?)*\|*[A-Z]{0,}.*\|.*\|")
|
||||
|
||||
tmp = re.findall(
|
||||
r"\| ([-a-zA-Z0-9@:%_\+.~#?&//=]{2,}\.[a-z]{2,}\b(?:\/[-a-zA-Z0-9@:%_\+.~#?&//=]*)?)*\|*[A-Z]{0,}.*\|.*\|", r.text)
|
||||
|
||||
|
||||
for item in tmp:
|
||||
if item.strip() == "":
|
||||
continue
|
||||
if re.search(torRegex, item):
|
||||
_list['tor'].append(item)
|
||||
else:
|
||||
_list['clearnet'].append(item)
|
||||
|
||||
mightyList['libremdb'] = _list
|
||||
print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'Libremdb')
|
||||
|
||||
def simpleertube():
|
||||
r = requests.get('https://simple-web.org/instances/simpleertube')
|
||||
_list = {}
|
||||
_list['clearnet'] = []
|
||||
_list['tor'] = []
|
||||
_list['i2p'] = []
|
||||
_list['loki'] = []
|
||||
for item in r.text.strip().split('\n'):
|
||||
_list['clearnet'].append('https://' + item)
|
||||
|
||||
mightyList['simpleertube'] = _list
|
||||
print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'SimpleerTube')
|
||||
fetchTextList('simpleertube', 'SimpleerTube', 'https://simple-web.org/instances/simpleertube', 'https://')
|
||||
|
||||
|
||||
def simplytranslate():
|
||||
|
|
@ -403,19 +371,7 @@ def simplytranslate():
|
|||
|
||||
|
||||
def linvgatranslate():
|
||||
r = requests.get(
|
||||
'https://raw.githubusercontent.com/TheDavidDelta/lingva-translate/main/instances.json')
|
||||
rJson = json.loads(r.text)
|
||||
lingvaList = {}
|
||||
lingvaList['clearnet'] = []
|
||||
lingvaList['tor'] = []
|
||||
lingvaList['i2p'] = []
|
||||
lingvaList['loki'] = []
|
||||
for item in rJson:
|
||||
lingvaList['clearnet'].append(item)
|
||||
|
||||
mightyList['lingva'] = lingvaList
|
||||
print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'LinvgaTranslate')
|
||||
fetchJsonList('lingva', 'LingvaTranslate', 'https://raw.githubusercontent.com/TheDavidDelta/lingva-translate/main/instances.json', None)
|
||||
|
||||
|
||||
def searx_searxng():
|
||||
|
|
@ -454,140 +410,34 @@ def searx_searxng():
|
|||
|
||||
|
||||
def whoogle():
|
||||
r = requests.get(
|
||||
'https://raw.githubusercontent.com/benbusby/whoogle-search/main/misc/instances.txt')
|
||||
tmpList = r.text.strip().split('\n')
|
||||
whoogleList = {}
|
||||
whoogleList['clearnet'] = []
|
||||
whoogleList['tor'] = []
|
||||
whoogleList['i2p'] = []
|
||||
whoogleList['loki'] = []
|
||||
for item in tmpList:
|
||||
if re.search(torRegex, item):
|
||||
whoogleList['tor'].append(item)
|
||||
elif re.search(torRegex, item):
|
||||
whoogleList['i2p'].append(item)
|
||||
else:
|
||||
whoogleList['clearnet'].append(item)
|
||||
mightyList['whoogle'] = whoogleList
|
||||
print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'Whoogle')
|
||||
fetchTextList('whoogle', 'Whoogle', 'https://raw.githubusercontent.com/benbusby/whoogle-search/main/misc/instances.txt', '')
|
||||
|
||||
|
||||
def librex():
|
||||
r = requests.get(
|
||||
'https://raw.githubusercontent.com/hnhx/librex/main/README.md')
|
||||
_list = {}
|
||||
_list['clearnet'] = []
|
||||
_list['tor'] = []
|
||||
_list['i2p'] = []
|
||||
_list['loki'] = []
|
||||
|
||||
tmp = re.findall(
|
||||
r"\| {1,2}\[(?:(?:[a-zA-Z0-9]+\.)+[a-zA-Z]{2,}|✅)\]\((https?:\/{2}(?:[a-zA-Z0-9]+\.)+[a-zA-Z0-9]{2,})", r.text)
|
||||
|
||||
for item in tmp:
|
||||
if item.strip() == "":
|
||||
continue
|
||||
elif re.search(torRegex, item):
|
||||
_list['tor'].append(item)
|
||||
elif re.search(i2pRegex, item):
|
||||
_list['i2p'].append(item)
|
||||
else:
|
||||
_list['clearnet'].append(item)
|
||||
mightyList['librex'] = _list
|
||||
print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'Librex')
|
||||
fetchRegexList('librex', 'LibreX', 'https://raw.githubusercontent.com/hnhx/librex/main/README.md', r"\| {1,2}\[(?:(?:[a-zA-Z0-9]+\.)+[a-zA-Z]{2,}|✅)\]\((https?:\/{2}(?:[a-zA-Z0-9]+\.)+[a-zA-Z0-9]{2,})")
|
||||
|
||||
|
||||
def rimgo():
|
||||
r = requests.get(
|
||||
'https://codeberg.org/video-prize-ranch/rimgo/raw/branch/main/instances.json')
|
||||
rJson = json.loads(r.text)
|
||||
rimgoList = {}
|
||||
rimgoList['clearnet'] = []
|
||||
rimgoList['tor'] = []
|
||||
rimgoList['i2p'] = []
|
||||
rimgoList['loki'] = []
|
||||
for item in rJson:
|
||||
if 'url' in item:
|
||||
rimgoList['clearnet'].append(item['url'])
|
||||
if 'onion' in item:
|
||||
rimgoList['tor'].append(item['onion'])
|
||||
if 'i2p' in item:
|
||||
rimgoList['i2p'].append(item['i2p'])
|
||||
mightyList['rimgo'] = rimgoList
|
||||
print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'Rimgo')
|
||||
fetchJsonList('rimgo', 'rimgo', 'https://codeberg.org/video-prize-ranch/rimgo/raw/branch/main/instances.json', ['url', 'onion', 'i2p', None])
|
||||
|
||||
|
||||
def librarian():
|
||||
r = requests.get(
|
||||
'https://codeberg.org/librarian/librarian/raw/branch/main/instances.json')
|
||||
rJson = json.loads(r.text)
|
||||
librarianList = {}
|
||||
librarianList['clearnet'] = []
|
||||
librarianList['tor'] = []
|
||||
librarianList['i2p'] = []
|
||||
librarianList['loki'] = []
|
||||
instances = rJson['instances']
|
||||
for item in instances:
|
||||
url = item['url']
|
||||
if url.strip() == "":
|
||||
continue
|
||||
elif re.search(torRegex, url):
|
||||
librarianList['tor'].append(url)
|
||||
elif re.search(i2pRegex, url):
|
||||
librarianList['i2p'].append(url)
|
||||
elif re.search(lokiRegex, url):
|
||||
librarianList['loki'].append(url)
|
||||
else:
|
||||
librarianList['clearnet'].append(url)
|
||||
mightyList['librarian'] = librarianList
|
||||
print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'Librarian')
|
||||
|
||||
fetchJsonList('librarian', 'Librarian', 'https://codeberg.org/librarian/librarian/raw/branch/main/instances.json', 'url')
|
||||
|
||||
def neuters():
|
||||
json_object = json.dumps(mightyList, ensure_ascii=False, indent=2)
|
||||
with open('./src/instances/neuters.json') as file:
|
||||
mightyList['neuters'] = json.load(file)
|
||||
print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'Neuters')
|
||||
fetchFromFile('neuters', 'Neuters')
|
||||
|
||||
|
||||
def beatbump():
|
||||
json_object = json.dumps(mightyList, ensure_ascii=False, indent=2)
|
||||
with open('./src/instances/beatbump.json') as file:
|
||||
mightyList['beatbump'] = json.load(file)
|
||||
print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'Beatbump')
|
||||
fetchFromFile('beatbump', 'Beatbump')
|
||||
|
||||
|
||||
def hyperpipe():
|
||||
r = requests.get(
|
||||
'https://codeberg.org/Hyperpipe/pages/raw/branch/main/api/frontend.json')
|
||||
rJson = json.loads(r.text)
|
||||
hyperpipeList = {}
|
||||
hyperpipeList['clearnet'] = []
|
||||
hyperpipeList['tor'] = []
|
||||
hyperpipeList['i2p'] = []
|
||||
hyperpipeList['loki'] = []
|
||||
for item in rJson:
|
||||
url = item['url']
|
||||
if url.strip() == "":
|
||||
continue
|
||||
elif re.search(torRegex, url):
|
||||
hyperpipeList['tor'].append(url)
|
||||
elif re.search(i2pRegex, url):
|
||||
hyperpipeList['i2p'].append(url)
|
||||
elif re.search(lokiRegex, url):
|
||||
hyperpipeList['loki'].append(url)
|
||||
else:
|
||||
hyperpipeList['clearnet'].append(url)
|
||||
mightyList['hyperpipe'] = hyperpipeList
|
||||
print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'Hyperpipe')
|
||||
fetchJsonList('hyperpipe', 'Hyperpipe', 'https://codeberg.org/Hyperpipe/pages/raw/branch/main/api/frontend.json', 'url')
|
||||
|
||||
|
||||
def facil():
|
||||
json_object = json.dumps(mightyList, ensure_ascii=False, indent=2)
|
||||
with open('./src/instances/facil.json') as file:
|
||||
mightyList['facil'] = json.load(file)
|
||||
print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'FacilMap')
|
||||
fetchFromFile('facil', 'FacilMap')
|
||||
|
||||
|
||||
def peertube():
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
<!DOCTYPE html>
|
||||
<html id="elementToShowWithJavaScript" lang="en">
|
||||
<%- include('src/pages/widgets/head') %>
|
||||
<%- include('src/pages/widgets/head') -%>
|
||||
<body class="option" dir="auto">
|
||||
<%- include('src/pages/widgets/links', {config: config}) %>
|
||||
<%- include('src/pages/widgets/links', {config: config}) -%>
|
||||
<div id="pages">
|
||||
<%- 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') -%>
|
||||
</div>
|
||||
</body>
|
||||
<script type="module" src="./index.js"></script>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -14,10 +14,10 @@
|
|||
<div class="some-block option-block">
|
||||
<h4 data-localise="__MSG_protocol__"></h4>
|
||||
<select id="protocol">
|
||||
<% for (const network in config.networks) { %>
|
||||
<option value="<%= network %>"><%= config.networks[network].name %></option>
|
||||
<% for (const network in config.networks) { -%>
|
||||
<option value="<%= network %>"><%= config.networks[network].name %></option>
|
||||
<% }; %>
|
||||
</select>
|
||||
</select>
|
||||
</div>
|
||||
<div id="protocol-fallback">
|
||||
<div class="some-block option-block">
|
||||
|
|
@ -84,14 +84,14 @@
|
|||
<h4 data-localise="__MSG_customPopup__">Customize Popup</h4>
|
||||
</div>
|
||||
<div class="checklist-popup" id="popup-frontends-checklist">
|
||||
<% for (const service in config.services) { %>
|
||||
<div>
|
||||
<% for (const service in config.services) { -%>
|
||||
<div>
|
||||
<div><img src="../../../assets/images/<%= service %>-icon.<%= config.services[service].imageType %>">
|
||||
<x data-localise="__MSG_<%= service %>__"><%= service %></x>
|
||||
</div>
|
||||
<input id="<%= service %>" type="checkbox">
|
||||
</div>
|
||||
<% }; %>
|
||||
</div>
|
||||
</div>
|
||||
<script type="module" src="./widgets/general.js"></script>
|
||||
</section>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<% for (const service in config.services) { %>
|
||||
<% for (const service in config.services) { -%>
|
||||
<section class="option-block" id="<%= service %>_page">
|
||||
<div class="some-block option-block">
|
||||
<h1 data-localise="__MSG_<%= service %>__"><%= config.services[service].name %></h1>
|
||||
|
|
@ -6,47 +6,47 @@
|
|||
<hr>
|
||||
<div class="some-block option-block">
|
||||
<h4 data-localise="__MSG_enable__">Enable</h4>
|
||||
<input id="<%= service %>-enable" type="checkbox">
|
||||
<input id="<%= service %>-enabled" type="checkbox">
|
||||
</div>
|
||||
<% if ((Object.keys(config.services[service].frontends).length > 1) || config.services[service].singleInstanceFrontends) { %>
|
||||
<% if (Object.keys(config.services[service].frontends).length > 1) { %>
|
||||
<div class="some-block option-block">
|
||||
<h4 data-localise="__MSG_frontend__">Frontend</h4>
|
||||
<select id="<%= service %>-frontend">
|
||||
<% for (const frontend in config.services[service].frontends) { %>
|
||||
<option value="<%= frontend %>"><%= frontend %></option>
|
||||
<% }; %>
|
||||
<% for (const frontend in config.services[service].singleInstanceFrontends){ %>
|
||||
<option value="<%= config.services[service].singleInstanceFrontends[frontend] %>"><%= config.services[service].singleInstanceFrontends[frontend] %></option>
|
||||
<% }; %>
|
||||
</select>
|
||||
<h4 data-localise="__MSG_frontend__">Frontend</h4>
|
||||
<select id="<%= service %>-frontend">
|
||||
<% for (const frontend in config.services[service].frontends) { -%>
|
||||
<option value="<%= frontend %>"><%= config.services[service].frontends[frontend].name %></option>
|
||||
<% } %>
|
||||
</select>
|
||||
</div>
|
||||
<% } %>
|
||||
<% if ((config.services[service].singleInstanceFrontends) && (Object.keys(config.services[service].frontends).length > 1)) { %>
|
||||
<div id="<%= service %>-embedded_frontend">
|
||||
<% if (config.services[service].embeddable) { _%>
|
||||
<div id="<%= service %>-embedFrontend">
|
||||
<div class="some-block option-block">
|
||||
<h4 data-localise="__MSG_embed_frontend__">Embed Frontend</h4>
|
||||
<select id="<%= service %>-embed_frontend">
|
||||
<% for (const frontend in config.services[service].frontends) { %>
|
||||
<% for (const frontend in config.services[service].frontends) { -%>
|
||||
<% if (config.services[service].frontends[frontend].embeddable) { _%>
|
||||
<option value="<%= frontend %>"><%= frontend %></option>
|
||||
<% }; %>
|
||||
<% } _%>
|
||||
<% } %>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<% } %>
|
||||
<% if (config.services[service].embeddable) { %>
|
||||
<% } _%>
|
||||
<% } _%>
|
||||
<% if (config.services[service].embeddable) { _%>
|
||||
<div class="some-block option-block">
|
||||
<h4 data-localise="__MSG_redirectType__">Redirect Type</h4>
|
||||
<select id="<%= service %>-redirect_type">
|
||||
<select id="<%= service %>-redirectType">
|
||||
<option value="both" data-localise="__MSG_both__">both</option>
|
||||
<option value="onlyEmbedded" data-localise="__MSG_onlyEmbedded__">Only Embedded</option>
|
||||
<option value="onlyNotEmbedded" data-localise="__MSG_onlyNotEmbedded__">Only Not Embedded</option>
|
||||
<option value="sub_frame" data-localise="__MSG_onlyEmbedded__">Only Embedded</option>
|
||||
<option value="main_frame" data-localise="__MSG_onlyNotEmbedded__">Only Not Embedded</option>
|
||||
</select>
|
||||
</div>
|
||||
<% } %>
|
||||
<% } _%>
|
||||
<hr>
|
||||
<% for (const frontend in config.services[service].frontends) { %>
|
||||
<% for (const frontend in config.services[service].frontends) { -%>
|
||||
<% if (config.services[service].frontends[frontend].instanceList) { _%>
|
||||
<div id="<%= frontend %>">
|
||||
<% for (const network in config.networks) { %>
|
||||
<% for (const network in config.networks) { -%>
|
||||
<div class="<%= network %>">
|
||||
<div class="some-block option-block">
|
||||
<h4 data-localise="__MSG_defaultInstances__">Default Instances</h4>
|
||||
|
|
@ -67,7 +67,7 @@
|
|||
</div>
|
||||
</form>
|
||||
<div class="checklist custom-checklist"></div>
|
||||
<% if (network == "clearnet") { %>
|
||||
<% if (network == "clearnet") { _%>
|
||||
<div class="buttons buttons-inline">
|
||||
<label class="button button-inline" id="latency-<%= frontend %>-label" for="latency-<%= frontend %>">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
|
||||
|
|
@ -77,11 +77,12 @@
|
|||
</label>
|
||||
<input class="button button-inline" id="latency-<%= frontend %>" style="display:none;">
|
||||
</div>
|
||||
<% } %>
|
||||
<% } _%>
|
||||
</div>
|
||||
<% }; %>
|
||||
<% } %>
|
||||
</div>
|
||||
<% }; %>
|
||||
<% } _%>
|
||||
<% } %>
|
||||
</section>
|
||||
<% }; %>
|
||||
<% } %>
|
||||
<script type="module" src="./widgets/services.js"></script>
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<section class="links" id="links">
|
||||
<div class="title"><img src="../../../assets/images/general-icon.svg"><a href="#general" data-localise="__MSG_general__">General</a></div>
|
||||
<% for (const service in config.services) { %>
|
||||
<% for (const service in config.services) { -%>
|
||||
<div class="title"><img src="../../../assets/images/<%= service %>-icon.<%= config.services[service].imageType %>"><a href="#<%= service %>" data-localise="__MSG_<%= service %>__"><%= service %></a></div>
|
||||
<% }; %>
|
||||
<% }; -%>
|
||||
<div class="title"><img src="../../../assets/images/about-icon.svg"><a href="#about" data-localise="__MSG_about__">About</a></div>
|
||||
</section>
|
||||
|
|
|
|||
Loading…
Reference in New Issue