mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
chore(maint): remove deprecated update-nodelist tool
nodelist is now stored directly in JSON format, since 1f2bdf3a1b
This commit is contained in:
Anthony Bilinski
parent
685ae8ad6f
commit
922fd58af6
|
|
@ -172,7 +172,7 @@ Follow steps for adding translations from Weblate up to step 5. Next:
|
|||
1.11.0`
|
||||
- Update toxcore version number to the latest tag. Currently this needs to be
|
||||
done manually by `grep`ing for the current tag.
|
||||
- Update the bootstrap nodelist using the [`./tools/update-nodelist.py`] script.
|
||||
- Update the bootstrap nodelist at `./res/nodes.json` from https://nodes.tox.chat/json.
|
||||
- Generate changelog with `clog`.
|
||||
- In a `MAJOR`/`MINOR` release tag should include information that changelog
|
||||
is located in the `CHANGELOG.md` file, e.g. `For details see CHANGELOG.md`
|
||||
|
|
|
|||
|
|
@ -1,161 +0,0 @@
|
|||
#!/usr/bin/env python
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
# Copyright © 2017-2018 The qTox Project Contributors
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# 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
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import re
|
||||
import sys
|
||||
import json
|
||||
import codecs
|
||||
import random
|
||||
|
||||
|
||||
# PEP-3108
|
||||
try:
|
||||
from urllib.request import Request as Request
|
||||
from urllib.request import build_opener as build_opener
|
||||
except ImportError:
|
||||
from urllib2 import Request as Request
|
||||
from urllib2 import build_opener as build_opener
|
||||
|
||||
|
||||
# PEP-469
|
||||
try:
|
||||
dict.iteritems
|
||||
except AttributeError:
|
||||
def iteritems(d):
|
||||
return iter(d.items())
|
||||
else:
|
||||
def iteritems(d):
|
||||
return d.iteritems()
|
||||
|
||||
|
||||
def getNodeList():
|
||||
url = "https://nodes.tox.chat/json"
|
||||
|
||||
headers = {
|
||||
"Accept" : "application/json",
|
||||
"User-Agent" : "tox.pkg"
|
||||
}
|
||||
|
||||
request = Request(url, None, headers)
|
||||
opener = build_opener()
|
||||
result = opener.open(request, timeout = 5)
|
||||
code = result.getcode()
|
||||
|
||||
if code != 200:
|
||||
raise RuntimeError("HTTP-{0}".format(code))
|
||||
|
||||
def _json_convert(input):
|
||||
if isinstance(input, dict):
|
||||
return dict([(_json_convert(key), _json_convert(value)) for key, value in iteritems(input)])
|
||||
elif isinstance(input, list):
|
||||
return [_json_convert(element) for element in input]
|
||||
elif isinstance(input, unicode):
|
||||
return input.encode("utf-8")
|
||||
else:
|
||||
return input
|
||||
|
||||
if sys.version_info < (3, 0):
|
||||
result = json.load(result, object_hook = _json_convert)
|
||||
else:
|
||||
result = json.load(codecs.getreader("utf-8")(result))
|
||||
|
||||
return result
|
||||
|
||||
|
||||
def parseNodeList(nodes):
|
||||
result = []
|
||||
|
||||
ipv4re = re.compile("^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$")
|
||||
ipv6re = re.compile("^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$")
|
||||
fqdn_re = re.compile("^((?=[a-z0-9-]{1,63}\.)(xn--)?[a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,63}$")
|
||||
pkre = re.compile("^[0-9a-fA-F]{64}$")
|
||||
|
||||
for node in nodes:
|
||||
ipv4 = str(node["ipv4"])
|
||||
ipv6 = str(node["ipv6"]).lower()
|
||||
port = int(node["port"])
|
||||
public_key = str(node["public_key"]).upper()
|
||||
maintainer = str(node["maintainer"])
|
||||
udp_status = str(node["status_udp"]).lower()
|
||||
tcp_status = str(node["status_tcp"]).lower()
|
||||
tcp_ports = node["tcp_ports"]
|
||||
|
||||
if udp_status != "true" or tcp_status != "true":
|
||||
continue
|
||||
if not ipv4re.match(ipv4) and not fqdn_re.match(ipv4):
|
||||
ipv4 = None
|
||||
if not ipv6re.match(ipv6) and not fqdn_re.match(ipv6):
|
||||
ipv6 = None
|
||||
if not (ipv4 or ipv6):
|
||||
continue
|
||||
if port < 1 or port > 65535:
|
||||
continue
|
||||
if not pkre.match(public_key):
|
||||
continue
|
||||
|
||||
if ipv4:
|
||||
item = {
|
||||
"address" : ipv4,
|
||||
"port" : port,
|
||||
"public_key" : public_key,
|
||||
"maintainer" : maintainer
|
||||
}
|
||||
|
||||
result.append(item)
|
||||
|
||||
if ipv6 and ipv6 != ipv4:
|
||||
item = {
|
||||
"address" : ipv6,
|
||||
"port" : port,
|
||||
"public_key" : public_key,
|
||||
"maintainer" : maintainer
|
||||
}
|
||||
|
||||
result.append(item)
|
||||
|
||||
return result
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
out_file = open("res/settings.ini", "w+")
|
||||
try:
|
||||
nodes = getNodeList();
|
||||
nodes = nodes["nodes"]
|
||||
nodes = parseNodeList(nodes)
|
||||
|
||||
if len(nodes) == 0:
|
||||
raise RuntimeError("Empty node list")
|
||||
|
||||
random.shuffle(nodes)
|
||||
|
||||
result = ""
|
||||
result += "[DHT%20Server]\n"
|
||||
result += "dhtServerList\\size={0}\n".format(len(nodes))
|
||||
|
||||
index = 0
|
||||
for node in nodes:
|
||||
index += 1
|
||||
result += "dhtServerList\\{0}\\name={1}\n".format(index, node["maintainer"])
|
||||
result += "dhtServerList\\{0}\\userId={1}\n".format(index, node["public_key"])
|
||||
result += "dhtServerList\\{0}\\address={1}\n".format(index, node["address"])
|
||||
result += "dhtServerList\\{0}\\port={1}\n".format(index, node["port"])
|
||||
|
||||
out_file.write(result)
|
||||
except Exception as e:
|
||||
sys.stderr.write("{0}\n".format(e))
|
||||
sys.exit(1)
|
||||
Loading…
Reference in New Issue
Block a user