emdee
/
toxygen
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

small fixes

This commit is contained in:
emdee 2022-10-03 07:18:24 +00:00
parent 2916d0cb04
commit ca9c6fc091
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
toxygen/app.py
View File

@ -823,6 +823,17 @@ class App:
# LOG.error(traceback.format_exc()) # LOG.error(traceback.format_exc())
# LOG.info("Connected status: " +repr(self._tox.self_get_connection_status())) # LOG.info("Connected status: " +repr(self._tox.self_get_connection_status()))
def loop(self, n):
"""
Im guessings - there are 3 sleeps - time, tox, and Qt
"""
interval = self._tox.iteration_interval()
for i in range(n):
self._tox.iterate()
QtCore.QThread.msleep(interval)
# NO QtCore.QCoreApplication.processEvents()
sleep(interval / 1000.0)
def _test_tox(self): def _test_tox(self):
self.test_net() self.test_net()
self._ms.log_console() self._ms.log_console()
@ -872,10 +883,8 @@ class App:
if status > 0: if status > 0:
LOG.info(f"Connected # {i}" +' : ' +repr(status)) LOG.info(f"Connected # {i}" +' : ' +repr(status))
break break
QtCore.QThread.msleep(3000)
# NO QtCore.QCoreApplication.processEvents()
LOG.trace(f"Connected status #{i}: {status!r}") LOG.trace(f"Connected status #{i}: {status!r}")
sleep(1) self.loop(2)
def _test_env(self): def _test_env(self):
_settings = self._settings _settings = self._settings
@ -899,11 +908,11 @@ class App:
lElts = _settings['current_nodes'] lElts = _settings['current_nodes']
elif _settings['network'] in ['local', 'newlocal']: elif _settings['network'] in ['local', 'newlocal']:
lElts = lLOCAL lElts = lLOCAL
elif _settings['network'] == 'old': elif _settings['network'] in ['main', 'old']:
lElts = lGOOD lElts = lGOOD
elif 'proxy_type' not in _settings or _settings['proxy_type'] == 0 or \ elif 'proxy_type' not in _settings or _settings['proxy_type'] == 0 or \
not _settings['proxy_host'] or not _settings['proxy_port']: not _settings['proxy_host'] or not _settings['proxy_port']:
lElts = lNEW lElts = lGOOD
else: else:
lElts = lRELAYS lElts = lRELAYS
env['lElts'] = lElts env['lElts'] = lElts
@ -917,7 +926,8 @@ class App:
#shuffle(env['lElts']) #shuffle(env['lElts'])
LOG.debug(f"_test_bootstrap #Elts={len(lElts)}") LOG.debug(f"_test_bootstrap #Elts={len(lElts)}")
LOG.trace(f"_test_bootstrap lElts={lElts[:10]}") LOG.trace(f"_test_bootstrap lElts={lElts[:10]}")
for host,port,key in lElts[:10]: shuffle(env['lElts'])
for host,port,key in lElts[:8]:
try: try:
assert len(key) == 64, key assert len(key) == 64, key
assert len(host) <= 16, host assert len(host) <= 16, host

4
toxygen/main.py
View File

@ -271,8 +271,8 @@ def main_parser():
parser.add_argument('--download_nodes_url', type=str, parser.add_argument('--download_nodes_url', type=str,
default='https://nodes.tox.chat/json') default='https://nodes.tox.chat/json')
parser.add_argument('--network', type=str, parser.add_argument('--network', type=str,
choices=['old', 'new', 'local', 'newlocal'], choices=['old', 'main', 'new', 'local', 'newlocal'],
default='new') default='old')
parser.add_argument('--video_input', type=str, parser.add_argument('--video_input', type=str,
default=-1, default=-1,
choices=default_video['output_devices'], choices=default_video['output_devices'],