Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-23 01:43:01 +01:00
Code Issues Projects Releases Wiki Activity

fix a few file transfer bugs

Browse Source
This commit is contained in:
Jfreegman 2014-06-03 16:04:57 -04:00
parent 4b8dd3ad72
commit 789c491c1e
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63
4 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/chat.c
View File

@ -324,21 +324,28 @@ static void chat_onFileControl(ToxWindow *self, Tox *m, int32_t num, uint8_t rec
const uint8_t *filename; const uint8_t *filename;
uint8_t msg[MAX_STR_SIZE] = {0}; uint8_t msg[MAX_STR_SIZE] = {0};
int i; /* file_sender index */
if (receive_send == 0) if (receive_send == 0) {
filename = friends[num].file_receiver.filenames[filenum]; filename = friends[num].file_receiver.filenames[filenum];
else } else {
filename = file_senders[filenum].pathname; for (i = 0; i < MAX_FILES; ++i) {
if (file_senders[i].filenum == filenum)
break;
}
filename = file_senders[i].pathname;
}
switch (control_type) { switch (control_type) {
case TOX_FILECONTROL_ACCEPT: case TOX_FILECONTROL_ACCEPT:
snprintf(msg, sizeof(msg), "File transfer for '%s' accepted (%.1f%%)", filename, 0.0); if (receive_send == 1) {
file_senders[filenum].line_id = self->chatwin->hst->line_end->id + 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;
}
break; break;
/*case TOX_FILECONTROL_PAUSE:
wprintw(ctx->history, "File transfer for '%s' paused.\n", filename);
break; */
case TOX_FILECONTROL_KILL: case TOX_FILECONTROL_KILL:
snprintf(msg, sizeof(msg), "File transfer for '%s' failed.", filename); snprintf(msg, sizeof(msg), "File transfer for '%s' failed.", filename);
@ -348,8 +355,11 @@ static void chat_onFileControl(ToxWindow *self, Tox *m, int32_t num, uint8_t rec
break; break;
case TOX_FILECONTROL_FINISHED: case TOX_FILECONTROL_FINISHED:
snprintf(msg, sizeof(msg), "File transfer for '%s' complete.", filename); if (receive_send == 0) {
chat_close_file_receiver(num, filenum); snprintf(msg, sizeof(msg), "File transfer for '%s' complete.", filename);
chat_close_file_receiver(num, filenum);
}
break; break;
} }
@ -382,7 +392,7 @@ static void chat_onFileData(ToxWindow *self, Tox *m, int32_t num, uint8_t filenu
const uint8_t *name = friends[num].file_receiver.filenames[filenum]; const uint8_t *name = friends[num].file_receiver.filenames[filenum];
snprintf(msg, sizeof(msg), "Saving file as: '%s' (%.1Lf%%)", name, pct_remain); snprintf(msg, sizeof(msg), "Saving file as: '%s' (%.1Lf%%)", name, pct_remain);
line_info_set(self, friends[num].file_receiver.line_id, msg); line_info_set(self, friends[num].file_receiver.line_id[filenum], msg);
} }

2
src/chat_commands.c
View File

@ -185,7 +185,7 @@ void cmd_savefile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv
uint8_t msg[MAX_STR_SIZE]; uint8_t msg[MAX_STR_SIZE];
snprintf(msg, sizeof(msg), "Saving file as: '%s' (%.1f%%)", filename, 0.0); snprintf(msg, sizeof(msg), "Saving file as: '%s' (%.1f%%)", filename, 0.0);
line_info_add(self, NULL, NULL, NULL, msg, SYS_MSG, 0, 0); line_info_add(self, NULL, NULL, NULL, msg, SYS_MSG, 0, 0);
friends[self->num].file_receiver.line_id = self->chatwin->hst->line_end->id; friends[self->num].file_receiver.line_id[filenum] = self->chatwin->hst->line_end->id;
if ((friends[self->num].file_receiver.files[filenum] = fopen(filename, "a")) == NULL) { if ((friends[self->num].file_receiver.files[filenum] = fopen(filename, "a")) == NULL) {
errmsg = "* Error writing to file."; errmsg = "* Error writing to file.";

4
src/file_senders.c
View File

@ -107,9 +107,9 @@ void do_file_senders(Tox *m)
if (remain) if (remain)
pct_remain = (1 - (remain / size)) * 100; pct_remain = (1 - (remain / size)) * 100;
const uint8_t *name = file_senders[filenum].pathname; const uint8_t *name = file_senders[i].pathname;
snprintf(msg, sizeof(msg), "File transfer for '%s' accepted (%.1Lf%%)", name, pct_remain); snprintf(msg, sizeof(msg), "File transfer for '%s' accepted (%.1Lf%%)", name, pct_remain);
line_info_set(self, file_senders[filenum].line_id, msg); line_info_set(self, file_senders[i].line_id, msg);
} }
if (file_senders[i].piecelen == 0) { if (file_senders[i].piecelen == 0) {

2
src/toxic_windows.h
View File

@ -219,7 +219,7 @@ struct FileReceiver {
FILE *files[MAX_FILES]; FILE *files[MAX_FILES];
bool pending[MAX_FILES]; bool pending[MAX_FILES];
uint64_t size[MAX_FILES]; uint64_t size[MAX_FILES];
uint32_t line_id; uint32_t line_id[MAX_FILES];
}; };
/* End file transfer code */ /* End file transfer code */