Changeset c111da2 in mainline for uspace/app/nav

Timestamp:

2025-10-09T15:44:52Z (5 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

cfd04c4

Parents:

1a96db9

Message:

Create non-zero size file in Navigator, new newfile utility.

Location:

uspace/app/nav

Files:

• dlg/newfiledlg.c (modified) (4 diffs)
• dlg/progress.c (added)
• dlg/progress.h (added)
• meson.build (modified) (2 diffs)
• nav.c (modified) (2 diffs)
• nav.h (modified) (1 diff)
• newfile.c (modified) (6 diffs)
• types/dlg/newfiledlg.h (modified) (1 diff)
• types/dlg/progress.h (added)
• types/nav.h (modified) (3 diffs)
• types/newfile.h (added)

uspace/app/nav/dlg/newfiledlg.c

@@ -358 +358 @@
 
         (void)window;
-        if (dialog->cb != NULL && dialog->cb->bcancel != NULL) {
+        if (dialog->cb != NULL && dialog->cb->close != NULL) {
                 dialog->cb->close(dialog, dialog->arg);
         }
@@ -373 +373 @@
 {
         new_file_dlg_t *dialog = (new_file_dlg_t *) arg;
-        const char *text;
+        const char *fname;
+        const char *fsize;
 
         if (event->type == KEY_PRESS &&
@@ -380 +381 @@
                         /* Confirm */
                         if (dialog->cb != NULL && dialog->cb->bok != NULL) {
-                                text = ui_entry_get_text(dialog->ename);
-                                dialog->cb->bok(dialog, dialog->arg, text);
+                                fname = ui_entry_get_text(dialog->ename);
+                                fsize = ui_entry_get_text(dialog->esize);
+                                dialog->cb->bok(dialog, dialog->arg, fname,
+                                    fsize);
                                 return;
                         }
@@ -404 +407 @@
 {
         new_file_dlg_t *dialog = (new_file_dlg_t *) arg;
-        const char *text;
+        const char *fname;
+        const char *fsize;
 
         if (dialog->cb != NULL && dialog->cb->bok != NULL) {
-                text = ui_entry_get_text(dialog->ename);
-                dialog->cb->bok(dialog, dialog->arg, text);
+                fname = ui_entry_get_text(dialog->ename);
+                fsize = ui_entry_get_text(dialog->esize);
+                dialog->cb->bok(dialog, dialog->arg, fname, fsize);
         }
 }

uspace/app/nav/meson.build

@@ -30 +30 @@
 src = files(
         'dlg/newfiledlg.c',
+        'dlg/progress.c',
         'main.c',
         'menu.c',
@@ -39 +40 @@
 test_src = files(
         'dlg/newfiledlg.c',
+        'dlg/progress.c',
         'menu.c',
         'nav.c',

uspace/app/nav/nav.c

@@ -35 +35 @@
  */
 
+#include <fibril.h>
 #include <gfx/coord.h>
 #include <stdio.h>
@@ -535 +536 @@
 }
 
+/** Wrapper fibril function for worker function.
+ *
+ * This is the main fibril function for the worker fibril. It executes
+ * the worker function, then clears worker FID to indicate the worker
+ * is finished.
+ *
+ * @param arg Argument (navigator_worker_job_t *)
+ * @return EOK
+ */
+static errno_t navigator_worker_func(void *arg)
+{
+        navigator_worker_job_t *job = (navigator_worker_job_t *)arg;
+
+        job->wfunc(job->arg);
+        job->navigator->worker_fid = 0;
+        free(job);
+        return EOK;
+}
+
+/** Start long-time work in a worker fibril.
+ *
+ * Actions which can take time (file operations) cannot block the main UI
+ * fibril. This function will start an action in the worker fibril, i.e.,
+ * in the background. At the same time the caller should create a modal
+ * progress dialog that will be shown until the work is completed.
+ *
+ * (Only a single worker can execute at any given time).
+ *
+ * @param nav Navigator
+ * @param wfunc Worker main function
+ * @param arg Argument to worker function
+ *
+ * @return EOK on success or an error code
+ */
+errno_t navigator_worker_start(navigator_t *nav, void (*wfunc)(void *),
+    void *arg)
+{
+        navigator_worker_job_t *job;
+
+        if (nav->worker_fid != 0)
+                return EBUSY;
+
+        job = calloc(1, sizeof(navigator_worker_job_t));
+        if (job == NULL)
+                return ENOMEM;
+
+        job->navigator = nav;
+        job->wfunc = wfunc;
+        job->arg = arg;
+
+        nav->worker_fid = fibril_create(navigator_worker_func, (void *)job);
+        if (nav->worker_fid == 0) {
+                free(job);
+                return ENOMEM;
+        }
+
+        fibril_add_ready(nav->worker_fid);
+        return EOK;
+}
+
 /** @}
  */

uspace/app/nav/nav.h

@@ -47 +47 @@
 extern void navigator_switch_panel(navigator_t *);
 extern void navigator_refresh_panels(navigator_t *);
+extern errno_t navigator_worker_start(navigator_t *, void (*)(void *),
+    void *);
 
 #endif

uspace/app/nav/newfile.c

@@ -34 +34 @@
  */
 
+#include <capa.h>
+#include <fmgt.h>
 #include <stdlib.h>
 #include <str_error.h>
@@ -42 +44 @@
 #include <ui/ui.h>
 #include <ui/window.h>
+#include <str.h>
 #include "dlg/newfiledlg.h"
+#include "dlg/progress.h"
 #include "menu.h"
 #include "newfile.h"
 #include "nav.h"
-
-static void new_file_bok(new_file_dlg_t *, void *, const char *);
+#include "types/newfile.h"
+
+static void new_file_bok(new_file_dlg_t *, void *, const char *, const char *);
 static void new_file_bcancel(new_file_dlg_t *, void *);
 static void new_file_close(new_file_dlg_t *, void *);
@@ -57 +62 @@
 };
 
+static void new_file_progress(void *, fmgt_progress_t *);
+
+static fmgt_cb_t new_file_fmgt_cb = {
+        .progress = new_file_progress
+};
+
 /** Open New File dialog.
  *
@@ -69 +80 @@
 }
 
+/** New file worker function.
+ *
+ * @param arg Argument (navigator_new_file_job_t)
+ */
+static void new_file_wfunc(void *arg)
+{
+        fmgt_t *fmgt = NULL;
+        navigator_new_file_job_t *job = (navigator_new_file_job_t *)arg;
+        char *msg = NULL;
+        navigator_t *nav = job->navigator;
+        ui_msg_dialog_t *dialog = NULL;
+        ui_msg_dialog_params_t params;
+        errno_t rc;
+        int rv;
+
+        rc = fmgt_create(&fmgt);
+        if (rc != EOK) {
+                /* out of memory */
+                return;
+        }
+
+        fmgt_set_cb(fmgt, &new_file_fmgt_cb, (void *)nav);
+        fmgt_set_init_update(fmgt, true);
+
+        rc = fmgt_new_file(fmgt, job->fname, job->nbytes);
+        if (rc != EOK) {
+                rv = asprintf(&msg, "Error creating file (%s).",
+                    str_error(rc));
+                if (rv < 0)
+                        return;
+                goto error;
+        }
+
+        fmgt_destroy(fmgt);
+        ui_lock(nav->ui);
+        progress_dlg_destroy(nav->progress_dlg);
+        navigator_refresh_panels(nav);
+        ui_unlock(nav->ui);
+        free(job);
+        return;
+error:
+        ui_lock(nav->ui);
+        progress_dlg_destroy(nav->progress_dlg);
+        ui_msg_dialog_params_init(&params);
+        params.caption = "Error";
+        params.text = msg;
+        (void) ui_msg_dialog_create(nav->ui, &params, &dialog);
+        ui_unlock(nav->ui);
+        free(msg);
+}
+
 /** New file dialog confirmed.
  *
@@ -74 +136 @@
  * @param arg Argument (navigator_t *)
  * @param fname New file name
- */
-static void new_file_bok(new_file_dlg_t *dlg, void *arg, const char *fname)
+ * @param fsize New file size
+ */
+static void new_file_bok(new_file_dlg_t *dlg, void *arg, const char *fname,
+    const char *fsize)
 {
         navigator_t *nav = (navigator_t *)arg;
         ui_msg_dialog_t *dialog = NULL;
+        navigator_new_file_job_t *job;
         ui_msg_dialog_params_t params;
+        progress_dlg_params_t pd_params;
+        capa_spec_t fcap;
         char *msg = NULL;
+        errno_t rc;
+        uint64_t nbytes;
         int rv;
-        FILE *f;
+
+        rc = capa_parse(fsize, &fcap);
+        if (rc != EOK) {
+                /* invalid file size */
+                return;
+        }
 
         new_file_dlg_destroy(dlg);
-        f = fopen(fname, "wx");
-        if (f == NULL) {
-                rv = asprintf(&msg, "Error creating file (%s).",
-                    str_error(errno));
+
+        rc = capa_to_blocks(&fcap, cv_nom, 1, &nbytes);
+        if (rc != EOK) {
+                rv = asprintf(&msg, "File size too large (%s).", fsize);
                 if (rv < 0)
                         return;
-
-                ui_msg_dialog_params_init(&params);
-                params.caption = "Error";
-                params.text = msg;
-                (void) ui_msg_dialog_create(nav->ui, &params, &dialog);
-                free(msg);
+                goto error;
+        }
+
+        job = calloc(1, sizeof(navigator_new_file_job_t));
+        if (job == NULL)
                 return;
-        }
-
-        fclose(f);
-        navigator_refresh_panels(nav);
+
+        job->navigator = nav;
+        job->fname = fname;
+        job->nbytes = nbytes;
+
+        progress_dlg_params_init(&pd_params);
+        pd_params.caption = "Creating new file";
+
+        rc = progress_dlg_create(nav->ui, &pd_params, &nav->progress_dlg);
+        if (rc != EOK) {
+                msg = str_dup("Out of memory.");
+                if (msg == NULL)
+                        return;
+                goto error;
+        }
+
+        rc = navigator_worker_start(nav, new_file_wfunc, (void *)job);
+        if (rc != EOK) {
+                msg = str_dup("Out of memory.");
+                if (msg == NULL)
+                        return;
+                goto error;
+        }
+
+        return;
+error:
+        ui_msg_dialog_params_init(&params);
+        params.caption = "Error";
+        params.text = msg;
+        (void) ui_msg_dialog_create(nav->ui, &params, &dialog);
+        free(msg);
 }
 
@@ -126 +226 @@
 }
 
+/** New file progress update.
+ *
+ * @param arg Argument (navigator_t *)
+ * @param progress Progress update
+ */
+static void new_file_progress(void *arg, fmgt_progress_t *progress)
+{
+        navigator_t *nav = (navigator_t *)arg;
+        char buf[128];
+
+        snprintf(buf, sizeof(buf), "Written %s of %s (%s done).",
+            progress->curf_procb, progress->curf_totalb,
+            progress->curf_percent);
+        progress_dlg_set_curf_prog(nav->progress_dlg, buf);
+}
+
 /** @}
  */

uspace/app/nav/types/dlg/newfiledlg.h

@@ -60 +60 @@
 } new_file_dlg_t;
 
-/** Prompt dialog callback */
+/** New File dialog callbacks */
 typedef struct new_file_dlg_cb {
         /** OK button was pressed */
-        void (*bok)(new_file_dlg_t *, void *, const char *);
+        void (*bok)(new_file_dlg_t *, void *, const char *, const char *);
         /** Cancel button was pressed */
         void (*bcancel)(new_file_dlg_t *, void *);

uspace/app/nav/types/nav.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -37 +37 @@
 #define TYPES_NAV_H
 
+#include <fibril.h>
 #include <ui/fixed.h>
 #include <ui/ui.h>
@@ -57 +58 @@
         /** Panels */
         struct panel *panel[navigator_panels];
+        /** Progress dialog */
+        struct progress_dlg *progress_dlg;
+        /** Worker fibril ID */
+        fid_t worker_fid;
 } navigator_t;
+
+/** Navigator worker job */
+typedef struct {
+        /** Navigator */
+        navigator_t *navigator;
+        /** Worker function */
+        void (*wfunc)(void *);
+        /** Worker argument */
+        void *arg;
+} navigator_worker_job_t;
 
 #endif