PublicMirrors/you-get
1
0
Fork 0
mirror of https://github.com/soimort/you-get.git synced 2025-02-03 00:33:58 +03:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Revert pull request #898

Browse Source
This commit is contained in:
Mort Yao 2016-02-04 20:29:03 +01:00
parent 9c0abc6c64
commit 966840e22a
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/you_get/common.py
View File

@ -541,7 +541,8 @@ def url_save_chunked(url, filepath, bar, refer = None, is_part = False, faker =
os.rename(temp_filepath, filepath) os.rename(temp_filepath, filepath)
class SimpleProgressBar: class SimpleProgressBar:
term_size = term.get_terminal_size()[1] bar_size = term.get_terminal_size()[1] - 42
bar = '{0:>5}% ({1:>5}/{2:<5}MB) ├{3:─<' + str(bar_size) + '}┤[{4}/{5}] {6}'
def __init__(self, total_size, total_pieces = 1): def __init__(self, total_size, total_pieces = 1):
self.displayed = False self.displayed = False
@ -552,12 +553,6 @@ class SimpleProgressBar:
self.speed = '' self.speed = ''
self.last_updated = time.time() self.last_updated = time.time()
total_pieces_len = len(str(total_pieces))
# 38 is the size of all statically known size in self.bar
self.bar_size = self.term_size - 38 - 2*total_pieces_len
self.bar = '{0:>5}%% ({1:>5}/{2:<5}MB) ├{3:─<%s}┤[{4:>%s}/{5:>%s}] {6}' % (
self.bar_size, total_pieces_len, total_pieces_len)
def update(self): def update(self):
self.displayed = True self.displayed = True
bar_size = self.bar_size bar_size = self.bar_size
@ -693,13 +688,11 @@ def download_urls(urls, title, ext, total_size, output_dir='.', refer=None, merg
if len(urls) == 1: if len(urls) == 1:
url = urls[0] url = urls[0]
print('Downloading %s ...' % tr(output_filename)) print('Downloading %s ...' % tr(output_filename))
bar.update()
url_save(url, output_filepath, bar, refer = refer, faker = faker, headers = headers) url_save(url, output_filepath, bar, refer = refer, faker = faker, headers = headers)
bar.done() bar.done()
else: else:
parts = [] parts = []
print('Downloading %s.%s ...' % (tr(title), ext)) print('Downloading %s.%s ...' % (tr(title), ext))
bar.update()
for i, url in enumerate(urls): for i, url in enumerate(urls):
filename = '%s[%02d].%s' % (title, i, ext) filename = '%s[%02d].%s' % (title, i, ext)
filepath = os.path.join(output_dir, filename) filepath = os.path.join(output_dir, filename)