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

(calc_copy_file_progress): rename from copy_file_file_display_progress().

Browse Source 
Refactoring, reuse variable.

(file_op_context_t): remove 'bps_time' member. It's unused anymore.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2024-09-09 10:34:07 +03:00
parent d844c6212c
commit e6e329bc8c
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/filemanager/file.c
View File

@ -1130,7 +1130,7 @@ files_error (const char *format, const char *file1, const char *file2)
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
static void static void
copy_file_file_display_progress (file_op_context_t *ctx, gint64 tv_current, off_t file_part, calc_copy_file_progress (file_op_context_t *ctx, gint64 tv_current, off_t file_part,
off_t file_size) off_t file_size)
{ {
gint64 dt; gint64 dt;
@ -1147,20 +1147,23 @@ copy_file_file_display_progress (file_op_context_t *ctx, gint64 tv_current, off_
ctx->eta_secs = ((dt / (double) file_part) * file_size) - dt; ctx->eta_secs = ((dt / (double) file_part) * file_size) - dt;
/* Compute BPS rate */ /* Compute BPS rate */
ctx->bps_time = MAX (1, dt); dt = MAX (1, dt);
ctx->bps = file_part / ctx->bps_time; ctx->bps = file_part / dt;
/* Compute total ETA and BPS */ /* Compute total ETA and BPS */
if (ctx->total_bytes != 0) if (ctx->total_bytes != 0)
{ {
gint64 total_secs; dt = (tv_current - ctx->total_transfer_start) / G_USEC_PER_SEC;
dt = MAX (1, dt);
ctx->total_bps = ctx->total_progress_bytes / dt;
total_secs = (tv_current - ctx->total_transfer_start) / G_USEC_PER_SEC; if (ctx->total_bps == 0)
total_secs = MAX (1, total_secs); ctx->total_eta_secs = 0;
else
ctx->total_bps = ctx->total_progress_bytes / total_secs; {
const uintmax_t remain_bytes = ctx->total_bytes - ctx->total_progress_bytes; const uintmax_t remain_bytes = ctx->total_bytes - ctx->total_progress_bytes;
ctx->total_eta_secs = ctx->total_bps != 0 ? remain_bytes / ctx->total_bps : 0; ctx->total_eta_secs = remain_bytes / ctx->total_bps;
}
} }
} }
@ -2738,8 +2741,7 @@ copy_file_file (file_op_context_t *ctx, const char *src_path, const char *dst_pa
if (is_first_time || usecs > FILEOP_UPDATE_INTERVAL_US) if (is_first_time || usecs > FILEOP_UPDATE_INTERVAL_US)
{ {
copy_file_file_display_progress (ctx, tv_current, file_part, calc_copy_file_progress (ctx, tv_current, file_part, file_size - ctx->do_reget);
file_size - ctx->do_reget);
tv_last_update = tv_current; tv_last_update = tv_current;
} }

2
src/filemanager/filegui.h
View File

@ -129,8 +129,6 @@ typedef struct
double eta_secs; double eta_secs;
/* Transferred bytes per second */ /* Transferred bytes per second */
long bps; long bps;
/* Transferred seconds */
long bps_time;
/* Total statuses */ /* Total statuses */
/* Whether the panel total has been computed */ /* Whether the panel total has been computed */