diff options
| author | Ondrej Holy <oholy@redhat.com> | 2020-10-05 15:02:06 +0200 |
|---|---|---|
| committer | António Fernandes <antoniojpfernandes@gmail.com> | 2021-01-18 00:12:22 +0000 |
| commit | d4d59231329efd692bc3498949ed79b4137c059b (patch) | |
| tree | 349996171b3f575d581de4c6df2aa290613e02b6 | |
| parent | b6f22a50ec14436688600523af6f7c1b04700aec (diff) | |
| download | nautilus-d4d59231329efd692bc3498949ed79b4137c059b.tar.gz | |
file-operations: Do not report remaining time if progress is not reported
Some GVfs backends doesn't report progress except the total file size. With
the previous patch applied, the remaining time is calculated after each
successfully transfered file for such backends. This is fine for small files,
but looks weird for big files as the estimated time is not updated regularly,
so it looks like hang. One possible solution would be to update the remaining
time periodically even if progress is not reported from GIO. However, this
could again lead to situations, which would look like that the transfer is
hanged. Let's do not report remaining time at all when progress is not reported
to reduce confusion.
| -rw-r--r-- | src/nautilus-file-operations.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/nautilus-file-operations.c b/src/nautilus-file-operations.c index 5b10c9e03..0294d6a8b 100644 --- a/src/nautilus-file-operations.c +++ b/src/nautilus-file-operations.c @@ -188,6 +188,15 @@ typedef struct OpKind op; guint64 last_report_time; int last_reported_files_left; + + /* + * This is used when reporting progress for copy/move operations to not show + * the remaining time. This is needed because some GVfs backends doesn't + * report progress from those operations. Consequently it looks like that it + * is hanged when the remaining time is not updated regularly. See: + * https://gitlab.gnome.org/GNOME/nautilus/-/merge_requests/605 + */ + gboolean partial_progress; } TransferInfo; typedef struct @@ -4152,7 +4161,8 @@ report_copy_progress (CopyMoveJob *copy_job, } if (elapsed < SECONDS_NEEDED_FOR_RELIABLE_TRANSFER_RATE || - transfer_rate == 0) + transfer_rate == 0 || + !transfer_info->partial_progress) { if (source_info->num_files == 1) { @@ -5184,6 +5194,12 @@ copy_file_progress_callback (goffset current_num_bytes, pdata = user_data; + if (current_num_bytes != 0 && + current_num_bytes != total_num_bytes) + { + pdata->transfer_info->partial_progress = TRUE; + } + new_size = current_num_bytes - pdata->last_size; if (new_size > 0) |