3.3.7

* Massive improvement to background tasks performance. Processing times reduced by 50 to 90% in most cases. * Fixed settings toggle in Google Chrome * Fix for srcset generation when using wp_get_attachment_image() in your theme
Interfacelab · Dec 7, 2019 · eeae037 · eeae037
1 parent 889c154
commit eeae037
Show file tree

Hide file tree

Showing 21 changed files with 452 additions and 132 deletions.
diff --git a/classes/CLI/Command.php b/classes/CLI/Command.php
@@ -58,7 +58,9 @@ protected function runTask($task, $options = [], $selected = []) {
 			exit(0);
 		}
 
-		$task->save();
+		$task->wait();
+		$task->dumpExisting();
+		$task->loadNextData();
 
 
 		Command::Out("", true);

diff --git a/classes/Storage/Driver/Backblaze/BackblazeStorage.php b/classes/Storage/Driver/Backblaze/BackblazeStorage.php
@@ -412,6 +412,10 @@ public function presignedUrl($key, $expiration = 0) {
 	public function url($key, $type = null) {
 		return $this->bucketUrl.$key;
 	}
+
+	public function signedURLExpirationForType($type = null) {
+		return null;
+	}
 	//endregion
 
 	//region Direct Uploads

diff --git a/classes/Storage/Driver/GoogleCloud/GoogleStorage.php b/classes/Storage/Driver/GoogleCloud/GoogleStorage.php
@@ -127,20 +127,19 @@ public function usesSignedURLs($type = null) {
 		    return $this->settings->usePresignedURLs;
 	    }
 
+	    $use = false;
 	    if (strpos($type, 'image') === 0) {
-		    return $this->settings->usePresignedURLsForImages;
+		    $use = $this->settings->usePresignedURLsForImages;
+	    } else if (strpos($type, 'video') === 0) {
+		    $use = $this->settings->usePresignedURLsForVideo;
+	    } else if (strpos($type, 'audio') === 0) {
+		    $use = $this->settings->usePresignedURLsForAudio;
+	    } else if (strpos($type, 'application') === 0) {
+		    $use = $this->settings->usePresignedURLsForDocs;
 	    }
 
-	    if (strpos($type, 'video') === 0) {
-		    return $this->settings->usePresignedURLsForVideo;
-	    }
-
-	    if (strpos($type, 'audio') === 0) {
-		    return $this->settings->usePresignedURLsForAudio;
-	    }
-
-	    if ((strpos($type, 'application') === 0) || (strpos($type, 'text') === 0)) {
-		    return $this->settings->usePresignedURLsForDocs;
+	    if (!empty($use)) {
+		    return true;
 	    }
 
 	    return $this->settings->usePresignedURLs;

diff --git a/classes/Storage/Driver/S3/S3Storage.php b/classes/Storage/Driver/S3/S3Storage.php
@@ -102,25 +102,24 @@ public function pathLink($bucket, $key) {
 
 	//region Enabled/Options
     public function usesSignedURLs($type = null) {
-		if (($type == null) || (!empty($this->settings->usePresignedURLs))) {
+		if (($type === null) || (!empty($this->settings->usePresignedURLs))) {
 			return $this->settings->usePresignedURLs;
 		}
 
+		$use = false;
 		if (strpos($type, 'image') === 0) {
-			return $this->settings->usePresignedURLsForImages;
-		}
-
-	    if (strpos($type, 'video') === 0) {
-		    return $this->settings->usePresignedURLsForVideo;
-	    }
-
-	    if (strpos($type, 'audio') === 0) {
-		    return $this->settings->usePresignedURLsForAudio;
+			$use = $this->settings->usePresignedURLsForImages;
+		} else if (strpos($type, 'video') === 0) {
+			$use = $this->settings->usePresignedURLsForVideo;
+	    } else if (strpos($type, 'audio') === 0) {
+			$use = $this->settings->usePresignedURLsForAudio;
+	    } else if (strpos($type, 'application') === 0) {
+			$use = $this->settings->usePresignedURLsForDocs;
 	    }
 
-	    if (strpos($type, 'application') === 0) {
-		    return $this->settings->usePresignedURLsForDocs;
-	    }
+		if (!empty($use) && ($use !== 'inherit')) {
+			return true;
+		}
 
 	    return $this->settings->usePresignedURLs;
     }

diff --git a/classes/Storage/StorageInterface.php b/classes/Storage/StorageInterface.php
@@ -90,6 +90,15 @@ public function pathLink($bucket, $key);
 	 */
 	public function usesSignedURLs($type = null);
 
+	/**
+	 * Returns the expiration for a particular type
+	 *
+	 * @param null|string $type
+	 *
+	 * @return int|null
+	 */
+	public function signedURLExpirationForType($type = null);
+
 	/**
 	 * Insures that all the configuration settings are valid and that the storage is enabled.
 	 * @return bool

diff --git a/classes/Tasks/AttachmentTask.php b/classes/Tasks/AttachmentTask.php
@@ -116,11 +116,17 @@ public function prepare($options = [], $selectedItems = []) {
 
 			$query = new \WP_Query($args);
 			$postIds = $query->posts;
+			if (count($postIds) === 0) {
+				return false;
+			}
+
 			foreach($postIds as $postId) {
 				$this->addItem(['id' => $postId]);
 			}
 		}
 
+		$this->state = Task::STATE_WAITING;
+
 		Logger::info("Added {$this->totalItems} to the task.");
 		return ($this->totalItems > 0);
 	}