.icon.txt

@@ -1,14 +0,0 @@
-     .'''...        ..''''.     
-      '''''''......'''''''      
-         ''''''''''''''.        
-             .''''.             
-              .''.              
-              .''.              
-:u,  'uu  .uu.    .uu.  :u'  .uu
-.oo   oo,   uo;'';oo.  .oo   uo,
- :o;   uo;.          .,oo   ;ou 
-  :o:.   uo;'......';oo    ;o:  
-   .ou,.     ,oooo;     .,uo.   
-      :o:,..        ..':ou      
-          oou:;;;;:uoo          
-              'uu'              

funkwhale_cli.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from src.fw_api import current_instance, get_instance_settings, get_node_info
+from src.fw_api import current_instance, get_instance_settings
 from src.fw_radios import list_radios
 from src.fw_artists import list_artists
 from src.fw_albums import list_albums
@@ -13,15 +13,10 @@ import src.mpv_control
 import json
 import os
 from shlex import quote
-from shutil import get_terminal_size
 from pyfzf.pyfzf import FzfPrompt
 
 fzf = FzfPrompt()
 
-os.system('clear')
-if get_terminal_size().columns > 32:
-    print('\n\n')
-    os.system('cat .icon.txt')
 
 def main():
 
@@ -39,9 +34,12 @@ def main():
                 'About instance',
                 'Switch instance']
         try:
-            ins_nodeinfo = get_node_info()
-            support_message = ins_nodeinfo['metadata']['instanceSupportMessage']
-            instance_title = ins_nodeinfo['metadata']['nodeName']
+            ins_settings, ins_nodeinfo = get_instance_settings()
+            for i in ins_settings:
+                if i.get('name') == 'support_message':
+                    support_message = i.get('value')
+                if i.get('name') == 'name':
+                    instance_title = i.get('value')
             instance_stats = []
             for k, v in ins_nodeinfo['metadata']['library'].items():
                 if k == 'anonymousCanListen' and v == False and not current_instance.s.headers.get('Authorization'):
@@ -132,7 +130,6 @@ Insert token from "Access token" here''')
         if selected == 'Donate':
             os.system(f'less <<EOF\nSupport instance message:\n{support_message}\nEOF')
         if selected == 'About instance':
-            ins_settings = get_instance_settings()
             about_instance_info = []
             for i in ins_settings:
                 k, v = i.get('verbose_name'), i.get('value')

src/fw_api.py

@@ -62,7 +62,6 @@ def get_me():
     if not current_instance.token:
         return
     r = current_instance.s.get(f'https://{current_instance.instance}/api/v1/users/me')
-    r.raise_for_status()
     resp = r.json()
     current_instance.listen_token = resp['tokens']['listen']
     return resp
@@ -71,14 +70,9 @@ def get_me():
 def get_instance_settings():
     r = current_instance.s.get(
         f'https://{current_instance.instance}/api/v1/instance/settings')
-    return r.json()
-
-
-def get_node_info():
-    r = current_instance.s.get(
+    r_node = current_instance.s.get(
         f'https://{current_instance.instance}/api/v1/instance/nodeinfo/2.0/')
-    r.raise_for_status()
-    return r.json()
+    return r.json(), r_node.json()
 
 
 @logger.catch