io(rdio): support deleting API upload WAVs after success

arancormonk · arancormonk · commit 8c97660ecd82 · 2026-04-26T18:37:48.000-05:00
diff --git a/docs/cli.md b/docs/cli.md
@@ -125,11 +125,16 @@ Tip: If paths or names contain spaces, wrap them in single quotes.
 - `--rdio-api-key <key>` Set API key for `/api/trunk-recorder-call-upload`
 - `--rdio-upload-timeout-ms <ms>` API timeout per call (default 5000 ms)
 - `--rdio-upload-retries <n>` API upload attempts per call (default 1)
+- `--rdio-api-delete-after-upload` Delete the per-call WAV after a successful API-only upload
 - `-r <files>` Play saved MBE files
 - `-c <file>` Save symbol captures to a .bin file
 - `-d <dir>` Save raw MBE vocoder frames in this folder
 - `-J <file>` Append event log output
 - `--frame-log <file>` Append frame-level one-line timestamped traces
+
+For rdio-scanner API uploads that should not persist on disk, use API-only mode with a RAM-backed per-call WAV directory
+and post-upload deletion, for example `-7 /dev/shm/dsd-neo-rdio -P --rdio-mode api --rdio-api-delete-after-upload`.
+DirWatch modes keep the WAV and JSON files because the watcher needs stable files to ingest.
 - `-L <file>` Append LRRP (location) data
 - `-Q <file>` Write structured DSP or M17 stream data to `./DSP/<file>`
 - `-q` Reverse mute: mute clear audio, unmute encrypted audio
diff --git a/docs/config-system.md b/docs/config-system.md
@@ -317,8 +317,11 @@ small subset is exposed as config keys for convenience (for example
 | `rdio_api_key` | STRING | rdio API key | (empty) |
 | `rdio_upload_timeout_ms` | INT | rdio API timeout per call in ms | `5000` |
 | `rdio_upload_retries` | INT | rdio API upload attempts per call | `1` |
+| `rdio_api_delete_after_upload` | BOOL | Delete per-call WAV after successful API-only upload | `false` |
 
 Note: `per_call_wav` and `static_wav` are mutually exclusive (same as `-P` vs `-w` on the CLI).
+For RAM-backed rdio API staging, set `per_call_wav_dir` to a tmpfs/RAM-disk path and enable
+`rdio_api_delete_after_upload`. DirWatch modes keep files for watcher ingestion.
 
 **[dsp] section:**
 | Key | Type | Description | Default |
diff --git a/include/dsd-neo/core/opts.h b/include/dsd-neo/core/opts.h
@@ -104,6 +104,7 @@ struct dsd_opts {
     int rdio_system_id;  //rdio-scanner system id used for API upload
     int rdio_upload_timeout_ms;
     int rdio_upload_retries;
+    int rdio_api_delete_after_upload; //delete per-call WAV after successful API-only upload
     int serial_baud;
     int serial_fd;
     int resume;
diff --git a/include/dsd-neo/runtime/config.h b/include/dsd-neo/runtime/config.h
@@ -691,6 +691,7 @@ typedef struct dsdneoUserConfig {
     char rdio_api_key[256];
     int rdio_upload_timeout_ms;
     int rdio_upload_retries;
+    int rdio_api_delete_after_upload; /* bool */
 
     /* [dsp] */
     int has_dsp;
diff --git a/src/core/util/dsd_init.c b/src/core/util/dsd_init.c
@@ -125,6 +125,7 @@ initOpts(dsd_opts* opts) {
     opts->rdio_system_id = 0;
     opts->rdio_upload_timeout_ms = 5000;
     opts->rdio_upload_retries = 1;
+    opts->rdio_api_delete_after_upload = 0;
     opts->rdio_api_key[0] = 0;
     snprintf(opts->rdio_api_url, sizeof opts->rdio_api_url, "%s", "http://127.0.0.1:3000");
     //opts->wav_out_fd = -1;
diff --git a/src/runtime/cli/args.c b/src/runtime/cli/args.c
@@ -175,6 +175,7 @@ dsd_parse_args(int argc, char** argv, dsd_opts* opts, dsd_state* state, int* out
     const char* rdio_api_key_cli = NULL;
     const char* rdio_upload_timeout_cli = NULL;
     const char* rdio_upload_retries_cli = NULL;
+    int rdio_api_delete_after_upload_cli = 0;
     const char* dmr_baofeng_pc5_cli = NULL;
     const char* dmr_csi_ee72_cli = NULL;
     const char* dmr_vertex_ks_csv_cli = NULL;
@@ -461,6 +462,10 @@ dsd_parse_args(int argc, char** argv, dsd_opts* opts, dsd_state* state, int* out
             rdio_upload_retries_cli = argv[++i];
             continue;
         }
+        if (strcmp(argv[i], "--rdio-api-delete-after-upload") == 0) {
+            rdio_api_delete_after_upload_cli = 1;
+            continue;
+        }
         if (strcmp(argv[i], "--dmr-baofeng-pc5") == 0) {
             if (i + 1 >= argc) {
                 LOG_ERROR("--dmr-baofeng-pc5 requires a hex key value\n");
@@ -820,6 +825,10 @@ dsd_parse_args(int argc, char** argv, dsd_opts* opts, dsd_state* state, int* out
         opts->rdio_upload_retries = retries;
         LOG_NOTICE("Rdio upload retries: %d\n", opts->rdio_upload_retries);
     }
+    if (rdio_api_delete_after_upload_cli) {
+        opts->rdio_api_delete_after_upload = 1;
+        LOG_NOTICE("Rdio API delete-after-upload enabled\n");
+    }
 
     if (dmr_baofeng_pc5_cli) {
         if (baofeng_ap_pc5_keystream_creation(state, dmr_baofeng_pc5_cli) != 0) {
diff --git a/src/runtime/cli/compact.c b/src/runtime/cli/compact.c
@@ -147,6 +147,9 @@ dsd_cli_compact_args(int argc, char** argv) {
             }
             continue;
         }
+        if (strcmp(arg, "--rdio-api-delete-after-upload") == 0) {
+            continue;
+        }
         if (strcmp(arg, "--dmr-baofeng-pc5") == 0) {
             if (i + 1 < argc) {
                 i++;
diff --git a/src/runtime/cli/usage.c b/src/runtime/cli/usage.c
@@ -114,6 +114,7 @@ dsd_cli_usage(void) {
     printf("      --rdio-api-key <key>  rdio-scanner API key for trunk-recorder-call-upload\n");
     printf("      --rdio-upload-timeout-ms <ms>  API upload timeout per call (default 5000)\n");
     printf("      --rdio-upload-retries <n>  API upload retry attempts per call (default 1)\n");
+    printf("      --rdio-api-delete-after-upload  Delete per-call WAV after successful API-only upload\n");
     printf("  -a            Enable Call Alert Beep\n");
     printf("                 (Warning! Might be annoying.)\n");
     printf("  -J <file>     Specify Filename for Event Log Output.\n");
diff --git a/src/runtime/config_schema.c b/src/runtime/config_schema.c
@@ -83,6 +83,8 @@ static const dsdcfg_schema_entry_t s_schema[] = {
     {"recording", "rdio_upload_timeout_ms", "rdio API upload timeout in milliseconds", "5000", NULL, DSDCFG_TYPE_INT,
      100, 120000, 0},
     {"recording", "rdio_upload_retries", "rdio API upload attempts per call", "1", NULL, DSDCFG_TYPE_INT, 0, 10, 0},
+    {"recording", "rdio_api_delete_after_upload", "Delete per-call WAV after successful API-only upload", "false", NULL,
+     DSDCFG_TYPE_BOOL, 0, 0, 0},
 
     /* [dsp] section */
     {"dsp", "iq_balance", "Enable RTL IQ balance (image suppression)", "false", NULL, DSDCFG_TYPE_BOOL, 0, 0, 0},
diff --git a/src/runtime/config_user.cpp b/src/runtime/config_user.cpp
@@ -97,6 +97,7 @@ user_cfg_reset(dsdneoUserConfig* cfg) {
     cfg->rdio_api_key[0] = '\0';
     cfg->rdio_upload_timeout_ms = 5000;
     cfg->rdio_upload_retries = 1;
+    cfg->rdio_api_delete_after_upload = 0;
 
     // DSP defaults (match runtime defaults)
     cfg->iq_balance = 0;
@@ -711,6 +712,7 @@ dsd_user_config_render_ini(const dsdneoUserConfig* cfg, FILE* out) {
         if (cfg->rdio_upload_retries >= 0) {
             fprintf(out, "rdio_upload_retries = %d\n", cfg->rdio_upload_retries);
         }
+        fprintf(out, "rdio_api_delete_after_upload = %s\n", cfg->rdio_api_delete_after_upload ? "true" : "false");
         fprintf(out, "\n");
     }
 
@@ -943,6 +945,7 @@ dsd_apply_user_config_to_opts_impl(const dsdneoUserConfig* cfg, dsd_opts* opts,
         opts->rdio_system_id = cfg->rdio_system_id;
         opts->rdio_upload_timeout_ms = cfg->rdio_upload_timeout_ms;
         opts->rdio_upload_retries = cfg->rdio_upload_retries;
+        opts->rdio_api_delete_after_upload = cfg->rdio_api_delete_after_upload;
         if (cfg->rdio_api_url[0]) {
             snprintf(opts->rdio_api_url, sizeof opts->rdio_api_url, "%s", cfg->rdio_api_url);
             opts->rdio_api_url[sizeof opts->rdio_api_url - 1] = '\0';
@@ -1136,6 +1139,7 @@ dsd_snapshot_opts_to_user_config(const dsd_opts* opts, const dsd_state* state, d
     cfg->rdio_api_key[sizeof cfg->rdio_api_key - 1] = '\0';
     cfg->rdio_upload_timeout_ms = opts->rdio_upload_timeout_ms;
     cfg->rdio_upload_retries = opts->rdio_upload_retries;
+    cfg->rdio_api_delete_after_upload = opts->rdio_api_delete_after_upload ? 1 : 0;
 
     // DSP snapshot (persist runtime toggles via env for the next run)
     cfg->has_dsp = 1;
diff --git a/src/runtime/config_user_loader.cpp b/src/runtime/config_user_loader.cpp
@@ -385,6 +385,11 @@ apply_recording_section_key(dsdneoUserConfig* cfg, const char* key_lc, const cha
             v = 10;
         }
         cfg->rdio_upload_retries = (int)v;
+    } else if (strcmp(key_lc, "rdio_api_delete_after_upload") == 0) {
+        int b = 0;
+        if (parse_bool(val, &b) == 0) {
+            cfg->rdio_api_delete_after_upload = b;
+        }
     }
 }
 
diff --git a/src/runtime/rdio_export.c b/src/runtime/rdio_export.c
@@ -42,6 +42,7 @@ typedef struct {
 typedef struct dsd_rdio_upload_job {
     dsd_rdio_api_config api;
     int remove_meta_on_success;
+    int remove_wav_on_success;
     char wav_path[DSD_RDIO_PATH_MAX];
     char meta_path[DSD_RDIO_PATH_MAX];
     struct dsd_rdio_upload_job* next;
@@ -55,9 +56,20 @@ static dsd_rdio_upload_job* g_rdio_upload_tail = NULL;
 static size_t g_rdio_upload_depth = 0;
 static int g_rdio_upload_stop_requested = 0;
 static atomic_int g_rdio_upload_state = 0; // 0=uninitialized, 1=initializing, 2=ready, 3=failed, 4=stopping
+static atomic_int g_rdio_delete_after_upload_dirwatch_warned = 0;
 
 static int dsd_rdio_upload_trunk_recorder(const dsd_rdio_api_config* api, const char* wav_path, const char* meta_path);
 
+static void
+dsd_rdio_remove_after_upload(const char* path, const char* kind) {
+    if (!path || path[0] == '\0') {
+        return;
+    }
+    if (remove(path) != 0 && errno != ENOENT) {
+        LOG_WARN("Rdio API upload: failed to delete %s %s: %s\n", kind ? kind : "file", path, strerror(errno));
+    }
+}
+
 static DSD_THREAD_RETURN_TYPE
 #if DSD_PLATFORM_WIN_NATIVE
     __stdcall
@@ -86,9 +98,13 @@ static DSD_THREAD_RETURN_TYPE
         }
         dsd_mutex_unlock(&g_rdio_upload_mutex);
 
-        if (dsd_rdio_upload_trunk_recorder(&job->api, job->wav_path, job->meta_path) == 0
-            && job->remove_meta_on_success) {
-            (void)remove(job->meta_path);
+        if (dsd_rdio_upload_trunk_recorder(&job->api, job->wav_path, job->meta_path) == 0) {
+            if (job->remove_meta_on_success) {
+                dsd_rdio_remove_after_upload(job->meta_path, "metadata");
+            }
+            if (job->remove_wav_on_success) {
+                dsd_rdio_remove_after_upload(job->wav_path, "audio");
+            }
         }
         free(job);
     }
@@ -242,7 +258,7 @@ dsd_rdio_validate_api_config(const dsd_rdio_api_config* api) {
 
 static int
 dsd_rdio_enqueue_api_upload(const dsd_opts* opts, const char* wav_path, const char* meta_path,
-                            int remove_meta_on_success) {
+                            int remove_meta_on_success, int remove_wav_on_success) {
     if (!opts || !wav_path || !meta_path) {
         return -1;
     }
@@ -266,6 +282,7 @@ dsd_rdio_enqueue_api_upload(const dsd_opts* opts, const char* wav_path, const ch
 
     job->api = api;
     job->remove_meta_on_success = remove_meta_on_success ? 1 : 0;
+    job->remove_wav_on_success = remove_wav_on_success ? 1 : 0;
 
     int wn = snprintf(job->wav_path, sizeof(job->wav_path), "%s", wav_path);
     int mn = snprintf(job->meta_path, sizeof(job->meta_path), "%s", meta_path);
@@ -778,8 +795,15 @@ dsd_rdio_export_call(const dsd_opts* opts, const Event_History_I* event_struct,
         LOG_WARN("Rdio API upload requested but this build was compiled without libcurl support\n");
         return -1;
 #else
-        int remove_meta_on_success = !dsd_rdio_mode_wants_dirwatch(mode);
-        if (dsd_rdio_enqueue_api_upload(opts, wav_path, meta_path, remove_meta_on_success) != 0) {
+        int wants_dirwatch = dsd_rdio_mode_wants_dirwatch(mode);
+        int remove_meta_on_success = !wants_dirwatch;
+        int remove_wav_on_success = opts->rdio_api_delete_after_upload && !wants_dirwatch;
+        if (opts->rdio_api_delete_after_upload && wants_dirwatch
+            && atomic_exchange(&g_rdio_delete_after_upload_dirwatch_warned, 1) == 0) {
+            LOG_WARN("Rdio API delete-after-upload ignored when DirWatch export is active\n");
+        }
+        if (dsd_rdio_enqueue_api_upload(opts, wav_path, meta_path, remove_meta_on_success, remove_wav_on_success)
+            != 0) {
             return -1;
         }
 #endif
diff --git a/tests/runtime/test_runtime_cli_parse.c b/tests/runtime/test_runtime_cli_parse.c
@@ -1123,11 +1123,12 @@ test_rdio_long_options_parse(void) {
     char arg10[] = "2500";
     char arg11[] = "--rdio-upload-retries";
     char arg12[] = "4";
-    char* argv[] = {arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, NULL};
+    char arg13[] = "--rdio-api-delete-after-upload";
+    char* argv[] = {arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, NULL};
 
     int argc_effective = 0;
     int exit_rc = -1;
-    int rc = dsd_parse_args(13, argv, opts, state, &argc_effective, &exit_rc);
+    int rc = dsd_parse_args(14, argv, opts, state, &argc_effective, &exit_rc);
     if (rc != DSD_PARSE_CONTINUE) {
         fprintf(stderr, "expected rc=%d, got %d (exit_rc=%d)\n", DSD_PARSE_CONTINUE, rc, exit_rc);
         freeState(state);
@@ -1161,6 +1162,10 @@ test_rdio_long_options_parse(void) {
         fprintf(stderr, "expected retries=4, got %d\n", opts->rdio_upload_retries);
         test_rc = 1;
     }
+    if (opts->rdio_api_delete_after_upload != 1) {
+        fprintf(stderr, "expected rdio_api_delete_after_upload=1, got %d\n", opts->rdio_api_delete_after_upload);
+        test_rc = 1;
+    }
 
     freeState(state);
     free(opts);
diff --git a/tests/runtime/test_runtime_config_user.cpp b/tests/runtime/test_runtime_config_user.cpp
@@ -168,7 +168,8 @@ test_load_and_apply_basic(void) {
                              "rdio_api_url = \"http://127.0.0.1:3000\"\n"
                              "rdio_api_key = \"apikey\"\n"
                              "rdio_upload_timeout_ms = 2500\n"
-                             "rdio_upload_retries = 3\n";
+                             "rdio_upload_retries = 3\n"
+                             "rdio_api_delete_after_upload = true\n";
 
     char path[DSD_TEST_PATH_MAX];
     if (write_temp_config(ini, path, sizeof path) != 0) {
@@ -256,6 +257,10 @@ test_load_and_apply_basic(void) {
                 opts.rdio_upload_retries);
         rc |= 1;
     }
+    if (opts.rdio_api_delete_after_upload != 1) {
+        fprintf(stderr, "rdio API delete-after-upload not applied (%d)\n", opts.rdio_api_delete_after_upload);
+        rc |= 1;
+    }
 
     (void)remove(path);
     return rc;
diff --git a/tests/runtime/test_runtime_rdio_export.c b/tests/runtime/test_runtime_rdio_export.c

Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,9 @@ dsd_cli_compact_args(int argc, char** argv) {`
`147`	`147`	`}`
`148`	`148`	`continue;`
`149`	`149`	`}`
	`150`	`+ if (strcmp(arg, "--rdio-api-delete-after-upload") == 0) {`
	`151`	`+ continue;`
	`152`	`+ }`
`150`	`153`	`if (strcmp(arg, "--dmr-baofeng-pc5") == 0) {`
`151`	`154`	`if (i + 1 < argc) {`
`152`	`155`	`i++;`