napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[unpacks] PARTIAL conversion to newer API with callback

Browse Source
This commit is contained in:
Adriaan de Groot 2021-11-05 16:33:10 +01:00
parent b9691c339e
commit c79bb3cd10
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/modules/unpackfs/main.py
View File

@ -167,11 +167,6 @@ def file_copy(source, entry, progress_cb):
dest = entry.destination
# Environment used for executing rsync properly
# Setting locale to C (fix issue with tr_TR locale)
at_env = os.environ
at_env["LC_ALL"] = "C"
# `source` *must* end with '/' otherwise a directory named after the source
# will be created in `dest`: ie if `source` is "/foo/bar" and `dest` is
# "/dest", then files will be copied in "/dest/bar".
@ -189,20 +184,20 @@ def file_copy(source, entry, progress_cb):
for f in entry.exclude:
args.extend(["--exclude", f])
args.extend(['--progress', source, dest])
process = subprocess.Popen(
args, env=at_env,
stdout=subprocess.PIPE, close_fds=ON_POSIX
)
# last_num_files_copied trails num_files_copied, and whenever at least 107 more
# files (file_count_chunk) have been copied, progress is reported and
# last_num_files_copied is updated. The chunk size isn't "tidy"
# so that all the digits of the progress-reported number change.
#
last_num_files_copied = 0
last_timestamp_reported = time.time()
file_count_chunk = 107
for line in iter(process.stdout.readline, b''):
class counter(object):
last_num_files_copied = 0
last_timestamp_reported = time.time()
last_total_reported = 0
def output_cb(line):
# rsync outputs progress in parentheses. Each line will have an
# xfer and a chk item (either ir-chk or to-chk) as follows:
#
@ -216,7 +211,7 @@ def file_copy(source, entry, progress_cb):
# If you're copying directory with some links in it, the xfer#
# might not be a reliable counter (for one increase of xfer, many
# files may be created).
m = re.findall(r'xfr#(\d+), ..-chk=(\d+)/(\d+)', line.decode())
m = re.findall(r'xfr#(\d+), ..-chk=(\d+)/(\d+)', line)
if m:
# we've got a percentage update
@ -226,13 +221,14 @@ def file_copy(source, entry, progress_cb):
num_files_copied = num_files_total_local - num_files_remaining
now = time.time()
if (num_files_copied - last_num_files_copied >= file_count_chunk) or (now - last_timestamp_reported > 0.5):
last_num_files_copied = num_files_copied
last_timestamp_reported = now
if (num_files_copied - counter.last_num_files_copied >= file_count_chunk) or (now - counter.last_timestamp_reported > 0.5):
counter.last_num_files_copied = num_files_copied
counter.last_timestamp_reported = now
counter.last_total_reported = num_files_total_local
progress_cb(num_files_copied, num_files_total_local)
process.wait()
progress_cb(num_files_copied, num_files_total_local) # Push towards 100%
libcalamares.utils.host_env_process_output(args, output_cb)
progress_cb(counter.last_num_files_copied, counter.last_total_reported) # Push towards 100%
# Mark this entry as really done
entry.copied = entry.total