From 3d25ad7de4fdbb3eba2cde2a62422e6be5d79a0a Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Tue, 25 Aug 2026 22:57:22 +0000
Subject: [PATCH] =It's been a minute. I went through the Routes and associated Managers and ensured they played together well. Reworked the Cache.php, and I think I caught all the references. Moving away from JVBase() root class, to individuall classes that are Instanced. Double checked for the ABSPATH check in every file, and added index.php to every directory that didn't already have it. Also still working on the MenuBlock to work with WooCommerce for now for Northeh
---
inc/managers/queue/executors/UploadExecutor.php | 181 ++++++++++++++-------------------------------
1 files changed, 57 insertions(+), 124 deletions(-)
diff --git a/inc/managers/queue/executors/UploadExecutor.php b/inc/managers/queue/executors/UploadExecutor.php
index b825232..7e1637e 100644
--- a/inc/managers/queue/executors/UploadExecutor.php
+++ b/inc/managers/queue/executors/UploadExecutor.php
@@ -1,13 +1,13 @@
<?php
namespace JVBase\managers\queue\executors;
-use JVBase\managers\queue\{Executor, Operation, Progress, Result};
+use JVBase\managers\queue\{Executor, Operation, Progress, Queue, Result};
use JVBase\managers\Cache;
+use JVBase\managers\Errors;
use JVBase\managers\UploadManager;
use JVBase\meta\Meta;
use Exception;
use JVBase\registrar\Registrar;
-use JVBase\base\Site;
use WP_Error;
if (!defined('ABSPATH')) {
@@ -31,10 +31,16 @@
'process_upload_groups'
];
+ /**
+ * @param Operation $operation
+ * @param Progress $progress
+ * @return Result
+ * @throws Exception
+ */
public function execute(Operation $operation, Progress $progress): Result
{
if (!in_array($operation->type, self::HANDLED_TYPES)) {
- throw new Exception("UploadExecutor cannot handle type: {$operation->type}");
+ throw new Exception("UploadExecutor cannot handle type: $operation->type");
}
try {
@@ -48,11 +54,11 @@
'temporary_cleanup' => $this->processTemporaryCleanup($operation, $data, $progress),
'attach_upload_to_content'=> $this->processAttachToContent($operation, $data, $progress),
'process_upload_groups' => $this->processUploadGroups($operation, $data, $progress),
- default => throw new Exception("Unknown type: {$operation->type}")
+ default => throw new Exception("Unknown type: $operation->type")
};
} catch (Exception $e) {
- JVB()->error()->log(
+ Errors::getInstance()->log(
'[UploadExecutor]:execute',
$e->getMessage(),
[
@@ -74,74 +80,32 @@
*/
private function processFileUpload(Operation $operation, array $data, string $fileType, Progress $progress): Result
{
- $uploader = new UploadManager();
- $processedResults = [];
+ $uploader = UploadManager::getInstance();
$errors = [];
$uploadIds = [];
$securedFiles = $data['secured_files'] ?? [];
+ $args = $data;
+ unset($args['secured_files']);
- // Phase 1: File I/O — no DB, no transactions
$prepared = [];
foreach ($securedFiles as $securedFile) {
$uploadIds[] = $securedFile['upload_id'];
try {
- $prepared[$securedFile['upload_id']] = $uploader->prepareFile(
+ $prepared[$securedFile['upload_id']] = $uploader->processUpload(
$securedFile['temp_path'],
- [
- 'file_type' => $fileType,
- 'user_id' => $operation->userId,
- 'post_id' => (int)($data['post_id'] ?? 0),
- 'term_id' => (int)($data['term_id'] ?? 0),
- 'original_name' => $securedFile['original_name'],
- 'mime_type' => $securedFile['mime_type'],
- 'content' => $data['content'] ?? '',
- ]
+ $args
);
+ $progress->advance();
} catch (Exception $e) {
$progress->failItem($securedFile['upload_id'], $e->getMessage());
$errors[] = $e->getMessage();
}
}
- // Phase 2: DB registration — quick per-file writes
- foreach ($prepared as $uploadId => $fileInfo) {
- try {
- $result = $uploader->registerFile($fileInfo);
- if (!$result['success']) {
- $progress->failItem($uploadId, 'Registration failed');
- $errors[] = "Failed to register {$uploadId}";
- continue;
- }
-
- $processedResults[$uploadId] = [
- 'upload_id' => $uploadId,
- 'attachment_id' => $result['attachment_id'] ?? 0,
- 'url' => $result['url'] ?? '',
- 'sizes' => $result['sizes'] ?? [],
- ];
-
- // Apply frontend metadata if provided
- $securedFile = $this->findSecuredFile($securedFiles, $uploadId);
- if ($securedFile && !empty($securedFile['metadata'])) {
- $this->applyMeta($result['attachment_id'], $securedFile['metadata']);
- }
-
- $progress->advance();
-
- } catch (Exception $e) {
- $progress->failItem($uploadId, $e->getMessage());
- $errors[] = $e->getMessage();
- }
- }
-
- // Destination + cleanup unchanged
- $this->handleUploadDestination($data, $processedResults);
- $this->cleanupTempFiles($securedFiles, $operation->userId);
-
- $outcome = count($processedResults) > 0 ? 'success' : 'failed';
- if (count($processedResults) > 0 && !empty($errors)) {
+ $outcome = count($prepared) > 0 ? 'success' : 'failed';
+ if (count($prepared) > 0 && !empty($errors)) {
$outcome = 'partial';
}
@@ -149,8 +113,8 @@
outcome: $outcome,
result: [
'upload_ids' => $uploadIds,
- 'uploads' => $processedResults,
- 'processed_count' => count($processedResults),
+ 'uploads' => $prepared,
+ 'processed_count' => count($prepared),
'total_count' => count($uploadIds),
'errors' => $errors,
]
@@ -158,20 +122,12 @@
}
/**
- * Find a secured file entry by upload_id
- */
- private function findSecuredFile(array $securedFiles, string $uploadId): ?array
- {
- foreach ($securedFiles as $file) {
- if (($file['upload_id'] ?? null) === $uploadId) {
- return $file;
- }
- }
- return null;
- }
-
- /**
* Attach upload results to content
+ * @param Operation $operation
+ * @param array $data
+ * @param Progress $progress
+ * @return Result
+ * @throws Exception
*/
private function processAttachToContent(Operation $operation, array $data, Progress $progress): Result
{
@@ -181,9 +137,9 @@
throw new Exception('No upload operation ID provided');
}
- $uploadOp = JVB()->queue()->get($uploadOpId);
+ $uploadOp = Queue::getInstance()->get($uploadOpId);
if (!$uploadOp || !in_array($uploadOp->outcome, ['success', 'partial'])) {
- throw new Exception("Upload operation {$uploadOpId} not completed successfully");
+ throw new Exception("Upload operation $uploadOpId not completed successfully");
}
$uploadResults = $uploadOp->result['uploads'] ?? [];
@@ -194,7 +150,7 @@
// Resolve post_id from content_update dependency for new posts
if (empty($data['post_id']) || str_starts_with((string)($data['item_id'] ?? ''), 'new')) {
foreach ($operation->dependencies as $depId) {
- $dep = JVB()->queue()->get($depId);
+ $dep = Queue::getInstance()->get($depId);
if ($dep && $dep->type === 'content_update' && !empty($dep->result['new_posts'])) {
$itemId = $data['item_id'] ?? null;
if ($itemId && isset($dep->result['new_posts'][$itemId])) {
@@ -213,20 +169,13 @@
if ($data['field_name'] === 'timeline_gallery') {
$registrar = Registrar::getInstance($data['content']);
if ($registrar) {
- switch ($registrar->getType()) {
- case 'post':
- $meta = Meta::forPost($data['item_id']);
- break;
- case 'term':
- $meta = Meta::forTerm($data['item_id']);
- break;
- case 'user':
- $meta = Meta::forUser($data['item_id']);
- break;
- default:
- $meta = false;
+ $meta = match ($registrar->getType()) {
+ 'post' => Meta::forPost($data['item_id']),
+ 'term' => Meta::forTerm($data['item_id']),
+ 'user' => Meta::forUser($data['item_id']),
+ default => false,
+ };
- }
if ($meta) {
$title = $meta->get('post_title');
$current = $meta->get('number');
@@ -295,7 +244,7 @@
try {
if (array_key_exists('depends_on', $info)) {
// Get the dependency operation to find attachment ID
- $depOp = JVB()->queue()->get($info['depends_on']);
+ $depOp = Queue::getInstance()->get($info['depends_on']);
if (!$depOp || !$depOp->result) {
$errors[] = "Dependency {$info['depends_on']} not found or has no result";
continue;
@@ -313,6 +262,10 @@
$errors[] = "No attachment found for: ".print_r($info, true);
continue;
}
+ $postID = wp_get_post_parent_id($attachmentId);
+ if ($postID && !in_array($postID, $postsAttachedTo)){
+ Cache::clearPost($postID);
+ }
$this->applyMeta($attachmentId, $info);
$updatedCount++;
@@ -323,20 +276,6 @@
$progress->failItem($uploadId, $e->getMessage());
$errors[] = $e->getMessage();
}
-
- if ($success && $attachmentId) {
- $postID = wp_get_post_parent_id($attachmentId);
- if ($postID && !in_array($postID, $postsAttachedTo)){
- $postsAttachedTo[] = $postID;
- //TODO: is there a better way?
- }
- }
-
- }
- if (!empty ($postsAttachedTo)) {
- foreach ($postsAttachedTo as $postId) {
- Cache::invalidateItem('post', $postId);
- }
}
$outcome = $updatedCount > 0 ? 'success' : 'failed';
@@ -354,11 +293,14 @@
}
/**
- * Cleanup temporary upload files
+ * @param Operation $operation
+ * @param array $data
+ * @param Progress $progress
+ * @return Result
*/
private function processTemporaryCleanup(Operation $operation, array $data, Progress $progress): Result
{
- $uploader = new UploadManager();
+ $uploader = UploadManager::getInstance();
// Cleanup secured files
if (!empty($data['files'])) {
@@ -402,7 +344,7 @@
$uploads = [];
$uploadIds = [];
foreach ($dependencies as $dependency) {
- $res = JVB()->queue()->getOperationValue($dependency, 'result');
+ $res = Queue::getInstance()->getOperationValue($dependency, 'result');
if (empty($res)) {
continue;
}
@@ -695,6 +637,11 @@
// Helper methods
// ─────────────────────────────────────────────────────────────
+ /**
+ * @param int $attachmentId
+ * @param array $metadata
+ * @return void
+ */
private function applyMeta(int $attachmentId, array $metadata): void
{
$postUpdates = [];
@@ -779,25 +726,6 @@
}
- private function updateFieldValue(array $data, array $results): void
- {
- if (empty($data['field_name'])) {
- return;
- }
-
- $attachmentIds = array_column($results, 'attachment_id');
- $meta = $this->getMetaManager($data);
- if (!$meta) {
- return;
- }
-
- $existing = $meta->get($data['field_name']);
- $existingIds = !empty($existing) ? explode(',', $existing) : [];
- $allIds = array_unique(array_merge($existingIds, $attachmentIds));
-
- $meta->set($data['field_name'], implode(',', $allIds));
- }
-
private function getMetaManager(array $data): ?Meta
{
if (!empty($data['post_id'])) {
@@ -815,6 +743,11 @@
return null;
}
+ /**
+ * @param array $data
+ * @param array $results
+ * @return array
+ */
private function createIndividualPosts(array $data, array $results): array
{
if (empty($data['content'])) {
@@ -869,7 +802,7 @@
private function cleanupTempFiles(array $securedFiles, int $userId): void
{
- $uploader = new UploadManager();
+ $uploader = UploadManager::getInstance();
foreach ($securedFiles as $secured) {
if (!empty($secured['temp_path']) && file_exists($secured['temp_path'])) {
--
Gitblit v1.10.0