Add progress bar for download track

This commit is contained in:
localhost_frssoft 2022-12-17 03:13:09 +03:00
parent a794cb4f5a
commit b835454f11
3 changed files with 18 additions and 7 deletions

View File

@ -126,9 +126,7 @@ def radio_load(id_radio=None, type_radio='custom', name=None, related_object=Non
else: else:
player.pause = True player.pause = True
elif select == 'Download': elif select == 'Download':
print('Downloading...')
name_downloaded = download_track(player.stream_open_filename) name_downloaded = download_track(player.stream_open_filename)
print(f'Downloaded: {name_downloaded}')
elif select == 'Info': elif select == 'Info':
track = player_fw_storage.storage.get(track_url_to_uuid()) track = player_fw_storage.storage.get(track_url_to_uuid())
for i in ('title', 'fid', 'license', 'album', 'artist'): for i in ('title', 'fid', 'license', 'album', 'artist'):

View File

@ -78,9 +78,7 @@ def player_menu(header='', storage={}):
else: else:
player.pause = True player.pause = True
elif select == 'Download': elif select == 'Download':
print('Downloading...')
name_downloaded = download_track(player.stream_open_filename) name_downloaded = download_track(player.stream_open_filename)
print(f'Downloaded: {name_downloaded}')
elif select == 'Info': elif select == 'Info':
track = player_fw_storage.storage.get(track_url_to_uuid()) track = player_fw_storage.storage.get(track_url_to_uuid())
for i in track.keys(): for i in track.keys():

View File

@ -1,4 +1,6 @@
import src.fw_api import src.fw_api
import sys
from urllib.parse import unquote from urllib.parse import unquote
@ -12,12 +14,25 @@ def get_remote_file_name(url):
def download_track(url, name=None): def download_track(url, name=None):
url = url.split('?')[0] # Stripe all params from url url = url.split('?')[0] # Stripe all params from url
r = src.fw_api.current_instance.s.get(url) r = src.fw_api.current_instance.s.get(url, stream=True)
if not name: if not name:
name = get_remote_file_name(url) name = get_remote_file_name(url)
if not name: if not name:
name = url.split(r'/')[-1] name = url.split(r'/')[-1]
with open(name.replace(r'/', '_'), 'wb') as f: with open(name.replace('/', '_'), 'wb') as f:
f.write(r.content) print(f"Downloading {name}")
total_length = r.headers.get('content-length')
if total_length is None: # no content length header
f.write(r.content)
else:
dl = 0
total_length = int(total_length)
for data in r.iter_content(chunk_size=4096):
dl += len(data)
f.write(data)
done = int(50 * dl / total_length)
sys.stdout.write("\r[%s%s]" % ('=' * done, ' ' * (50-done)) ) # base progress bar
sys.stdout.flush()
return name return name