zheiling/BBS-Client-TUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes package processing on file load

Browse Source
This commit is contained in:
zheiling
2026-05-19 13:54:23 +03:00
parent cc6039b974
commit cd83bc4b16
1 changed files with 57 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/file_processor.c
+57 -66
View File
@@ -191,91 +191,82 @@ int32_t file_upload_start(query_args_t *q_args) {
return 0; return 0;
} }
#define file_upload_send(send_len, package_rest, buf_indent) \
{ \
if (q_args->buf_used > 0) { \
int wlen = write(q_args->sd, q_args->buf + buf_indent, send_len); \
if (q_args->buf_used != wlen) { \
/* TODO: ошибка */ \
/* reset function before exit */ \
it_count = 0; \
it_interval = 0; \
package_rest = 0; \
ret = -1; \
} else { \
it_count++; \
if (!(it_count % it_interval)) { \
pb->procent = progress; \
d->needs_update = true; \
} \
q_args->file->rest -= wlen; \
package_rest -= wlen; \
q_args->buf_used -= send_len; \
ret = 0; \
} \
} else { \
/* reset function before exit */ \
it_count = 0; \
it_interval = 0; \
package_rest = 0; \
ret = 1; \
} \
}
int32_t file_upload(query_args_t *q_args) { int32_t file_upload(query_args_t *q_args) {
static int32_t it_count = 0; static int32_t it_count = 0;
static size_t it_interval = 0; static size_t it_interval = 0;
static int package_rest = 0; static int package_rest = 0;
int ret = 0;
int buf_indent = 0;
int send_len = q_args->buf_used; int send_len = q_args->buf_used;
int32_t progress =
(q_args->file->size - q_args->file->rest) * 100 / q_args->file->size;
w_pgb_ui_t *pb = (w_pgb_ui_t *)q_args->progress_bar;
w_dialogue_t *d = (w_dialogue_t *)q_args->active_dialogue;
if (it_interval == 0) { if (it_interval == 0) {
it_interval = (q_args->file->size / INBUFSIZE / 100) * 5; /* every 1% */ it_interval = (q_args->file->size / INBUFSIZE / 100) * 5; /* every 1% */
if (it_interval == 0) if (it_interval == 0)
it_interval = 1; it_interval = 1;
} }
int32_t progress =
(q_args->file->size - q_args->file->rest) * 100 / q_args->file->size;
w_pgb_ui_t *pb = (w_pgb_ui_t *)q_args->progress_bar;
w_dialogue_t *d = (w_dialogue_t *)q_args->active_dialogue;
if (package_rest == 0) { if (package_rest < send_len) {
if (package_rest > 0) {
send_len -= package_rest;
buf_indent = package_rest;
file_upload_send(package_rest, package_rest, 0);
if (ret) {
/* TODO: error case */
}
}
package_rest = PACKAGE_SIZE;
s_file_pd_t fpd = {.signal = q_args->file->signal,
.package_size = package_rest};
write(q_args->sd, &fpd, sizeof(s_file_pd_t));
if (q_args->file->signal == sig_cancel) { if (q_args->file->signal == sig_cancel) {
/* reset function before exit */ /* reset function before exit */
it_count = 0; it_count = 0;
it_interval = 0; it_interval = 0;
return -2; return -2;
} }
package_rest = PACKAGE_SIZE;
s_file_pd_t fpd = {.signal = q_args->file->signal,
.package_size = package_rest};
write(q_args->sd, &fpd, sizeof(s_file_pd_t));
} else if (package_rest < send_len) {
send_len = package_rest;
} }
if (q_args->buf_used > 0) { file_upload_send(send_len, package_rest, buf_indent);
int wlen = write(q_args->sd, q_args->buf, send_len);
if (q_args->buf_used != wlen) { q_args->buf[0] = 0;
/* TODO: ошибка */ return ret;
/* reset function before exit */
it_count = 0;
it_interval = 0;
package_rest = 0;
return -1;
} else {
it_count++;
if (!(it_count % it_interval)) {
pb->procent = progress;
d->needs_update = true;
}
q_args->file->rest -= wlen;
package_rest -= wlen;
if (package_rest == 0) {
if (q_args->file->signal == sig_cancel) {
/* reset function before exit */
it_count = 0;
it_interval = 0;
return -2;
}
package_rest = PACKAGE_SIZE;
s_file_pd_t fpd = {.signal = q_args->file->signal,
.package_size = package_rest};
write(q_args->sd, &fpd, sizeof(s_file_pd_t));
/* send the rest */
if (q_args->buf_used > send_len) {
wlen = write(q_args->sd, q_args->buf + send_len,
q_args->buf_used - send_len);
if (q_args->buf_used != wlen) {
/* TODO: ошибка */
/* reset function before exit */
it_count = 0;
it_interval = 0;
package_rest = 0;
return -1;
}
q_args->file->rest -= wlen;
package_rest -= wlen;
}
}
q_args->buf[0] = 0;
q_args->buf_used = 0;
}
} else {
/* reset function before exit */
it_count = 0;
it_interval = 0;
package_rest = 0;
return 1;
}
return 0;
} }
void clear_file_in_query(query_args_t *q_args) { void clear_file_in_query(query_args_t *q_args) {