Set some timeouts for initial connection to instance

funkwhale_cli.py

@@ -91,13 +91,17 @@ def main():
         if selected == 'Switch instance':
             with open('config.json', 'rt') as f:
                 conf = json.loads(f.read())
-                public_server_list_instances = settings.get_new_funkwhale_servers()
+                if conf.get('automatic_fetch_new_instances'):
-                new_ins_count = len(settings.get_new_funkwhale_servers())
+                    public_server_list_instances = settings.get_new_funkwhale_servers()
+                    new_ins_count = len(settings.get_new_funkwhale_servers())
+                else:
+                    public_server_list_instances = []
+                    new_ins_count = 'Disabled'
                 list_instances = conf.get(
                     'public_list_instances') + public_server_list_instances
                 settings.set_config('public_list_instances', list_instances)
                 instance = fzf.prompt(list_instances,
-                                      '--header='+quote(f'Select instance\nServer instances: +{new_ins_count}'))
+                                      '--header='+quote(f'Select instance\nNew instances: {new_ins_count}'))
                 if instance == []:
                     continue
                 else:

src/fw_api.py

@@ -48,7 +48,7 @@ class current_instance:
         current_instance.token = new_token
         current_instance.listen_token = None
         if new_token:
-            current_instance.s.get(f'https://{current_instance.instance}')
+            current_instance.s.get(f'https://{current_instance.instance}', timeout=30)
             current_instance.s.headers.update({"Authorization": "Bearer " + new_token})
 
 
@@ -56,7 +56,7 @@ if current_instance.token:
     current_instance.s.headers.update({"Authorization": "Bearer " + current_instance.token})
 else:
     # Get cookies from unauthorized instance for working some functionality (radios)
-    current_instance.s.get(f'https://{current_instance.instance}/')
+    current_instance.s.get(f'https://{current_instance.instance}/', timeout=30)
 
 
 @logger.catch
@@ -79,7 +79,8 @@ def get_instance_settings():
 
 def get_node_info():
     r = current_instance.s.get(
-        f'https://{current_instance.instance}/api/v1/instance/nodeinfo/2.0/')
+        f'https://{current_instance.instance}/api/v1/instance/nodeinfo/2.0/',
+        timeout=30)
     r.raise_for_status()
     return r.json()
 

src/settings.py

@@ -40,6 +40,7 @@ default_conf = {
         "funkwhale.gegeweb.eu",
         "shitnoise.monster"
     ],
+    'automatic_fetch_new_instances': True,
     'enable_server_transcoding': False,
     'external_transcoder_http_proxy_path': "",
     'track_activity_history': False,