devol
/
libredirect
mirror of https://codeberg.org/LibRedirect/libredirect.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bugs introduced in the previous commit

This commit is contained in:
Hygna 2022-09-19 19:52:26 +01:00
parent 0c1595ec3a
commit 098e7368a7
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/instances/get_instances.py
View File

@ -9,6 +9,7 @@ from urllib.parse import urlparse
import socket import socket
mightyList = {} mightyList = {}
config = {}
startRegex = "https?:\/{2}(?:[^\s\/]+\.)+" startRegex = "https?:\/{2}(?:[^\s\/]+\.)+"
endRegex = "(?:\/[^\s\/]+)*\/?" endRegex = "(?:\/[^\s\/]+)*\/?"
@ -16,10 +17,10 @@ torRegex = startRegex + "onion" + endRegex
i2pRegex = startRegex + "i2p" + endRegex i2pRegex = startRegex + "i2p" + endRegex
lokiRegex = startRegex + "loki" + endRegex lokiRegex = startRegex + "loki" + endRegex
authRegex = "https?:\/{2}\S+:\S+@(?:[^\s\/]+\.)+[a-zA-Z0-9]+" + endRegex authRegex = "https?:\/{2}\S+:\S+@(?:[^\s\/]+\.)+[a-zA-Z0-9]+" + endRegex
config = {}
with open('./config/config.json') as file: with open('./src/config/config.json', 'rt') as tmp:
config = file config['networks'] = json.load(tmp)['config']['networks']
def filterLastSlash(urlList): def filterLastSlash(urlList):
@ -108,8 +109,8 @@ def is_offline(url):
def fetchCache(frontend, name) : def fetchCache(frontend, name) :
# json_object = json.dumps(mightyList, ensure_ascii=False, indent=2) # json_object = json.dumps(mightyList, ensure_ascii=False, indent=2)
with open('./src/instances/data.json') as file: with open('./src/instances/data.json') as file:
mightyList[frontend] = json.load(file).frontend mightyList[frontend] = json.load(file)[frontend]
print(Fore.ORANGE + 'Failed' + Style.RESET_ALL + ' to fetch ' + name) print(Fore.YELLOW + 'Failed' + Style.RESET_ALL + ' to fetch ' + name)
def fetchFromFile(frontend, name): def fetchFromFile(frontend, name):
#json_object = json.dumps(mightyList, ensure_ascii=False, indent=2) #json_object = json.dumps(mightyList, ensure_ascii=False, indent=2)
@ -122,32 +123,31 @@ def fetchJsonList(frontend, name, url, urlItem):
r = requests.get(url) r = requests.get(url)
rJson = json.loads(r.text) rJson = json.loads(r.text)
_list = {} _list = {}
for network in config.networks: for network in config['networks']:
_list[network] = [] _list[network] = []
if type(urlItem) is 'str': if type(urlItem) == 'str':
for item in rJson: for item in rJson:
tmpItem = item
if urlItem is not None: if urlItem is not None:
tmpUrl = item[urlItem] tmpItem = item[urlItem]
else: if tmpItem.strip() == '':
tmpUrl = item
if tmpUrl.strip() == "":
continue continue
elif re.search(torRegex, tmpUrl): elif re.search(torRegex, tmpItem):
_list['tor'].append(tmpUrl) _list['tor'].append(tmpItem)
elif re.search(i2pRegex, tmpUrl): elif re.search(i2pRegex, tmpItem):
_list['i2p'].append(tmpUrl) _list['i2p'].append(tmpItem)
elif re.search(lokiRegex, tmpUrl): elif re.search(lokiRegex, tmpItem):
_list['loki'].append(tmpUrl) _list['loki'].append(tmpItem)
else: else:
_list['clearnet'].append(tmpUrl) _list['clearnet'].append(tmpItem)
else: else:
for i in range(config.networks.length): for i in range(len(config['networks']) - 1):
# The expected order is the same as in config.json. If the frontend doesn't have any instances for a specified network, use None # 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: if urlItem != None:
for item in rJson: for item in rJson:
if network in item: if network in item:
if item[network].strip() != "": if item[network].strip() != '':
_list[config.networks[i]].append(item[urlItem[i]]) _list[config['networks'][i]].append(item[urlItem[i]])
mightyList[frontend] = _list mightyList[frontend] = _list
print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + name) print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + name)
@ -158,7 +158,7 @@ def fetchRegexList(frontend, name, url, regex):
try: try:
r = requests.get(url) r = requests.get(url)
_list = {} _list = {}
for network in config.networks: for network in config['networks']:
_list[network] = [] _list[network] = []
tmp = re.findall(regex, r.text) tmp = re.findall(regex, r.text)
@ -185,7 +185,7 @@ def fetchTextList(frontend, name, url, prepend):
tmp = r.text.strip().split('\n') tmp = r.text.strip().split('\n')
_list = {} _list = {}
for network in config.networks: for network in config['networks']:
_list[network] = [] _list[network] = []
for item in tmp: for item in tmp:
@ -207,13 +207,14 @@ def fetchTextList(frontend, name, url, prepend):
def invidious(): def invidious():
name = 'Invidious' name = 'Invidious'
frontend = 'invidious' frontend = 'invidious'
url = 'https://api.invidious.io/instances.json'
try: try:
_list = {} _list = {}
_list['clearnet'] = [] _list['clearnet'] = []
_list['tor'] = [] _list['tor'] = []
_list['i2p'] = [] _list['i2p'] = []
_list['loki'] = [] _list['loki'] = []
r = requests.get('https://api.invidious.io/instances.json') r = requests.get(url)
rJson = json.loads(r.text) rJson = json.loads(r.text)
for instance in rJson: for instance in rJson:
if instance[1]['type'] == 'https': if instance[1]['type'] == 'https':
@ -256,11 +257,11 @@ def piped():
def pipedMaterial(): def pipedMaterial():
fetchRegexList('pipedMaterial', 'Piped-Material', 'https://raw.githubusercontent.com/mmjee/Piped-Material/master/README.md', r"\| (https?:\/{2}(?:\S+\.)+[a-zA-Z0-9]*) +\|") fetchRegexList('pipedMaterial', 'Piped-Material', 'https://raw.githubusercontent.com/mmjee/Piped-Material/master/README.md', r"\| (https?:\/{2}(?:\S+\.)+[a-zA-Z0-9]*) +\| Production")
def cloudtube(): def cloudtube():
fetchCache('cloudtube', 'Cloudtube') fetchFromFile('cloudtube', 'Cloudtube')
def proxitok(): def proxitok():