From 25217ae98ff200927b5c94b475849b0b3ede3df7 Mon Sep 17 00:00:00 2001 From: localhost_frssoft Date: Wed, 28 Jun 2023 23:48:45 +0300 Subject: [PATCH 1/3] increase timeout in fetching info instances --- src/fw_instances.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fw_instances.py b/src/fw_instances.py index e651abf..b1faded 100644 --- a/src/fw_instances.py +++ b/src/fw_instances.py @@ -78,7 +78,7 @@ def fetch_instances_nodeinfo_and_avalaibility(instances): headers={ 'Accept-Encoding': 'gzip, brotli, deflate', 'User-Agent': 'funkwhale-cli/latest-commit; +https://git.phreedom.club/localhost_frssoft/funkwhale-cli'}, - timeout=5).json() + timeout=10).json() with concurrent.futures.ThreadPoolExecutor() as executor: # optimally defined number of threads res = [executor.submit(request_nodeinfo, instance) for instance in instances] From 808e94a8ac468b12a5e5b4a92ad9568b4881ada3 Mon Sep 17 00:00:00 2001 From: localhost_frssoft Date: Thu, 29 Jun 2023 00:02:18 +0300 Subject: [PATCH 2/3] Add new instance via menu --- src/fw_instances.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/fw_instances.py b/src/fw_instances.py index b1faded..2fd1d65 100644 --- a/src/fw_instances.py +++ b/src/fw_instances.py @@ -115,7 +115,8 @@ def instances_menu(fetch_manually=False, fetch_node_info=False): list_instances = fetch_instances_nodeinfo_and_avalaibility([instance.split('|')[0].strip() for instance in list_instances.keys()]) settings.set_config('public_list_instances_extended', list_instances) map_in_extend_mode = '\nmap: instance | anonymousCanListen | tracks' - instance_menu_selector = ['Fetch new instances', + instance_menu_selector = ['Add new instance', + 'Fetch new instances', 'Fetch nodeinfo and avalaibility', 'Remove unreachible instances', 'Shuffle'] @@ -128,6 +129,11 @@ def instances_menu(fetch_manually=False, fetch_node_info=False): return else: instance = instance[0].split('|')[0].strip() + if instance == 'Add new instance': + new = input('example.com\n').strip() + list_instances[new] = 'added by user' + settings.set_config('public_list_instances_extended', list_instances) + instance = new if instance == 'Fetch new instances': return instances_menu(fetch_manually=True) if instance == 'Fetch nodeinfo and avalaibility': From 96ce6e6e0d7af72b3532f798d9d8a4800fcb3be3 Mon Sep 17 00:00:00 2001 From: localhost_frssoft Date: Thu, 29 Jun 2023 00:03:34 +0300 Subject: [PATCH 3/3] default config: removed some non-response instances --- src/settings.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/settings.py b/src/settings.py index e88d133..8150cbb 100644 --- a/src/settings.py +++ b/src/settings.py @@ -12,14 +12,11 @@ default_conf = { 'public_list_instances_extended': { "open.audio": None, - "funkwhale.co.uk": None, - "am.pirateradio.social": None, "audio.liberta.vip": None, - "audio.gafamfree.party": None, + "dance.with.tewi.and.reisen": None, "tanukitunes.com": None, "funkwhale.juniorjpdj.pl": None, "audio.securetown.in.ua": None, - "tavia.mle.party": None, "funkwhale.thurk.org": None, "buzzworkers.com": None, "soundship.de": None, @@ -31,13 +28,11 @@ default_conf = { "mizik.o-k-i.net": None, "klh.radiolivre.org": None, "hudba.feildel.fr": None, - "funkwhale.mita.me": None, "funk.deko.cloud": None, "audio.graz.social": None, "funkwhale.desmu.fr": None, "listen.knsm.cc": None, "funkwhale.gegeweb.eu": None, - "shitnoise.monster": None, }, 'automatic_fetch_new_instances': False, 'enable_server_transcoding': False,