From 49538a986c538c20f90c18297bb0bddbceb86f7c Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Sun, 27 Jul 2014 17:14:28 -0400 Subject: [PATCH] improve file transfer progress line --- src/chat.c | 27 +++++++++------ src/chat_commands.c | 11 ++++-- src/file_senders.c | 83 +++++++++++++++++++++++++++++++++++++++++---- src/file_senders.h | 9 +++++ src/friendlist.h | 1 + src/misc_tools.c | 2 +- 6 files changed, 111 insertions(+), 22 deletions(-) diff --git a/src/chat.c b/src/chat.c index 3c39286..92c16c3 100644 --- a/src/chat.c +++ b/src/chat.c @@ -363,8 +363,14 @@ static void chat_onFileControl(ToxWindow *self, Tox *m, int32_t num, uint8_t rec switch (control_type) { case TOX_FILECONTROL_ACCEPT: if (receive_send == 1) { - snprintf(msg, sizeof(msg), "File transfer for '%s' accepted (%.1f%%)", filename, 0.0); - file_senders[i].line_id = self->chatwin->hst->line_end->id + 1; + const char *r_msg = "File transfer for '%s' accepted."; + line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, r_msg, filename); + + /* prep progress bar line */ + char progline[MAX_STR_SIZE]; + prep_prog_line(progline); + line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, progline); + file_senders[i].line_id = self->chatwin->hst->line_end->id + 2; notify(self, silent, NT_NOFOCUS | NT_BEEP | NT_WNDALERT_2); } @@ -389,7 +395,8 @@ static void chat_onFileControl(ToxWindow *self, Tox *m, int32_t num, uint8_t rec break; } - line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, msg); + if (msg[0]) + line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, msg); } static void chat_onFileData(ToxWindow *self, Tox *m, int32_t num, uint8_t filenum, const char *data, @@ -408,19 +415,17 @@ static void chat_onFileData(ToxWindow *self, Tox *m, int32_t num, uint8_t filenu } } - long double remain = (long double) tox_file_data_remaining(m, num, filenum, 1); + friends[num].file_receiver.bps[filenum] += length; + double remain = (double) tox_file_data_remaining(m, num, filenum, 1); uint64_t curtime = get_unix_time(); - /* refresh line with percentage complete */ + /* refresh line with percentage complete and transfer speed (must be called once per second) */ if (!remain || timed_out(friends[num].file_receiver.last_progress[filenum], curtime, 1)) { friends[num].file_receiver.last_progress[filenum] = curtime; uint64_t size = friends[num].file_receiver.size[filenum]; - long double pct_remain = remain ? (1 - (remain / size)) * 100 : 100; - - char msg[MAX_STR_SIZE]; - const char *name = friends[num].file_receiver.filenames[filenum]; - snprintf(msg, sizeof(msg), "Saving file as: '%s' (%.1Lf%%)", name, pct_remain); - line_info_set(self, friends[num].file_receiver.line_id[filenum], msg); + double pct_remain = remain ? (1 - (remain / size)) * 100 : 100; + print_progress_bar(self, filenum, num, pct_remain); + friends[num].file_receiver.bps[filenum] = 0; } } diff --git a/src/chat_commands.c b/src/chat_commands.c index 26f9ec8..73d5bc8 100644 --- a/src/chat_commands.c +++ b/src/chat_commands.c @@ -127,9 +127,14 @@ void cmd_savefile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv const char *filename = friends[self->num].file_receiver.filenames[filenum]; if (tox_file_send_control(m, self->num, 1, filenum, TOX_FILECONTROL_ACCEPT, 0, 0) == 0) { - const char *msg = "Saving file as: '%s' (%.1f%%)"; - line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, msg, filename, 0.0); - friends[self->num].file_receiver.line_id[filenum] = self->chatwin->hst->line_end->id + 1; + const char *msg = "Saving file as: '%s'"; + line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, msg, filename); + + /* prep progress bar line */ + char progline[MAX_STR_SIZE]; + prep_prog_line(progline); + line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, progline); + friends[self->num].file_receiver.line_id[filenum] = self->chatwin->hst->line_end->id + 2; if ((friends[self->num].file_receiver.files[filenum] = fopen(filename, "a")) == NULL) { errmsg = "* Error writing to file."; diff --git a/src/file_senders.c b/src/file_senders.c index a62b69b..6d1e6d3 100644 --- a/src/file_senders.c +++ b/src/file_senders.c @@ -27,6 +27,7 @@ #include "toxic.h" #include "windows.h" +#include "friendlist.h" #include "file_senders.h" #include "line_info.h" #include "misc_tools.h" @@ -34,6 +35,75 @@ FileSender file_senders[MAX_FILES]; uint8_t max_file_senders_index; +extern ToxicFriend friends[MAX_FRIENDS_NUM]; + +#define KiB 1024 +#define MiB 1048576 /* 1024 ^ 2 */ +#define GiB 1073741824 /* 1024 ^ 3 */ + +/* creates initial progress line that will be updated during file transfer. */ +void prep_prog_line(char *progline) +{ + strcpy(progline, "0.0 B/s ["); + int i; + + for (i = 0; i < NUM_PROG_MARKS; ++i) + strcat(progline, " "); + + strcat(progline, "] 0%%"); +} + +/* prints a progress bar for file transfers. + if friendnum is -1 we're sending the file, otherwise we're receiving. */ +void print_progress_bar(ToxWindow *self, int idx, int friendnum, double pct_remain) +{ + double bps; + uint32_t line_id; + + if (friendnum < 0) { + bps = file_senders[idx].bps; + line_id = file_senders[idx].line_id; + } else { + bps = friends[friendnum].file_receiver.bps[idx]; + line_id = friends[friendnum].file_receiver.line_id[idx]; + } + + const char *unit; + + if (bps < KiB) { + unit = "B/s"; + } else if (bps < MiB) { + unit = "KiB/s"; + bps /= (double) KiB; + } else if (bps < GiB) { + unit = "MiB/s"; + bps /= (double) MiB; + } else { + unit = "GiB/s"; + bps /= (double) GiB; + } + + char msg[MAX_STR_SIZE]; + snprintf(msg, sizeof(msg), "%.1f %s [", bps, unit); + int n = pct_remain / (100 / NUM_PROG_MARKS); + int i; + + for (i = 0; i < n; ++i) + strcat(msg, "#"); + + int j; + + for (j = i; j < NUM_PROG_MARKS; ++j) + strcat(msg, " "); + + strcat(msg, "] "); + + char pctstr[16]; + snprintf(pctstr, sizeof(pctstr), "%.2f%%", pct_remain); + strcat(msg, pctstr); + + line_info_set(self, line_id, msg); +} static void set_max_file_senders_index(void) { @@ -105,19 +175,18 @@ void do_file_senders(Tox *m) uint64_t curtime = get_unix_time(); file_senders[i].timestamp = curtime; + file_senders[i].bps += file_senders[i].piecelen; file_senders[i].piecelen = fread(file_senders[i].nextpiece, 1, tox_file_data_size(m, friendnum), fp); - long double remain = (long double) tox_file_data_remaining(m, friendnum, filenum, 0); + double remain = (double) tox_file_data_remaining(m, friendnum, filenum, 0); - /* refresh line with percentage complete */ + /* refresh line with percentage complete and transfer speed (must be called once per second) */ if ((self->chatwin != NULL && timed_out(file_senders[i].last_progress, curtime, 1)) || !remain) { file_senders[i].last_progress = curtime; - uint64_t size = file_senders[i].size; - long double pct_remain = remain ? (1 - (remain / size)) * 100 : 100; - - snprintf(msg, sizeof(msg), "File transfer for '%s' accepted (%.1Lf%%)", pathname, pct_remain); - line_info_set(self, file_senders[i].line_id, msg); + double pct_remain = remain ? (1 - (remain / file_senders[i].size)) * 100 : 100; + print_progress_bar(self, i, -1, pct_remain); + file_senders[i].bps = 0; } if (file_senders[i].piecelen == 0) { diff --git a/src/file_senders.h b/src/file_senders.h index 4611179..a6cc5ee 100644 --- a/src/file_senders.h +++ b/src/file_senders.h @@ -29,6 +29,7 @@ #define FILE_PIECE_SIZE 2048 /* must be >= (MAX_CRYPTO_DATA_SIZE - 2) in toxcore/net_crypto.h */ #define MAX_FILES 255 #define TIMEOUT_FILESENDER 120 +#define NUM_PROG_MARKS 50 /* number of "#"'s in file transfer progress bar. Keep well below MAX_STR_SIZE */ typedef struct { FILE *file; @@ -41,10 +42,18 @@ typedef struct { char pathname[MAX_STR_SIZE]; uint64_t timestamp; uint64_t last_progress; + double bps; uint64_t size; uint32_t line_id; } FileSender; +/* creates progress line that will be updated during file transfer. */ +void prep_prog_line(char *progline); + +/* prints a progress bar for file transfers. + if friendnum is -1 we're sending the file, otherwise we're receiving. */ +void print_progress_bar(ToxWindow *self, int idx, int friendnum, double pct_remain); + void close_all_file_senders(Tox *m); void do_file_senders(Tox *m); diff --git a/src/friendlist.h b/src/friendlist.h index b108b79..b4f6f7c 100644 --- a/src/friendlist.h +++ b/src/friendlist.h @@ -34,6 +34,7 @@ struct FileReceiver { FILE *files[MAX_FILES]; bool pending[MAX_FILES]; uint64_t size[MAX_FILES]; + double bps[MAX_FILES]; uint64_t last_progress[MAX_FILES]; uint32_t line_id[MAX_FILES]; }; diff --git a/src/misc_tools.c b/src/misc_tools.c index 36bd140..a0315c3 100644 --- a/src/misc_tools.c +++ b/src/misc_tools.c @@ -245,4 +245,4 @@ int char_rfind(const char *s, char ch, int len) } return i; -} \ No newline at end of file +}