localhost_frssoft
/
funkwlmpv
mirror of https://gitea.phreedom.club/localhost_frssoft/funkwlmpv
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix some checks when try connect

This commit is contained in:
localhost_frssoft 2023-06-13 01:58:52 +03:00
parent 03ff52fcec
commit 9f37a52a64
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
funkwhale_cli.py
View File

@ -45,8 +45,9 @@ def main():
instance_title = i.get('value') instance_title = i.get('value')
instance_stats = [] instance_stats = []
for k, v in ins_nodeinfo['metadata']['library'].items(): for k, v in ins_nodeinfo['metadata']['library'].items():
if k == 'anonymousCanListen' and v == False: if k == 'anonymousCanListen' and v == False and not current_instance.s.headers.get('Authorization'):
instance_stats.append(f'!!! {k}: {v} !!!') instance_stats.append(f'!!! {k}: {v} !!!')
menu = ['Switch instance', 'About instance']
continue continue
instance_stats.append(f'{k}: {v}') instance_stats.append(f'{k}: {v}')
instance_stats.append(ins_nodeinfo['software']['version']) instance_stats.append(ins_nodeinfo['software']['version'])
@ -54,8 +55,8 @@ def main():
main_menu_header = quote(f'''{instance_title}\n{instance_stats}'''.strip()) main_menu_header = quote(f'''{instance_title}\n{instance_stats}'''.strip())
except Exception as E: except Exception as E:
time.sleep(1) splitted = ':\n'.join(str(E).split(':'))
main_menu_header = quote(f'''Connection failed: {E}'''.strip()) main_menu_header = quote(f'''Connection failed:\n{splitted}'''.strip())
menu = ['Switch instance'] menu = ['Switch instance']
if not current_instance.s.headers.get('Authorization'): if not current_instance.s.headers.get('Authorization'):

1
src/fw_api.py
View File

@ -68,7 +68,6 @@ def get_me():
return resp return resp
@logger.catch
def get_instance_settings(): def get_instance_settings():
r = current_instance.s.get( r = current_instance.s.get(
f'https://{current_instance.instance}/api/v1/instance/settings') f'https://{current_instance.instance}/api/v1/instance/settings')