voussoir/cmd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use pathclass's assert_disk_space.

Browse source
This commit is contained in:
voussoir 2022-01-19 21:00:41 -08:00
parent a6c3992764
commit ddfead3ecb
No known key found for this signature in database
GPG key ID: 5F7554F8C26DACCB
1 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
rarpar.py
View file

@ -144,23 +144,13 @@ def PARCOMMAND(workdir, basename, par):
] ]
return command return command
def assert_enough_space(pathsize, drive, rec, rev, par): def assert_enough_space(path, size, rec, rev, par):
plus_percent = (rec + rev + par) / 100 plus_percent = (rec + rev + par) / 100
needed = pathsize * (1 + plus_percent) needed = size * (1 + plus_percent)
reserve = RESERVE_SPACE_ON_DRIVE + needed reserve = RESERVE_SPACE_ON_DRIVE + needed
reserve = int(reserve)
free_space = shutil.disk_usage(drive.absolute_path).free path.assert_disk_space(reserve)
if reserve <= free_space:
return
message = ' '.join([
f'For {bytestring.bytestring(pathsize)},',
f'reserve {bytestring.bytestring(reserve)}.',
f'Only {bytestring.bytestring(free_space)} available',
f'on {drive.absolute_path}.',
])
raise NotEnoughSpace(message)
def move(pattern, directory): def move(pattern, directory):
files = winglob.glob(pattern) files = winglob.glob(pattern)
@ -377,16 +367,16 @@ def rarpar(
if RESERVE_SPACE_ON_DRIVE: if RESERVE_SPACE_ON_DRIVE:
assert_enough_space( assert_enough_space(
pathsize, path=workdir,
drive=workdir.drive, size=pathsize,
rec=rec or 0, rec=rec or 0,
rev=rev or 0, rev=rev or 0,
par=par or 0, par=par or 0,
) )
if RESERVE_SPACE_ON_DRIVE and moveto is not None: if RESERVE_SPACE_ON_DRIVE and moveto is not None:
assert_enough_space( assert_enough_space(
pathsize, path=moveto,
drive=moveto.drive, size=pathsize,
rec=rec or 0, rec=rec or 0,
rev=rev or 0, rev=rev or 0,
par=par or 0, par=par or 0,
@ -548,7 +538,7 @@ def rarpar_argparse(args):
solid=args.solid, solid=args.solid,
workdir=args.workdir, workdir=args.workdir,
) )
except (RarExists, NotEnoughSpace) as exc: except (RarExists, pathclass.NotEnoughSpace) as exc:
log.fatal(exc) log.fatal(exc)
status = 1 status = 1