mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 12:32:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

(copy_file_file): reduce variable scope, change order of progress update.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2024-09-08 21:03:54 +03:00
parent 64c6de4ab8
commit debd1ee8ce
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/filemanager/file.c
View File

@ -2656,23 +2656,17 @@ copy_file_file (file_op_context_t *ctx, const char *src_path, const char *dst_pa
if (return_status == FILE_CONT) if (return_status == FILE_CONT)
{ {
size_t bufsize;
off_t file_part = 0; off_t file_part = 0;
gint64 tv_current, tv_last_update; gint64 tv_last_update = ctx->transfer_start;
gint64 tv_last_input = 0; gint64 tv_last_input = 0;
gint64 usecs, update_usecs;
const char *stalled_msg = "";
gboolean is_first_time = TRUE; gboolean is_first_time = TRUE;
tv_last_update = ctx->transfer_start; const size_t bufsize = io_blksize (dst_stat);
bufsize = io_blksize (dst_stat);
buf = g_malloc (bufsize); buf = g_malloc (bufsize);
while (TRUE) while (TRUE)
{ {
ssize_t n_read = -1, n_written; ssize_t n_read = -1;
gboolean force_update;
/* src_read */ /* src_read */
if (mc_ctl (src_desc, VFS_CTL_IS_NOTREADY, 0) == 0) if (mc_ctl (src_desc, VFS_CTL_IS_NOTREADY, 0) == 0)
@ -2690,10 +2684,11 @@ copy_file_file (file_op_context_t *ctx, const char *src_path, const char *dst_pa
if (n_read == 0) if (n_read == 0)
break; break;
tv_current = g_get_monotonic_time (); const gint64 tv_current = g_get_monotonic_time ();
if (n_read > 0) if (n_read > 0)
{ {
ssize_t n_written;
char *t = buf; char *t = buf;
file_part += n_read; file_part += n_read;
@ -2739,8 +2734,7 @@ copy_file_file (file_op_context_t *ctx, const char *src_path, const char *dst_pa
ctx->copied_bytes = ctx->progress_bytes + file_part + ctx->do_reget; ctx->copied_bytes = ctx->progress_bytes + file_part + ctx->do_reget;
usecs = tv_current - tv_last_update; const gint64 usecs = tv_current - tv_last_update;
update_usecs = tv_current - tv_last_input;
if (is_first_time || usecs > FILEOP_UPDATE_INTERVAL_US) if (is_first_time || usecs > FILEOP_UPDATE_INTERVAL_US)
{ {
@ -2751,22 +2745,23 @@ copy_file_file (file_op_context_t *ctx, const char *src_path, const char *dst_pa
is_first_time = FALSE; is_first_time = FALSE;
if (update_usecs > FILEOP_STALLING_INTERVAL_US)
stalled_msg = _("(stalled)");
force_update = (tv_current - ctx->total_transfer_start) > FILEOP_UPDATE_INTERVAL_US;
if (verbose) if (verbose)
{ {
const gint64 total_usecs = tv_current - ctx->total_transfer_start;
const gboolean force_update = total_usecs > FILEOP_UPDATE_INTERVAL_US;
const gint64 update_usecs = tv_current - tv_last_input;
const char *stalled_msg =
update_usecs > FILEOP_STALLING_INTERVAL_US ? _("(stalled)") : "";
file_progress_show (ctx, file_part + ctx->do_reget, file_size, stalled_msg,
force_update);
if (ctx->dialog_type == FILEGUI_DIALOG_MULTI_ITEM) if (ctx->dialog_type == FILEGUI_DIALOG_MULTI_ITEM)
{ {
file_progress_show_count (ctx, ctx->progress_count, ctx->total_count); file_progress_show_count (ctx, ctx->progress_count, ctx->total_count);
file_progress_show_total (ctx, ctx->copied_bytes, force_update); file_progress_show_total (ctx, ctx->copied_bytes, force_update);
} }
file_progress_show (ctx, file_part + ctx->do_reget, file_size, stalled_msg,
force_update);
mc_refresh (); mc_refresh ();
} }