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/utility/Image.php |   97 ++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 89 insertions(+), 8 deletions(-)

diff --git a/inc/utility/Image.php b/inc/utility/Image.php
index d9a9515..384a699 100644
--- a/inc/utility/Image.php
+++ b/inc/utility/Image.php
@@ -1,7 +1,7 @@
 <?php
 namespace JVBase\utility;
 
-use JVBase\managers\CacheManager;
+use JVBase\managers\Cache;
 
 if (!defined('ABSPATH')) {
 	exit;
@@ -12,20 +12,26 @@
  */
 class Image
 {
-	protected ?CacheManager $cache = null;
+	protected ?Cache $cache = null;
+	protected ?Cache $imgData = null;
 
 	public function __construct()
 	{
-		$this->cache = CacheManager::for('images')->connectTo('post', 'attachment');
+		$this->cache = Cache::for('images')->connect('post');
+		$this->imgData = Cache::for('imageData')->connect('post');
+		if (JVB_TESTING) {
+			$this->cache->flush();
+			$this->imgData->flush();
+		}
 	}
 
 	public function formatImage(int $ID, string $start = 'tiny', string $replace = 'large', bool $addLink = true, ?string $postSlug = null):string
 	{
 		$return = $this->cache->remember(
-			['ID' => $ID, 'start' => $start, 'replace' => $replace],
+			$this->cache->generateKey(['ID' => $ID, 'start' => $start, 'replace' => $replace]),
 			function() use ($ID, $start, $replace) {
 				// Define size order for progressive enhancement
-				$sizeOrder = ['tiny', 'medium', 'large', 'full'];
+				$sizeOrder = ['tiny', 'directory-preview', 'thumbnail', 'medium', 'large', 'full'];
 				$startIndex = array_search($start, $sizeOrder);
 				$replaceIndex = array_search($replace, $sizeOrder);
 
@@ -67,8 +73,17 @@
 
 		if ($addLink) {
 			if (!$postSlug) {
-				global $post;
-				$postSlug = $post->post_name;
+				if (is_singular()) {
+					global $post;
+					$postSlug = $post->post_name;
+				}else if (is_tax()) {
+					$tax = get_queried_object();
+					$postSlug = jvbNoBase($tax->taxonomy);
+				}elseif (is_post_type_archive()) {
+					$obj = get_queried_object();
+					$postSlug = jvbNoBase($obj->name);
+				}
+
 			}
 			$full = wp_get_attachment_image_src($ID, 'full');
 
@@ -81,7 +96,7 @@
 				$postSlug,
 				$postSlug,
 				$imgSlug,
-				$full[0]
+				$full[0]??''
 			);
 
 			// Add gallery attributes to img tag
@@ -118,4 +133,70 @@
 		}
 		return '';
 	}
+
+	public function getImageData(int $imgID):array
+	{
+		return $this->imgData->remember(
+			$imgID,
+			function() use ($imgID) {
+				if (!wp_get_attachment_image($imgID, 'tiny')) {
+					return [];
+				}
+				return [
+					'tiny' 			=> wp_get_attachment_image_src($imgID, 'tiny')[0],
+					'small' 		=> wp_get_attachment_image_src($imgID, 'medium')[0],
+					'medium' 		=> wp_get_attachment_image_src($imgID, 'large')[0],
+					'large' 		=> wp_get_attachment_image_src($imgID, 'full')[0],
+					'image-alt-text'=> get_post_meta($imgID, '_wp_attachment_image_alt', true),
+					'image-title'	=> get_the_title($imgID),
+					'image-caption' => get_the_excerpt($imgID),
+				];
+			}
+		);
+	}
+
+	public static function getData(int $imgID):array
+	{
+		return (new Image)->getImageData($imgID);
+	}
+
+	public static function gallery(string $ids, ?string $type = null):string
+	{
+		$ids = explode(',', $ids);
+		$inner = implode('', array_map(function ($ID) {
+			$caption = wp_get_attachment_caption($ID);
+			if (!empty($caption)) {
+				$caption = sprintf('<figcaption>%s</figcaption', $caption);
+			}
+			return sprintf(
+				'<li><figure>%s%s</figure></li>',
+				self::image($ID),
+				$caption
+			);
+		}, $ids));
+		return sprintf(
+			'<ul class="gallery%s">%s</ul>',
+			$type? ' '.$type : '',
+			$inner
+		);
+	}
+
+	public static function image(int $id, string $start = 'tiny', string $replace = 'large', bool $addLink = true, ?string $postSlug = null):string
+	{
+		return (new Image)->formatImage($id, $start, $replace, $addLink, $postSlug);
+	}
+	public static function SVG(string $slug):string
+	{
+		$cache = Cache::for('svgs');
+		if (JVB_TESTING) {
+			$cache->flush();
+		}
+		return $cache->remember(
+			$slug,
+			function() use ($slug) {
+				$filename = JVB_CHILD_DIR.'/assets/icons/'.$slug.'.svg';
+				return file_exists($filename) ? file_get_contents($filename) : '';
+			}
+		);
+	}
 }

--
Gitblit v1.10.0