diff --git a/funkwhale_cli.py b/funkwhale_cli.py index fb873dc..ddf00cc 100755 --- a/funkwhale_cli.py +++ b/funkwhale_cli.py @@ -16,6 +16,7 @@ from shlex import quote from shutil import get_terminal_size from pyfzf.pyfzf import FzfPrompt +os.environ['FZF_DEFAULT_OPTS'] = "--margin 2,0,0,0 --preview-window down:2:hidden:wrap --bind ?:toggle-preview --preview 'echo {}'" fzf = FzfPrompt() os.system('clear') diff --git a/src/fw_api.py b/src/fw_api.py index dab722b..ab94f21 100644 --- a/src/fw_api.py +++ b/src/fw_api.py @@ -87,10 +87,11 @@ def get_node_info(): @logger.catch def get_audio_file(track_uuid, listen_url=False, download=False, external_transcoding=get_config('external_transcoder_http_proxy_path'), - transcoding=get_config('enable_server_transcoding'), to='ogg'): + transcoding=get_config('enable_server_transcoding'), to='ogg', max_bitrate=128): params = { "download": download, - "to": to + "to": to, + "max_bitrate": max_bitrate } if current_instance.token and not current_instance.listen_token: get_me() @@ -99,6 +100,7 @@ def get_audio_file(track_uuid, listen_url=False, download=False, if not transcoding: del params['to'] + del params['max_bitrate'] if listen_url: url = f'https://{current_instance.instance}{track_uuid}?' else: diff --git a/src/mpv_control.py b/src/mpv_control.py index a2705d5..e8c2bfd 100644 --- a/src/mpv_control.py +++ b/src/mpv_control.py @@ -8,9 +8,7 @@ from shlex import quote import mpv import time import re -import os -os.environ['FZF_DEFAULT_OPTS'] = '--margin 2,0,0,0' fzf = FzfPrompt() if get_config('enable_persistent_cache'):