Compare commits

...

2 Commits

2 changed files with 10 additions and 7 deletions

View File

@ -123,8 +123,7 @@ def radio_load(id_radio=None, type_radio='custom', name=None, related_object=Non
select = fzf.prompt(player_items_menu, select = fzf.prompt(player_items_menu,
f"--header=\'Radio {name} playing...\'")[0] f"--header=\'Radio {name} playing...\'")[0]
if select == 'Next': if select == 'Next':
playlist_remaining = len( playlist_remaining = player.playlist_count - player.playlist_current_pos
player.playlist) - player.playlist_current_pos
if playlist_remaining <= 2: if playlist_remaining <= 2:
threading.Thread(target=radio_get_track, args=( threading.Thread(target=radio_get_track, args=(
radio_session_id,), daemon=True).start() radio_session_id,), daemon=True).start()

View File

@ -77,22 +77,26 @@ def waiting_load_observer(_name, value):
@logger.catch @logger.catch
def universal_observer(_name, value): def universal_observer(_name, value):
if value: if value:
percent = int(value)
if player.audio_bitrate: if player.audio_bitrate:
kbps = round(player.audio_bitrate/1024, 1) kbps = int(player.audio_bitrate/1024)
else: else:
kbps = '?' kbps = '?'
percent = int(value)
if player.file_size: if player.file_size:
track_size = round(player.file_size/1024/1024, 1) track_size = round(player.file_size/1024/1024, 1)
else: else:
track_size = '?' track_size = '?'
if player.cache_speed: if player.cache_speed:
cache_speed = round(player.cache_speed/1024/1024*8, 1) cache_speed = int(player.cache_speed/1024/1024*8)
cache_speed = f'| caching: ~{cache_speed}Mbit/s' cache_speed = f'| ~{cache_speed}Mbit/s'
else: else:
cache_speed = '' cache_speed = ''
if player.playlist_count > -1:
player_pos = f'{player.playlist_current_pos}/{player.playlist_count}'
else:
player_pos = '-/-'
print_there(2, 2, f'\r'+' '*get_terminal_size().columns) print_there(2, 2, f'\r'+' '*get_terminal_size().columns)
print_there(2, 2, f'\r{kbps} kbps | {percent}% | {track_size}MB {cache_speed}') print_there(2, 2, f'\r{player_pos} | {kbps} kbps | {percent}% | {track_size}MB {cache_speed}')
time.sleep(1) time.sleep(1)