Changeset 3417465

Timestamp:

12/11/2025 02:25:56 PM (4 months ago)

Author:

slimndap

Message:

1.33

Location:

jeero/trunk

Files:

• Jeero.php (modified) (2 diffs)
• includes/Helpers/Images.php (modified) (4 diffs)
• includes/Inbox/Inbox.php (modified) (5 diffs)
• readme.txt (modified) (1 diff)

jeero/trunk/Jeero.php

@@ -6 +6 @@
  * Author:          Slim & Dapper
  * Author URI:      https://slimndap.com
- * Version:         1.32.1
+ * Version:         1.33
  * Text Domain:     jeero
  *
@@ -32 +32 @@
 add_action( 'init', function() {
 
-    define( 'Jeero\VERSION', '1.32.1' );
+    define( 'Jeero\VERSION', '1.33' );
     define( 'Jeero\PLUGIN_PATH', plugin_dir_path( __FILE__ ) );
     define( 'Jeero\PLUGIN_URI', plugin_dir_url( __FILE__ ) );

jeero/trunk/includes/Helpers/Images.php

@@ -16 +16 @@
  */
 const JEERO_IMG_REF_FIELD = 'jeero/img/url';
+
+/**
+ * Stores the last downloaded URL for an image ref.
+ *
+ * @since 1.33
+ *
+ * @var string
+ */
+const JEERO_IMG_SOURCE_URL_FIELD = 'jeero/img/source_url';
 
 /**
@@ -123 +132 @@
  * 
  * @since   1.26
+ * @since   1.33    Re-downloads when the URL changes for the same ref, stores source URL meta, and replaces outdated attachments.
  *
  * @param   array           $structured_image
@@ -129 +139 @@
  */
 function add_structured_image_to_library( $structured_image, $post_id ) {
-    
-    if ( $thumbnail_id = get_existing_thumbnail_for_structured_image( $structured_image ) ) {
-        return $thumbnail_id;
-    }       
+
+    $existing_thumbnail_id = get_existing_thumbnail_for_structured_image( $structured_image );
+
+    if ( $existing_thumbnail_id ) {
+        $stored_url = \get_post_meta( $existing_thumbnail_id, JEERO_IMG_SOURCE_URL_FIELD, true );
+
+        if ( ! empty( $structured_image['url'] ) && $stored_url === $structured_image['url'] ) {
+            // Ensure future checks have the URL stored, even for legacy attachments.
+            if ( empty( $stored_url ) ) {
+                \update_post_meta( $existing_thumbnail_id, JEERO_IMG_SOURCE_URL_FIELD, $structured_image['url'] );
+            }
+            return $existing_thumbnail_id;
+        }
+    }
 
     require_once( ABSPATH . 'wp-admin/includes/media.php' );
@@ -167 +187 @@
     // Store original URL with image.
     \update_post_meta( $thumbnail_id, JEERO_IMG_REF_FIELD, $structured_image[ 'ref' ] );
+    \update_post_meta( $thumbnail_id, JEERO_IMG_SOURCE_URL_FIELD, $structured_image[ 'url' ] );
+
+    if ( $existing_thumbnail_id && $thumbnail_id !== $existing_thumbnail_id ) {
+        // Remove outdated attachment so the new download becomes the canonical image for this ref.
+        \wp_delete_attachment( $existing_thumbnail_id, true );
+    }
     
     return $thumbnail_id;

jeero/trunk/includes/Inbox/Inbox.php

@@ -22 +22 @@
 
 const PICKUP_ITEMS_HOOK = 'jeero\inbox\pickup_items';
+const PROCESSING_ITEM_MARKER_PREFIX = 'jeero_inbox_processing_item_';
 
 // Scheduling of the next pickup is handled centrally in Jeero.php bootstrap.
@@ -145 +146 @@
 function process_item( $item ) {
     
+    $is_item_blocking = is_item_blocking( $item );
+    if ( $is_item_blocking ) {
+        Logs\Log( sprintf( 'Skipping inbox item %s because a previous attempt is still marked as running.', $item['ID'] ?? 'unknown' ) );
+        mark_process_item_ended( $item );
+        return true;
+    }
+
+    mark_process_item_start( $item );
+
     $action = $item[ 'action' ];
     $theater = $item[ 'theater' ];
@@ -283 +293 @@
         $subscription
     );
+
+    mark_process_item_ended( $item );
     
     return $result;
@@ -322 +334 @@
         }
         
-        $items_processed[] = $item;
-        
         $elapsed_time = microtime( true ) - $start_time;
         
@@ -366 +376 @@
 
 /**
+ * Marks an inbox item before processing attempt starts.
+ *
+ * Persist a marker in permanent storage (option/transient/DB key) before processing
+ * begins so we can detect stuck items when processing is interrupted.
+ *
+ * @param array $item The inbox payload that is about to be processed.
+ */
+function mark_process_item_start( $item ) {
+    $key = get_processing_marker_key( $item );
+    if ( $key === '' ) {
+        return;
+    }
+
+    \set_transient( $key, true, 0 );
+}
+
+/**
+ * Clears the processing attempt marker after processing successfully ended.
+ *
+ * When processing completes without fatal issues, this helper removes the marker
+ * so the inbox item is not treated as blocking in future runs.
+ *
+ * @param array $item The inbox payload that finished processing.
+ */
+function mark_process_item_ended( $item ) {
+    $key = get_processing_marker_key( $item );
+    if ( $key === '' ) {
+        return;
+    }
+
+    \delete_transient( $key );
+}
+
+/**
+ * Checks if an inbox item triggered a blocking error during its previous processing attempt.
+ *
+ * This should return true when the marker set by {@link mark_process_item_start()}
+ * is still present because processing failed before {@link mark_process_item_ended()}
+ * could run.
+ *
+ * @param array $item The inbox payload to inspect.
+ * @return bool True when the item is considered blocking, false otherwise.
+ */
+function is_item_blocking( $item ) {
+    $key = get_processing_marker_key( $item );
+    if ( $key === '' ) {
+        return false;
+    }
+
+    return \false !== \get_transient( $key );
+}
+
+function get_processing_marker_key( $item ) {
+    if ( empty( $item[ 'ID' ] ) ) {
+        return '';
+    }
+
+    return PROCESSING_ITEM_MARKER_PREFIX . \md5( (string) $item[ 'ID' ] );
+}
+
+/**
  * Schedules the next pick up.
  * 

jeero/trunk/readme.txt

@@ -96 +96 @@
 == Changelog ==
 
+= 1.33 =
+* Detect and remove inbox items that blocking future pickups.
+* Re-download images when the source URL changes.
+
 = 1.32 =
 * Added a new 'jeero/loaded' action to allow other plugins or themes to hook into the initialization process of Jeero.