Merge pull request #593 from Smartling/wp-971-acf-optimizations

refactor ACF support (WP-971)

Author: vsolovei-smartling

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "smartling/wordpress-connector",
   "license": "GPL-2.0-or-later",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "description": "",
   "type": "wordpress-plugin",
   "repositories": [

inc/Smartling/Extensions/Acf/AcfDynamicSupport.php

@@ -126,25 +126,20 @@ private function getDatabaseDefinitions(): array
                         foreach ($groups as $groupKey => $group) {
                             $defs[$groupKey] = [
                                 'global_type' => 'group',
-                                'active'      => 1,
+                                'active' => 1,
                             ];
-                            $fields          = $this->getFieldsByGroup($blog, [$groupKey => $group]);
-                            if (0 < count($fields)) {
-                                foreach ($fields as $fieldKey => $field) {
-                                    $defs[$fieldKey] = [
-                                        'global_type' => 'field',
-                                        'type'        => $field['type'],
-                                        'name'        => $field['name'],
-                                        'parent'      => $field['parent'],
-                                    ];
-
-                                    if ('clone' === $field['type']) {
-                                        if (array_key_exists('clone', $field)) {
-                                            $defs[$fieldKey]['clone'] = $field['clone'];
-                                        } else {
-                                            $this->getLogger()->debug('ACF field fieldType="clone" has no target. ' . json_encode($field));
-                                        }
-                                    }
+                        }
+                        foreach ($this->getFields($blog, array_map(static fn($item) => $item['post_id'], $groups)) as $fieldKey => $field) {
+                            $defs[$fieldKey] = [
+                                'global_type' => 'field',
+                                'type' => $field['type'],
+                            ];
+
+                            if ('clone' === $field['type']) {
+                                if (array_key_exists('clone', $field)) {
+                                    $defs[$fieldKey]['clone'] = $field['clone'];
+                                } else {
+                                    $this->getLogger()->debug('ACF field fieldType="clone" has no target. ' . json_encode($field));
                                 }
                             }
                         }
@@ -205,61 +200,16 @@ private function rawReadGroups(): array
         return $groups;
     }
 
-    private function rawReadFields($parentId, $parentKey): array
+    private function rawReadFields($parentId): array
     {
-        $posts = (new \WP_Query(
-            [
-                'post_type'        => self::POST_TYPE_FIELD,
-                'suppress_filters' => true,
-                'posts_per_page'   => -1,
-                'post_status'      => 'publish',
-                'post_parent'      => $parentId,
-            ]
-        ))->get_posts();
-
-        $fields = [];
-        foreach ($posts as $post) {
-            $configuration            = unserialize($post->post_content);
-            $fields[$post->post_name] = [
-                'parent' => $parentKey,
-                'name'   => $post->post_excerpt,
-                'type'   => $configuration['type'],
-            ];
-            $subFields                = $this->rawReadFields($post->ID, $post->post_name);
-            if (0 < count($subFields)) {
-                $fields = array_merge($fields, $subFields);
-            }
-        }
-
-        return $fields;
+        return $this->getFieldsFromPosts($this->getQueryByParentId($parentId)->get_posts());
     }
 
-    protected function getFieldsByGroup($blogId, $group): array
+    private function getFields(int $blogId, array $parentIds): array
     {
-        $dbFields   = [];
-        $needChange = $this->siteHelper->getCurrentBlogId() !== $blogId;
-        try {
-            if ($needChange) {
-                $this->siteHelper->switchBlogId($blogId);
-            }
-            $keys   = array_keys($group);
-            $key    = reset($keys);
-            $_group = reset($group);
-            $id     = $_group['post_id'];
-
-            $dbFields = $this->rawReadFields($id, $key);
-
-        } catch (\Exception $e) {
-            $this->getLogger()->warning(
-                vsprintf('Error occurred while reading ACF data from blog %s. Message: %s', [$blogId, $e->getMessage()])
-            );
-        } finally {
-            if ($needChange) {
-                $this->siteHelper->restoreBlogId();
-            }
-        }
-
-        return $dbFields;
+        return $this->siteHelper->withBlog($blogId, function () use ($parentIds): array {
+            return $this->getFieldsFromPosts($this->getQueryByParentIds($parentIds)->get_posts());
+        });
     }
 
     protected function extractGroupsDefinitions(array $groups): array
@@ -714,4 +664,41 @@ public function getRuleId(string $key): string
 
         return array_pop($matches[0]) ?? $key;
     }
+
+    private function getQueryByParentId($parentId): \WP_Query
+    {
+        return new \WP_Query(array_merge($this->getQueryArray(), ['post_parent' => $parentId]));
+    }
+
+    private function getQueryByParentIds(array $parentIds): \WP_Query
+    {
+        return new \WP_Query(array_merge($this->getQueryArray(), ['post_parent__in' => $parentIds]));
+    }
+
+    private function getQueryArray(): array
+    {
+        return [
+            'post_type' => self::POST_TYPE_FIELD,
+            'suppress_filters' => true,
+            'posts_per_page' => -1,
+            'post_status' => 'publish',
+        ];
+    }
+
+    private function getFieldsFromPosts(array $posts): array
+    {
+        $fields = [];
+        foreach ($posts as $post) {
+            $configuration = unserialize($post->post_content);
+            $fields[$post->post_name] = [
+                'type' => $configuration['type'],
+            ];
+            $subFields = $this->rawReadFields($post->ID);
+            if (0 < count($subFields)) {
+                $fields = array_merge($fields, $subFields);
+            }
+        }
+
+        return $fields;
+    }
 }

readme.txt

@@ -4,7 +4,7 @@ Tags: translation, localization, multilingual, internationalization, smartling
 Requires at least: 5.5
 Tested up to: 6.6.2
 Requires PHP: 8.0
-Stable tag: 5.0.1
+Stable tag: 5.0.2
 License: GPLv2 or later
 
 Translate content in WordPress quickly and seamlessly with Smartling, the industry-leading Translation Management System.
@@ -62,6 +62,9 @@ Additional information on the Smartling Connector for WordPress can be found [he
 3. Track translation status within WordPress from the Submissions Board. View overall progress of submitted translation requests as well as resend updated content.
 
 == Changelog ==
+= 5.0.2 =
+* Improved performance when working on installations with a large number of ACF fields
+
 = 5.0.1 =
 * Fixed issue where an exception during submission cloning would prevent the cloning queue from processing other items
 

smartling-connector.php

@@ -11,7 +11,7 @@
  * Plugin Name:       Smartling Connector
  * Plugin URI:        https://www.smartling.com/products/automate/integrations/wordpress/
  * Description:       Integrate your WordPress site with Smartling to upload your content and download translations.
- * Version:           5.0.1
+ * Version:           5.0.2
  * Author:            Smartling
  * Author URI:        https://www.smartling.com
  * License:           GPL-2.0+