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

new realization of cancel download [need review]

Browse Source
This commit is contained in:
zheiling
2026-06-05 16:27:05 +03:00
parent ae81b806eb
commit 4be4bb926a
6 changed files with 94 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/file_processor.c
+76 -40
View File
@@ -102,61 +102,97 @@ int32_t ui_file_select(file_args_t *f_args, query_args_t *q_args, int32_t idx) {
} }
server_send_string(q_args, "file download [%s]\n", f_selected->name); server_send_string(q_args, "file download [%s]\n", f_selected->name);
q_args->state = S_DOWNLOAD_FILE; q_args->state = S_DOWNLOAD_FILE;
q_args->file = malloc(sizeof(p_file_t));
q_args->file->name = f_selected->name;
q_args->file->rest = f_selected->size;
q_args->file->size = f_selected->size;
q_args->file->package_rest = PACKAGE_SIZE;
q_args->file->signal = sig_continue;
q_args->file->it_count = 0;
q_args->file->fd = f_args->file_d;
q_args->file->it_interval =
(f_selected->size / INBUFSIZE / 100); /* every 1% */
if (q_args->file->it_interval == 0)
q_args->file->it_interval = 1;
free(file_path); free(file_path);
return OK; return OK;
} }
#define file_download_receive_after(qlen, q_args, f_args, d, pb) \
{ \
if (qlen) { \
q_args->file->it_count++; \
q_args->file->package_rest -= qlen; \
if (!(q_args->file->it_count % q_args->file->it_interval)) { \
pb->percentage = progress; \
d->needs_update = true; \
} else { \
q_args->buf_used = 0; \
} \
if (q_args->file->rest < qlen) { \
q_args->file->rest = 0; \
} else { \
q_args->file->rest -= qlen; \
} \
if (q_args->file->rest == 0) { \
q_args->file->it_count = 0; \
q_args->file->it_interval = 0; \
f_selected->size = 0; \
close(f_args->file_d); \
d->needs_destroy = true; \
sprintf(answer, "File %s is downloaded from the server!", \
f_selected->name); \
q_args->notification = malloc(strlen(answer) + 1); \
strcpy(q_args->notification, answer); \
free(f_selected->name); \
server_send_string(q_args, "file list %d %d\n%n", fui->max_lines, \
fui->current_page, &a_len); \
q_args->state = S_FILE_LIST; \
} \
} \
}
/* TODO: revise */
void file_download(file_args_t *f_args, query_args_t *q_args) { void file_download(file_args_t *f_args, query_args_t *q_args) {
fl_item_t *f_selected = &(f_args->f_selected); fl_item_t *f_selected = &(f_args->f_selected);
static int32_t it_count = 0;
static size_t it_interval = 0;
if (it_interval == 0) {
it_interval = (f_selected->size / INBUFSIZE / 100) * 5; /* every 1% */
if (it_interval == 0)
it_interval = 1;
}
char answer[256]; char answer[256];
static size_t size_rest = 0; int32_t progress =
int32_t progress = (f_selected->size - size_rest) * 100 / f_selected->size; (f_selected->size - q_args->file->rest) * 100 / f_selected->size;
w_pgb_ui_t *pb = (w_pgb_ui_t *)q_args->progress_bar; w_pgb_ui_t *pb = (w_pgb_ui_t *)q_args->progress_bar;
w_dialogue_t *d = (w_dialogue_t *)q_args->active_dialogue; w_dialogue_t *d = (w_dialogue_t *)q_args->active_dialogue;
w_ui_file_list_t *fui = (w_ui_file_list_t *)q_args->main_ui->ui; w_ui_file_list_t *fui = (w_ui_file_list_t *)q_args->main_ui->ui;
int32_t a_len = 0; int32_t a_len = 0;
int32_t qlen;
if (size_rest == 0 && it_count == 0) int write_len = q_args->buf_used;
size_rest = f_selected->size;
int32_t qlen = write(f_args->file_d, q_args->buf, q_args->buf_used); if (q_args->file->package_rest <= q_args->buf_used) {
if (qlen) { write_len = q_args->file->package_rest;
it_count++; qlen = write(f_args->file_d, q_args->buf, write_len);
if (!(it_count % it_interval)) { file_download_receive_after(qlen, q_args, f_args, d, pb)
pb->percentage = progress; server_send_string(q_args, "continue\n");
d->needs_update = true; if (q_args->file->signal == sig_continue) {
} else { q_args->file->package_rest = PACKAGE_SIZE;
q_args->buf_used = 0; if (q_args->file->package_rest == q_args->buf_used) {
} return;
if (size_rest < qlen) { }
size_rest = 0; int buf_offset = q_args->file->package_rest;
} else { write_len = q_args->buf_used - q_args->file->package_rest;
size_rest -= qlen; qlen = write(f_args->file_d, q_args->buf + buf_offset, write_len);
} file_download_receive_after(qlen, q_args, f_args, d, pb) return;
if (size_rest == 0) { } else if (q_args->file->signal == sig_cancel) {
it_count = 0; server_send_string(q_args, "cancel\n");
it_interval = 0; FILE_CLEAN(q_args->file);
f_selected->size = 0;
close(f_args->file_d);
d->needs_destroy = true; d->needs_destroy = true;
sprintf(answer, "File %s is downloaded from the server!", return;
f_selected->name);
q_args->notification = malloc(strlen(answer) + 1);
strcpy(q_args->notification, answer);
free(f_selected->name);
server_send_string(q_args, "file list %d %d\n%n", fui->max_lines,
fui->current_page, &a_len);
q_args->state = S_FILE_LIST;
} }
} }
qlen = write(f_args->file_d, q_args->buf, write_len);
file_download_receive_after(qlen, q_args, f_args, d, pb)
} }
int32_t file_upload_open(char *dpath, char *fname, query_args_t *q_args) { int32_t file_upload_open(char *dpath, char *fname, query_args_t *q_args) {
@@ -205,7 +241,7 @@ int32_t file_upload_start(query_args_t *q_args) {
} else { \ } else { \
it_count++; \ it_count++; \
if (!(it_count % it_interval)) { \ if (!(it_count % it_interval)) { \
pb->percentage = progress; \ pb->percentage = progress; \
d->needs_update = true; \ d->needs_update = true; \
} \ } \
q_args->file->rest -= wlen; \ q_args->file->rest -= wlen; \
src/main.c
-1
View File
@@ -42,7 +42,6 @@ int main(int argc, char **argv) {
/* init alert */ /* init alert */
w_alert_init(app); w_alert_init(app);
w_alert("Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem.");
init_query_args(q_args, app->params); init_query_args(q_args, app->params);
q_args->buf = malloc(INBUFSIZE); q_args->buf = malloc(INBUFSIZE);
src/main.h
+4 -1
View File
@@ -73,6 +73,9 @@ typedef struct p_file {
char *description; char *description;
size_t size; size_t size;
size_t rest; size_t rest;
size_t package_rest;
int32_t it_count;
size_t it_interval;
enum package_signal signal; enum package_signal signal;
int fd; int fd;
} p_file_t; } p_file_t;
@@ -105,7 +108,7 @@ typedef struct main_window {
void *ui; /* structure which describes window UI */ void *ui; /* structure which describes window UI */
int32_t (*cb_b_press)(void *app, void *args); /* callback on button press */ int32_t (*cb_b_press)(void *app, void *args); /* callback on button press */
void (*cb_ui_refresh)(void *app); /* refresh callback */ void (*cb_ui_refresh)(void *app); /* refresh callback */
void (*reset)(void *app); /* function to reset the state of the window */ void (*reset)(void *app); /* function to reset the state of the window */
draw_f_t *draw; draw_f_t *draw;
struct action_key *b_keys; struct action_key *b_keys;
int32_t b_keys_len; int32_t b_keys_len;
src/modals/load_pr.c
+6 -6
View File
@@ -1,9 +1,9 @@
#include "../server.h" #include "../server.h"
#include "../windows/file_list.h"
#include "alert.h" #include "alert.h"
#include "dialogue.h" #include "dialogue.h"
#include "group.h" #include "group.h"
#include "utils.h" #include "utils.h"
#include "../windows/file_list.h"
#include <ncursesw/ncurses.h> #include <ncursesw/ncurses.h>
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
@@ -13,11 +13,11 @@
void dwn_pr_modal_cb(w_cb_args_t *args) { void dwn_pr_modal_cb(w_cb_args_t *args) {
/* only cancel action */ /* only cancel action */
int32_t key = *((int32_t *)args->data); int32_t key = *((int32_t *)args->data);
if (key != '\n') { if (key != '\n') {
return; return;
} }
app_t *app = args->app; app_t *app = args->app;
w_dialogue_t *d = &(app->modal); w_dialogue_t *d = &(app->modal);
/* TODO: forward actual file name */ /* TODO: forward actual file name */
@@ -32,9 +32,9 @@ void dwn_pr_modal_cb(w_cb_args_t *args) {
bool response = bool response =
w_bool_ask("Cancel file download", "Yes", "No", false, w_bool_ask("Cancel file download", "Yes", "No", false,
"You're going to cancel download\n Are you sure?"); "You're going to cancel download\n Are you sure?");
server_send_string(app->query_args, "cancel\n"); if (response) {
FILE_CLEAN(app); app->query_args->file->signal = sig_cancel;
d->needs_destroy = true; }
} }
} }
src/query.c
+2 -2
View File
@@ -183,7 +183,7 @@ int process_query(app_t *app) {
if (!file_upload_start(query_args)) { if (!file_upload_start(query_args)) {
query_args->state = S_UPLOAD_FILE; query_args->state = S_UPLOAD_FILE;
} else { } else {
FILE_CLEAN(app); FILE_CLEAN(app->query_args->file);
query_args->state = WAIT_CLIENT; query_args->state = WAIT_CLIENT;
} }
break; break;
@@ -198,7 +198,7 @@ int process_query(app_t *app) {
/* cancel case */ /* cancel case */
w_notification("Alert", dc_alert, "File %s didn't upload!", w_notification("Alert", dc_alert, "File %s didn't upload!",
query_args->file->name); query_args->file->name);
FILE_CLEAN(app); FILE_CLEAN(app->query_args->file);
w_dialogue_t *d = &(app->modal); w_dialogue_t *d = &(app->modal);
d->needs_destroy = true; d->needs_destroy = true;
query_args->state = WAIT_CLIENT; query_args->state = WAIT_CLIENT;
src/utils/utils.h
+6 -5
View File
@@ -10,10 +10,11 @@
arg = NULL; \ arg = NULL; \
} }
#define FILE_CLEAN(app) \ #define FILE_CLEAN(file) \
if (app->query_args->file != NULL) { \ if (file != NULL) { \
FREE_MLC(app->query_args->file->name); \ FREE_MLC(file->name); \
FREE_MLC(app->query_args->file->path); \ FREE_MLC(file->path); \
FREE_MLC(app->query_args->file); \ FREE_MLC(file); \
file = NULL; \
} }
#endif #endif