Skip to content

Show file size in proper units. #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Show file size in proper units. #54

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30f3549
Show file size in proper units.
Jul 28, 2020
6685e76
Change kB to KB.
Jul 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions gogrepo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -781,10 +781,21 @@ def cmd_download(savedir, skipextras, skipgames, skipids, dryrun, id):
work_dict = dict()

# util
def kibs(b):
return '%.1fKB' % (b / float(1024))
def megs(b):
return '%.1fMB' % (b / float(1024**2))
def gigs(b):
return '%.2fGB' % (b / float(1024**3))
def auto_size(b):
if b > 1024**3:
return gigs(b)
elif b > 1024**2:
return megs(b)
elif b > 1024:
return kibs(b)
else:
return '%dB' % (b)

if id:
id_found = False
Expand Down Expand Up @@ -880,7 +891,7 @@ def gigs(b):
work.put(work_dict[work_item])

if dryrun:
info("{} left to download".format(gigs(sum(sizes.values()))))
info("{} left to download".format(auto_size(sum(sizes.values()))))
return # bail, as below just kicks off the actual downloading

info('-'*60)
Expand Down Expand Up @@ -943,10 +954,10 @@ def progress():
szs, ts = flows.get(tid, (0, 0))
flows[tid] = sz + szs, t + ts
bps = sum(szs/ts for szs, ts in list(flows.values()) if ts > 0)
info('%10s %8.1fMB/s %2dx %s' % \
(megs(sizes[path]), bps / 1024.0**2, len(flows), "%s/%s" % (os.path.basename(os.path.split(path)[0]), os.path.split(path)[1])))
info('%10s %s/s %2dx %s' % \
(auto_size(sizes[path]), auto_size(bps), len(flows), "%s/%s" % (os.path.basename(os.path.split(path)[0]), os.path.split(path)[1])))
if len(rates) != 0: # only update if there's change
info('%s remaining' % gigs(left))
info('%s remaining' % auto_size(left))
rates.clear()

# process work items with a thread pool
Expand Down