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

(file_op_context_t): rename members.

Browse Source 
copied_bytes -> total_progress_bytes
progress_count -> total_progress_count
prev_progress_count -> prev_total_progress_count

No functional changes.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2024-09-08 21:11:55 +03:00
parent debd1ee8ce
commit 527cb1424d
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/filemanager/file.c
View File

@ -818,7 +818,7 @@ progress_update_one (file_op_context_t *ctx, off_t add)
gint64 tv_current; gint64 tv_current;
static gint64 tv_start = -1; static gint64 tv_start = -1;
ctx->progress_count++; ctx->total_progress_count++;
ctx->progress_bytes += (uintmax_t) add; ctx->progress_bytes += (uintmax_t) add;
tv_current = g_get_monotonic_time (); tv_current = g_get_monotonic_time ();
@ -830,7 +830,7 @@ progress_update_one (file_op_context_t *ctx, off_t add)
{ {
if (verbose && ctx->dialog_type == FILEGUI_DIALOG_MULTI_ITEM) if (verbose && ctx->dialog_type == FILEGUI_DIALOG_MULTI_ITEM)
{ {
file_progress_show_count (ctx, ctx->progress_count, ctx->total_count); file_progress_show_count (ctx, ctx->total_progress_count, ctx->total_count);
file_progress_show_total (ctx, ctx->progress_bytes, TRUE); file_progress_show_total (ctx, ctx->progress_bytes, TRUE);
} }
@ -1158,8 +1158,8 @@ copy_file_file_display_progress (file_op_context_t *ctx, gint64 tv_current, off_
total_secs = (tv_current - ctx->total_transfer_start) / G_USEC_PER_SEC; total_secs = (tv_current - ctx->total_transfer_start) / G_USEC_PER_SEC;
total_secs = MAX (1, total_secs); total_secs = MAX (1, total_secs);
ctx->total_bps = ctx->copied_bytes / total_secs; ctx->total_bps = ctx->total_progress_bytes / total_secs;
const uintmax_t remain_bytes = ctx->total_bytes - ctx->copied_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 = ctx->total_bps != 0 ? remain_bytes / ctx->total_bps : 0;
} }
} }
@ -1372,16 +1372,16 @@ erase_file (file_op_context_t *ctx, const vfs_path_t *vpath)
FileProgressStatus return_status; FileProgressStatus return_status;
/* check buttons if deleting info was changed */ /* check buttons if deleting info was changed */
if (file_progress_show_deleting (ctx, vpath, &ctx->progress_count)) if (file_progress_show_deleting (ctx, vpath, &ctx->total_progress_count))
{ {
file_progress_show_count (ctx, ctx->progress_count, ctx->total_count); file_progress_show_count (ctx, ctx->total_progress_count, ctx->total_count);
if (file_progress_check_buttons (ctx) == FILE_ABORT) if (file_progress_check_buttons (ctx) == FILE_ABORT)
return FILE_ABORT; return FILE_ABORT;
mc_refresh (); mc_refresh ();
} }
if (ctx->progress_count != 0 && mc_lstat (vpath, &buf) != 0) if (ctx->total_progress_count != 0 && mc_lstat (vpath, &buf) != 0)
{ {
/* ignore, most likely the mc_unlink fails, too */ /* ignore, most likely the mc_unlink fails, too */
buf.st_size = 0; buf.st_size = 0;
@ -1390,7 +1390,7 @@ erase_file (file_op_context_t *ctx, const vfs_path_t *vpath)
if (!try_remove_file (ctx, vpath, &return_status) && return_status == FILE_ABORT) if (!try_remove_file (ctx, vpath, &return_status) && return_status == FILE_ABORT)
return FILE_ABORT; return FILE_ABORT;
if (ctx->progress_count == 0) if (ctx->total_progress_count == 0)
return FILE_CONT; return FILE_CONT;
return file_progress_check_buttons (ctx); return file_progress_check_buttons (ctx);
@ -1464,7 +1464,7 @@ recursive_erase (file_op_context_t *ctx, const vfs_path_t *vpath)
return FILE_ABORT; return FILE_ABORT;
file_progress_show_deleting (ctx, vpath, NULL); file_progress_show_deleting (ctx, vpath, NULL);
file_progress_show_count (ctx, ctx->progress_count, ctx->total_count); file_progress_show_count (ctx, ctx->total_progress_count, ctx->total_count);
if (file_progress_check_buttons (ctx) == FILE_ABORT) if (file_progress_check_buttons (ctx) == FILE_ABORT)
return FILE_ABORT; return FILE_ABORT;
@ -1536,7 +1536,7 @@ erase_dir_after_copy (file_op_context_t *ctx, const vfs_path_t *vpath, FileProgr
if (ctx->erase_at_end && erase_list != NULL) if (ctx->erase_at_end && erase_list != NULL)
{ {
/* Reset progress count before delete to avoid counting files twice */ /* Reset progress count before delete to avoid counting files twice */
ctx->progress_count = ctx->prev_progress_count; ctx->total_progress_count = ctx->prev_total_progress_count;
while (!g_queue_is_empty (erase_list) && *status != FILE_ABORT) while (!g_queue_is_empty (erase_list) && *status != FILE_ABORT)
{ {
@ -1545,7 +1545,7 @@ erase_dir_after_copy (file_op_context_t *ctx, const vfs_path_t *vpath, FileProgr
lp = (link_t *) g_queue_pop_head (erase_list); lp = (link_t *) g_queue_pop_head (erase_list);
if (S_ISDIR (lp->st_mode)) if (S_ISDIR (lp->st_mode))
*status = erase_dir_iff_empty (ctx, lp->src_vpath, ctx->progress_count); *status = erase_dir_iff_empty (ctx, lp->src_vpath, ctx->total_progress_count);
else else
*status = erase_file (ctx, lp->src_vpath); *status = erase_file (ctx, lp->src_vpath);
@ -1553,10 +1553,10 @@ erase_dir_after_copy (file_op_context_t *ctx, const vfs_path_t *vpath, FileProgr
} }
/* Save progress counter before move next directory */ /* Save progress counter before move next directory */
ctx->prev_progress_count = ctx->progress_count; ctx->prev_total_progress_count = ctx->total_progress_count;
} }
erase_dir_iff_empty (ctx, vpath, ctx->progress_count); erase_dir_iff_empty (ctx, vpath, ctx->total_progress_count);
} }
/* }}} */ /* }}} */
@ -2732,7 +2732,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->total_progress_bytes = ctx->progress_bytes + file_part + ctx->do_reget;
const gint64 usecs = tv_current - tv_last_update; const gint64 usecs = tv_current - tv_last_update;
@ -2758,8 +2758,8 @@ copy_file_file (file_op_context_t *ctx, const char *src_path, const char *dst_pa
force_update); 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->total_progress_count, ctx->total_count);
file_progress_show_total (ctx, ctx->copied_bytes, force_update); file_progress_show_total (ctx, ctx->total_progress_bytes, force_update);
} }
mc_refresh (); mc_refresh ();
@ -3220,7 +3220,7 @@ copy_dir_dir (file_op_context_t *ctx, const char *s, const char *d, gboolean top
tmp_vpath = NULL; tmp_vpath = NULL;
} }
else if (S_ISDIR (dst_stat.st_mode)) else if (S_ISDIR (dst_stat.st_mode))
return_status = erase_dir_iff_empty (ctx, tmp_vpath, ctx->progress_count); return_status = erase_dir_iff_empty (ctx, tmp_vpath, ctx->total_progress_count);
else else
return_status = erase_file (ctx, tmp_vpath); return_status = erase_file (ctx, tmp_vpath);
} }
@ -3277,7 +3277,7 @@ FileProgressStatus
erase_dir (file_op_context_t *ctx, const vfs_path_t *vpath) erase_dir (file_op_context_t *ctx, const vfs_path_t *vpath)
{ {
file_progress_show_deleting (ctx, vpath, NULL); file_progress_show_deleting (ctx, vpath, NULL);
file_progress_show_count (ctx, ctx->progress_count, ctx->total_count); file_progress_show_count (ctx, ctx->total_progress_count, ctx->total_count);
if (file_progress_check_buttons (ctx) == FILE_ABORT) if (file_progress_check_buttons (ctx) == FILE_ABORT)
return FILE_ABORT; return FILE_ABORT;
@ -3626,7 +3626,7 @@ panel_operate (void *source_panel, FileOperation operation, gboolean force_singl
{ {
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->total_progress_count, ctx->total_count);
file_progress_show_total (ctx, ctx->progress_bytes, FALSE); file_progress_show_total (ctx, ctx->progress_bytes, FALSE);
} }

2
src/filemanager/filegui.c
View File

@ -1158,7 +1158,7 @@ file_progress_show_total (file_op_context_t *ctx, uintmax_t copied_bytes, gboole
if (ui->total_bytes_label != NULL) if (ui->total_bytes_label != NULL)
{ {
size_trunc_len (buffer2, 5, ctx->copied_bytes, 0, panels_options.kilobyte_si); size_trunc_len (buffer2, 5, ctx->total_progress_bytes, 0, panels_options.kilobyte_si);
if (!ctx->totals_computed) if (!ctx->totals_computed)
hline_set_textv (ui->total_bytes_label, _(" Total: %s "), buffer2); hline_set_textv (ui->total_bytes_label, _(" Total: %s "), buffer2);

8
src/filemanager/filegui.h
View File

@ -124,17 +124,13 @@ typedef struct
/* File transfer start time */ /* File transfer start time */
gint64 transfer_start; gint64 transfer_start;
/* Counters for progress indicators */ /* Counters for progress indicators */
size_t progress_count;
uintmax_t progress_bytes; uintmax_t progress_bytes;
uintmax_t copied_bytes;
/* The estimated time of arrival in seconds */ /* The estimated time of arrival in seconds */
double eta_secs; double eta_secs;
/* Transferred bytes per second */ /* Transferred bytes per second */
long bps; long bps;
/* Transferred seconds */ /* Transferred seconds */
long bps_time; long bps_time;
/* Used in OP_MOVE between copy and remove directories */
size_t prev_progress_count;
/* Total statuses */ /* Total statuses */
/* Whether the panel total has been computed */ /* Whether the panel total has been computed */
@ -142,12 +138,16 @@ typedef struct
/* Files transfer start time */ /* Files transfer start time */
gint64 total_transfer_start; gint64 total_transfer_start;
/* Counters for progress indicators */ /* Counters for progress indicators */
size_t total_progress_count;
size_t total_count; size_t total_count;
uintmax_t total_progress_bytes;
uintmax_t total_bytes; uintmax_t total_bytes;
/* The estimated time of arrival in seconds */ /* The estimated time of arrival in seconds */
double total_eta_secs; double total_eta_secs;
/* Transferred bytes per second */ /* Transferred bytes per second */
size_t total_bps; size_t total_bps;
/* Used in OP_MOVE between copy and remove directories */
size_t prev_total_progress_count;
/* User interface data goes here */ /* User interface data goes here */
void *ui; void *ui;