From a24a06002081ad71a78ffeff9072725ba39cf121 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Tue, 17 Feb 2026 20:05:31 +0000
Subject: [PATCH] =minor changes, particularly around the JVB_CHILD_URL pattern
---
inc/rest/routes/UploadRoutes.php | 40 +++++++++++++++++++++++-----------------
1 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/inc/rest/routes/UploadRoutes.php b/inc/rest/routes/UploadRoutes.php
index 67183ba..86ecc06 100644
--- a/inc/rest/routes/UploadRoutes.php
+++ b/inc/rest/routes/UploadRoutes.php
@@ -2,6 +2,7 @@
namespace JVBase\rest\routes;
use JVBase\managers\queue\executors\UploadExecutor;
+use JVBase\managers\queue\mergers\UploadMerger;
use JVBase\managers\queue\TypeConfig;
use JVBase\rest\PermissionHandler;
use JVBase\rest\Rest;
@@ -34,9 +35,11 @@
{
$registry = JVB()->queue()->registry();
$executor = new UploadExecutor();
+ $merger = new UploadMerger('secured_files');
// Image uploads - chunked at 5 files
$registry->register('image_upload', new TypeConfig(
+ mergeable: $merger,
executor: $executor,
chunkKey: 'secured_files',
chunkSize: 3
@@ -44,6 +47,7 @@
// Video uploads - one at a time (heavy processing)
$registry->register('video_upload', new TypeConfig(
+ mergeable: $merger,
executor: $executor,
chunkKey: 'secured_files',
chunkSize: 1
@@ -51,6 +55,7 @@
// Document uploads - chunked at 10
$registry->register('document_upload', new TypeConfig(
+ mergeable: $merger,
executor: $executor,
chunkKey: 'secured_files',
chunkSize: 5
@@ -414,24 +419,25 @@
error_log('queuedProcessing operation: '.print_r($queuedProcessing, true));
+ $uploadOpId = $queuedProcessing['operation_id'];
+
if ($args['mode'] !== 'selection') {
- $dependencies = [$args['upload']];
- error_log('Queueing attach to upload with id: '.print_r($args['id'], true));
- error_log('And dependent on: '.print_r($dependencies, true));
- error_log('Attaching args: '.print_r($args, true));
- $attachingOp = JVB()->queue()->queueOperation(
- 'attach_upload_to_content',
- $args['user'],
- $args,
- [
- 'priority' => 'high',
- 'operation_id' => $args['id'],
- 'depends_on' => $dependencies
- ]
- );
-
- error_log('queued attaching operation: '.print_r($attachingOp, true));
+ // Only create attach_upload_to_content if the upload was NOT merged.
+ // When merged, the original upload's attach_upload_to_content
+ // will handle all files after the merged image_upload completes.
+ if (!$queuedProcessing['updated_existing']) {
+ JVB()->queue()->queueOperation(
+ 'attach_upload_to_content',
+ $args['user'],
+ $args,
+ [
+ 'priority' => 'high',
+ 'operation_id' => $args['id'],
+ 'depends_on' => [$uploadOpId]
+ ]
+ );
+ }
}
JVB()->queue()->queueOperation(
@@ -445,7 +451,7 @@
'priority' => 'low',
'chunk_size' => 5,
'chunk_key' => 'files',
- 'depends_on' => $args['upload']
+ 'depends_on' => [$uploadOpId]
]
);
--
Gitblit v1.10.0