From 2127b1bdd73ecd2423e443992da4b442f5a3c1a3 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Wed, 04 Feb 2026 21:19:25 +0000
Subject: [PATCH] =Major overhaul of MetaManager.php -> Meta.php and RestRouteManager.php -> Rest.php. Seems to work for JakeVan
---
inc/rest/routes/UploadRoutes.php | 223 +++++++++++++++++++------------------------------------
1 files changed, 77 insertions(+), 146 deletions(-)
diff --git a/inc/rest/routes/UploadRoutes.php b/inc/rest/routes/UploadRoutes.php
index 5735208..f519fa7 100644
--- a/inc/rest/routes/UploadRoutes.php
+++ b/inc/rest/routes/UploadRoutes.php
@@ -1,12 +1,13 @@
<?php
namespace JVBase\rest\routes;
-use JVBase\JVB;
use JVBase\managers\queue\executors\UploadExecutor;
use JVBase\managers\queue\TypeConfig;
-use JVBase\rest\RestRouteManager;
-use JVBase\meta\MetaManager;
+use JVBase\rest\PermissionHandler;
+use JVBase\rest\Rest;
+use JVBase\meta\Meta;
use JVBase\managers\UploadManager;
+use JVBase\rest\Route;
use JVBase\utility\Features;
use WP_REST_Request;
use WP_REST_Response;
@@ -16,12 +17,11 @@
if (!defined('ABSPATH')) {
exit; // Exit if accessed directly
}
-class UploadRoutes extends RestRouteManager
+class UploadRoutes extends Rest
{
public function __construct()
{
- $this->action = 'dash-';
parent::__construct();
add_action('init', [$this, 'registerUploadExecutors'], 5);
@@ -57,7 +57,7 @@
));
// Metadata updates
- $registry->register('update_metadata', new TypeConfig(
+ $registry->register('update_image_meta', new TypeConfig(
executor: $executor
));
@@ -85,50 +85,28 @@
*/
public function registerRoutes():void
{
- // Main upload endpoint
- register_rest_route($this->namespace, '/uploads', [
- 'methods' => 'POST',
- 'callback' => [$this, 'handleUpload'],
- 'permission_callback' => [$this, 'checkPermission']
- ]);
+ Route::for('uploads')
+ ->post([$this, 'handleUpload'])
+ ->auth(PermissionHandler::combine(['nonce']))
+ ->rateLimit(30);
+ Route::for('uploads/groups')
+ ->post([$this, 'handleGroupingRequest'])
+ ->auth(PermissionHandler::combine(['nonce']))
+ ->rateLimit(30)
+ ->args([
+ 'id' => 'string|required',
+ 'content' => 'string|required',
+ 'user' => 'int|required'
+ ]);
- register_rest_route($this->namespace, '/uploads/groups', [
- 'methods' => 'POST',
- 'callback' => [$this, 'handleGroupingRequest'],
- 'permission_callback' => [$this, 'checkPermission'],
- 'args' => [
- 'id' => [
- 'required' => true,
- 'type' => 'string',
- 'description' => 'Original upload operation ID'
- ],
- 'content' => [
- 'required' => true,
- 'type' => 'string'
- ],
- 'user' => [
- 'required' => true,
- 'type' => 'integer'
- ],
- ]
- ]);
-
- register_rest_route($this->namespace, '/uploads/meta', [
- 'methods' => 'POST',
- 'callback' => [$this, 'handleMetadataUpdate'],
- 'permission_callback' => [$this, 'checkPermission'],
- 'args' => [
- 'user' => [
- 'type' => 'integer',
- 'required' => true
- ],
- 'items' => [
- 'type' => 'array',
- 'required' => true,
- 'description' => 'Direct attachment IDs (for updates after completion)',
- ],
- ]
- ]);
+ Route::for('uploads/meta')
+ ->post([$this, 'handleMetadataUpdate'])
+ ->auth(PermissionHandler::combine(['nonce']))
+ ->rateLimit(30)
+ ->args([
+ 'user' => 'int|required',
+ 'items' => 'array|required'
+ ]);
}
/**
@@ -186,7 +164,7 @@
$args['term_id'] = absint($value);
}
break;
- // Field Name, as defined for MetaManager.php
+ // Field Name, as defined for Meta.php
case 'field_name':
if (is_string($value)) {
$args['field_name'] = sanitize_text_field($value);
@@ -268,13 +246,12 @@
$files = $request->get_file_params();
$args = $this->buildUploadArgs($request);
- if (!$args['content'] || !$args['user']) {
- $this->logError('Missing required data');
- return new WP_REST_Response([
- 'success' => false,
- 'message' => 'Missing required data'
- ]);
+ if (!$args['user']) {
+ return $this->unauthorized();
+ }
+ if (!$args['content']) {
+ return $this->validationError(['message' => 'Missing content']);
}
// Step 1: Secure all uploaded files
@@ -282,21 +259,13 @@
if (empty($secured_files)) {
$this->logError('No valid files to upload');
- return new WP_REST_Response([
- 'success' => false,
- 'message' => 'No valid files to upload'
- ]);
+ return $this->error('No valid files to upload');
}
// Step 2: Queue for processing via OperationQueue
$operation_id = $this->queueProcessing($secured_files, $args);
- return new WP_REST_Response([
- 'success' => true,
- 'operation_id' => $operation_id,
- 'file_count' => count($secured_files),
- 'message' => 'Files secured and queued for processing'
- ], 200);
+ return $this->queued($operation_id, 'Files secured and queued for processing');
} catch (Exception $e) {
// Error handling...
@@ -309,12 +278,7 @@
'trace' => $e->getTraceAsString()
]
);
-
- return $this->sendResponse(
- false,
- ['error_code' => 'upload_failed'],
- 'Upload processing failed: ' . $e->getMessage()
- );
+ return $this->error($e->getMessage());
}
}
@@ -602,23 +566,23 @@
$attachment_ids = array_column($results, 'attachment_id');
if (array_key_exists('post_id', $data)) {
- $meta = new MetaManager($data['post_id'], 'post');
+ $meta = Meta::forPost($data['post_id']);
} elseif (array_key_exists('term_id', $data)) {
- $meta = new MetaManager($data['term_id'], 'term');
+ $meta = Meta::forTerm($data['term_id']);
} else {
$link = (int)get_user_meta($data['user'], BASE.'link');
- $meta = new MetaManager($link, 'post');
+ $meta = Meta::forPost($link);
}
// Get existing value
- $existing = $meta->getValue($data['field_name']);
+ $existing = $meta->get($data['field_name']);
$existing_ids = !empty($existing) ? explode(',', $existing) : [];
// Merge with new IDs
$all_ids = array_unique(array_merge($existing_ids, $attachment_ids));
// Update with comma-separated string
- $meta->updateValue($data['field_name'], implode(',', $all_ids));
+ $meta->set($data['field_name'], implode(',', $all_ids));
}
/**
@@ -797,23 +761,15 @@
}
$pending = [];
$attachments = array_filter($items, function ($item) {
- return array_key_exists('attachmentId', $item);
+ return array_key_exists('attachmentId', $item) || array_key_exists('uploadId', $item);
});
- if (count($attachments) !== count($items)) {
- $pending = array_filter($items, function ($item) {
- return array_key_exists('uploadId',$item);
- });
- }
if (!empty($attachments)) {
- // Phase 2B: Direct attachment update (images already processed)
- return $this->updateMeta($attachments, $data['user']);
+ error_log('Attachments: '.print_r($attachments, true));
+ return $this->queueMetaUpdate($attachments, $data['user']);
}
- elseif (!empty($pending)) {
- // Phase 2A: Queue metadata update with dependency on upload operation
- return $this->queueMetaUpdate($pending, $data['user']);
- }
+
return $this->sendResponse(
false,
@@ -849,6 +805,7 @@
foreach ($data as $info) {
try {
$attachment_id = $info['attachmentId'];
+ error_log('Updating attachment ID:'.print_r($attachment_id,true));
$ids[] = $attachment_id;
unset($info['attachmentId']);
// Verify attachment exists and user has permission
@@ -887,22 +844,16 @@
$errors = [];
$original = count($data);
foreach ($data as $uploadID => $info) {
- if (!array_key_exists('depends_on', $info)) {
- unset($data[$uploadID]);
- $errors[$uploadID] = $info;
- continue;
- }
- if (!in_array($info['depends_on'], $depends_on)) {
+ if (array_key_exists('depends_on', $info) && !in_array($info['depends_on'], $depends_on)) {
$depends_on[] = $info['depends_on'];
}
}
$operationID = $queue->queueOperation(
- 'update_metadata',
+ 'update_image_meta',
$user,
$data,
[
'depends_on' => $depends_on,
- 'priority' => 'medium',
]
);
@@ -929,7 +880,7 @@
$errors = [];
foreach ($operation->depends_on as $dependency) {
$operationData = JVB()->queue()->getOperation($dependency);
- if (!$operationData || $operationData->status !== 'completed') {
+ if (!$operationData || $operationData->state !== 'completed') {
throw new Exception('Original upload operation not found or not completed');
}
@@ -1126,7 +1077,7 @@
$response['operation_id'] = $operation_id;
}
- return new WP_REST_Response($response);
+ return $this->success($response);
}
@@ -1139,26 +1090,21 @@
$files = $request->get_file_params();
$args = $this->buildUploadArgs($request);
- error_log('handleGroupingRequest Files: '.print_r($files, true));
- error_log('handleGroupingRequest args: '.print_r($args, true));
-
- if (!$args['content'] || !$args['user'] || !$args['posts']) {
- $this->logError('Missing required data');
- return new WP_REST_Response([
- 'success' => false,
- 'message' => 'Missing required data'
- ]);
+ if (!array_key_exists('user', $args) || $args['user'] === 0){
+ return $this->unauthorized();
+ }
+ if (!array_key_exists('content', $args) || empty($args['content'])) {
+ return $this->validationError(['message'=>'Missing required content']);
+ }
+ if (!array_key_exists('posts', $args) || empty($args['posts'])) {
+ return $this->validationError(['message' => 'Missing posts required']);
}
// Secure files to temporary storage
$secured_files = $this->secureFiles($files, $args);
if (empty($secured_files['files'])) {
- return $this->sendResponse(
- false,
- ['error_code' => 'no_files'],
- 'No valid files to upload'
- );
+ return $this->error('No valid files to upload');
}
// Queue file upload operation
@@ -1184,7 +1130,7 @@
]
);
- JVB()->queue()->queueOperation(
+ $ID = JVB()->queue()->queueOperation(
'process_upload_groups',
$args['user'],
$args,
@@ -1195,17 +1141,7 @@
]
);
- return $this->sendResponse(
- true,
- [
- 'operation_id' => $args['id'],
- 'upload_operation_id' => $args['upload'],
- 'post_count' => count($args['posts']),
- 'file_count' => count($secured_files['files'])
- ],
- 'Files uploaded and posts queued for creation'
- );
-
+ return $this->queued($ID['operation_id'], 'Files uploaded and posts queued for creation');
} catch (Exception $e) {
JVB()->error()->log(
'[UploadRoutes]:handleGroupingRequest',
@@ -1215,12 +1151,7 @@
'trace' => $e->getTraceAsString()
]
);
-
- return $this->sendResponse(
- false,
- ['error_code' => 'grouping_failed'],
- 'Grouping operation failed: ' . $e->getMessage()
- );
+ return $this->error('Grouping operation failed: '.$e->getMessage());
}
}
@@ -1337,12 +1268,12 @@
// Set gallery images
if (!empty($gallery_attachment_ids)) {
- $meta = new MetaManager($new_post_id, 'post');
+ $meta = Meta::forPost($new_post_id);
$fields = jvbGetFields($content, 'post');
foreach ($fields as $name => $config) {
if ($config['type'] === 'gallery') {
- $meta->updateValue($name, implode(',', $gallery_attachment_ids));
+ $meta->set($name, implode(',', $gallery_attachment_ids));
break;
}
}
@@ -1746,25 +1677,25 @@
// Determine meta type
if (!empty($data['post_id'])) {
- $meta = new MetaManager($data['post_id'], 'post');
+ $meta = Meta::forPost($data['post_id']);
} elseif (!empty($data['term_id'])) {
- $meta = new MetaManager($data['term_id'], 'term');
+ $meta = Meta::forTerm($data['term_id']);
} elseif (!empty($data['user'])) {
$link = (int)get_user_meta($data['user'], BASE.'link', true);
- $meta = new MetaManager($link, 'post');
+ $meta = Meta::forPost($link);
} else {
return;
}
// Get existing value
- $existing = $meta->getValue($data['field_name']);
+ $existing = $meta->get($data['field_name']);
$existing_ids = !empty($existing) ? explode(',', $existing) : [];
// Merge with new IDs
$all_ids = array_unique(array_merge($existing_ids, $attachment_ids));
// Update with comma-separated string
- $meta->updateValue($data['field_name'], implode(',', $all_ids));
+ $meta->set($data['field_name'], implode(',', $all_ids));
}
/**
@@ -1852,11 +1783,11 @@
set_post_thumbnail($post_id, $attachment_id);
} else {
// Others go to gallery
- $meta = new MetaManager($post_id, 'post');
- $existing = $meta->getValue('gallery');
+ $meta = Meta::forPost($post_id);
+ $existing = $meta->get('gallery');
$existing_ids = !empty($existing) ? explode(',', $existing) : [];
$existing_ids[] = $attachment_id;
- $meta->updateValue('gallery', implode(',', $existing_ids));
+ $meta->set('gallery', implode(',', $existing_ids));
}
}
@@ -1884,15 +1815,15 @@
set_post_thumbnail($post_id, $attachment_id);
} elseif (str_starts_with($mime_type, 'video/')) {
// Save to video field
- $meta = new MetaManager($post_id, 'post');
- $meta->updateValue('video', $attachment_id);
+ $meta = Meta::forPost($post_id);
+ $meta->set('video', $attachment_id);
} else {
// Documents - save to documents field
- $meta = new MetaManager($post_id, 'post');
- $existing = $meta->getValue('documents');
+ $meta = Meta::forPost($post_id);
+ $existing = $meta->get('documents');
$existing_ids = !empty($existing) ? explode(',', $existing) : [];
$existing_ids[] = $attachment_id;
- $meta->updateValue('documents', implode(',', $existing_ids));
+ $meta->set('documents', implode(',', $existing_ids));
}
}
}
--
Gitblit v1.10.0